From 8915ee75bf79cc4a5c26bf90483d7b6f704ea2a1 Mon Sep 17 00:00:00 2001
From: Dongie Agnir <261310+dagnir@users.noreply.github.com>
Date: Fri, 19 Sep 2025 11:07:44 -0700
Subject: [PATCH 1/4] Reuse computed checksums across retries (#6413)

* Reuse computed checksums across retries

This commit adds the ability to reuse previously computed checksums for
a request across retries.

This ensures that if a request data stream is modified between attempts
that the server will reject the request.

As part of this change, the `http-auth-spi` package has been updated to
expose a new interface: `PayloadChecksumStore`. This is a simple storage
interface that allows signers to store and retrieve computed checksums.
Additionally, a new `SignerProperty` is introduced,
`SdkInternalHttpSignerProperty.CHECKSUM_CACHE` so that signers and
their callers can access this cache.

Note that both the interface and associated signer property are
`@SdkProtectedApi` and not intended to be used by non-SDK consumers of
`http-auth-spi`.

Finally, this adds a dependency on `checksums-spi` for `http-auth-spi`.

* Update core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java

Co-authored-by: David Ho <70000000+davidh44@users.noreply.github.com>

* Review comments

---------

Co-authored-by: David Ho <70000000+davidh44@users.noreply.github.com>
---
 .../signer/AwsChunkedV4aPayloadSigner.java    |  34 ++-
 .../signer/DefaultAwsCrtV4aHttpSigner.java    |  16 +-
 .../signer/AwsChunkedV4PayloadSigner.java     |  34 ++-
 .../auth/aws/internal/signer/Checksummer.java |  14 +-
 .../signer/DefaultAwsV4HttpSigner.java        |  15 +-
 .../internal/signer/FlexibleChecksummer.java  |  16 +-
 .../signer/NoOpPayloadChecksumStore.java      |  45 ++++
 .../ChecksumTrailerProvider.java              |  17 +-
 .../internal/signer/util/ChecksumUtil.java    |   9 +-
 .../awssdk/http/auth/aws/TestUtils.java       |   8 +-
 .../awssdk/http/auth/aws/crt/TestUtils.java   |   7 +-
 .../DefaultAwsCrtV4aHttpSignerTest.java       | 185 ++++++++++++-
 .../signer/DefaultAwsV4HttpSignerTest.java    | 253 ++++++++++++++----
 .../signer/FlexibleChecksummerTest.java       |  72 ++++-
 .../ChecksumTrailerProviderTest.java          |  87 ++++++
 core/http-auth-spi/pom.xml                    |   5 +
 .../signer/DefaultPayloadChecksumStore.java   |  46 ++++
 .../auth/spi/signer/PayloadChecksumStore.java |  52 ++++
 .../signer/SdkInternalHttpSignerProperty.java |  37 +++
 .../spi/signer/PayloadChecksumStoreTest.java  |  78 ++++++
 .../SdkInternalExecutionAttribute.java        |   8 +
 .../checksums/LegacyPayloadChecksumCache.java |  37 +++
 .../pipeline/stages/HttpChecksumStage.java    |  10 +
 .../http/pipeline/stages/SigningStage.java    |  12 +-
 .../stages/HttpChecksumStageSraTest.java      |  27 ++
 .../pipeline/stages/SigningStageTest.java     |  32 +++
 services/s3/pom.xml                           |   6 +
 .../s3/checksums/ChecksumReuseTest.java       | 163 +++++++++++
 28 files changed, 1237 insertions(+), 88 deletions(-)
 create mode 100644 core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/NoOpPayloadChecksumStore.java
 create mode 100644 core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProviderTest.java
 create mode 100644 core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/signer/DefaultPayloadChecksumStore.java
 create mode 100644 core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/PayloadChecksumStore.java
 create mode 100644 core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/SdkInternalHttpSignerProperty.java
 create mode 100644 core/http-auth-spi/src/test/java/software/amazon/awssdk/http/auth/spi/signer/PayloadChecksumStoreTest.java
 create mode 100644 core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/LegacyPayloadChecksumCache.java
 create mode 100644 services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java

diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/AwsChunkedV4aPayloadSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/AwsChunkedV4aPayloadSigner.java
index 0124b2ea2c56..644e204f34b0 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/AwsChunkedV4aPayloadSigner.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/AwsChunkedV4aPayloadSigner.java
@@ -35,12 +35,15 @@
 import software.amazon.awssdk.http.Header;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.aws.internal.signer.CredentialScope;
+import software.amazon.awssdk.http.auth.aws.internal.signer.NoOpPayloadChecksumStore;
 import software.amazon.awssdk.http.auth.aws.internal.signer.chunkedencoding.ChecksumTrailerProvider;
 import software.amazon.awssdk.http.auth.aws.internal.signer.chunkedencoding.ChunkedEncodedInputStream;
 import software.amazon.awssdk.http.auth.aws.internal.signer.chunkedencoding.TrailerProvider;
 import software.amazon.awssdk.http.auth.aws.internal.signer.io.ChecksumInputStream;
 import software.amazon.awssdk.http.auth.aws.internal.signer.io.ResettableContentStreamProvider;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
+import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.Pair;
 import software.amazon.awssdk.utils.StringInputStream;
 import software.amazon.awssdk.utils.Validate;
@@ -51,16 +54,20 @@
  */
 @SdkInternalApi
 public final class AwsChunkedV4aPayloadSigner implements V4aPayloadSigner {
+    private static final Logger LOG = Logger.loggerFor(AwsChunkedV4aPayloadSigner.class);
 
     private final CredentialScope credentialScope;
     private final int chunkSize;
     private final ChecksumAlgorithm checksumAlgorithm;
+    private final PayloadChecksumStore payloadChecksumStore;
     private final List<Pair<String, List<String>>> preExistingTrailers = new ArrayList<>();
 
     private AwsChunkedV4aPayloadSigner(Builder builder) {
         this.credentialScope = Validate.paramNotNull(builder.credentialScope, "CredentialScope");
         this.chunkSize = Validate.isPositive(builder.chunkSize, "ChunkSize");
         this.checksumAlgorithm = builder.checksumAlgorithm;
+        this.payloadChecksumStore = builder.payloadChecksumStore == null ? NoOpPayloadChecksumStore.create() :
+                                    builder.payloadChecksumStore;
     }
 
     public static Builder builder() {
@@ -241,21 +248,41 @@ private void setupChecksumTrailerIfNeeded(ChunkedEncodedInputStream.Builder buil
             return;
         }
         String checksumHeaderName = checksumHeaderName(checksumAlgorithm);
+
+        String cachedChecksum = getCachedChecksum();
+
+        if (cachedChecksum != null) {
+            LOG.debug(() -> String.format("Cached payload checksum available for algorithm %s: %s. Using cached value",
+                                          checksumAlgorithm.algorithmId(), checksumHeaderName));
+            builder.addTrailer(() -> Pair.of(checksumHeaderName, Collections.singletonList(cachedChecksum)));
+            return;
+        }
+
         SdkChecksum sdkChecksum = fromChecksumAlgorithm(checksumAlgorithm);
         ChecksumInputStream checksumInputStream = new ChecksumInputStream(
             builder.inputStream(),
             Collections.singleton(sdkChecksum)
         );
 
-        TrailerProvider checksumTrailer = new ChecksumTrailerProvider(sdkChecksum, checksumHeaderName);
+        TrailerProvider checksumTrailer =
+            new ChecksumTrailerProvider(sdkChecksum, checksumHeaderName, checksumAlgorithm, payloadChecksumStore);
 
         builder.inputStream(checksumInputStream).addTrailer(checksumTrailer);
     }
 
+    private String getCachedChecksum() {
+        byte[] checksumBytes = payloadChecksumStore.getChecksumValue(checksumAlgorithm);
+        if (checksumBytes != null) {
+            return BinaryUtils.toBase64(checksumBytes);
+        }
+        return null;
+    }
+
     static final class Builder {
         private CredentialScope credentialScope;
         private Integer chunkSize;
         private ChecksumAlgorithm checksumAlgorithm;
+        private PayloadChecksumStore payloadChecksumStore;
 
         public Builder credentialScope(CredentialScope credentialScope) {
             this.credentialScope = credentialScope;
@@ -272,6 +299,11 @@ public Builder checksumAlgorithm(ChecksumAlgorithm checksumAlgorithm) {
             return this;
         }
 
+        public Builder checksumCache(PayloadChecksumStore checksumCache) {
+            this.payloadChecksumStore = checksumCache;
+            return this;
+        }
+
         public AwsChunkedV4aPayloadSigner build() {
             return new AwsChunkedV4aPayloadSigner(this);
         }
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java
index ec756d35053e..a77385b5c036 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java
@@ -33,6 +33,7 @@
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.CredentialUtils.sanitizeCredentials;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.PRESIGN_URL_MAX_EXPIRATION_DURATION;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_TRAILER;
+import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_CACHE;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -47,11 +48,13 @@
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.aws.internal.signer.Checksummer;
 import software.amazon.awssdk.http.auth.aws.internal.signer.CredentialScope;
+import software.amazon.awssdk.http.auth.aws.internal.signer.NoOpPayloadChecksumStore;
 import software.amazon.awssdk.http.auth.aws.signer.AwsV4aHttpSigner;
 import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
 import software.amazon.awssdk.http.auth.spi.signer.AsyncSignRequest;
 import software.amazon.awssdk.http.auth.spi.signer.AsyncSignedRequest;
 import software.amazon.awssdk.http.auth.spi.signer.BaseSignRequest;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.http.auth.spi.signer.SignRequest;
 import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
 import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
@@ -70,7 +73,7 @@ public final class DefaultAwsCrtV4aHttpSigner implements AwsV4aHttpSigner {
 
     @Override
     public SignedRequest sign(SignRequest<? extends AwsCredentialsIdentity> request) {
-        Checksummer checksummer = checksummer(request, null);
+        Checksummer checksummer = checksummer(request, null, checksumCache(request));
         V4aProperties v4aProperties = v4aProperties(request);
         AwsSigningConfig signingConfig = signingConfig(request, v4aProperties);
         V4aPayloadSigner payloadSigner = v4aPayloadSigner(request, v4aProperties);
@@ -104,7 +107,7 @@ private static V4aProperties v4aProperties(BaseSignRequest<?, ? extends AwsCrede
     }
 
     private static V4aPayloadSigner v4aPayloadSigner(
-        BaseSignRequest<?, ? extends AwsCredentialsIdentity> request,
+        SignRequest<? extends AwsCredentialsIdentity> request,
         V4aProperties v4aProperties) {
 
         boolean isPayloadSigning = isPayloadSigning(request);
@@ -117,6 +120,7 @@ private static V4aPayloadSigner v4aPayloadSigner(
                                              .credentialScope(v4aProperties.getCredentialScope())
                                              .chunkSize(DEFAULT_CHUNK_SIZE_IN_BYTES)
                                              .checksumAlgorithm(request.property(CHECKSUM_ALGORITHM))
+                                             .checksumCache(checksumCache(request))
                                              .build();
         }
 
@@ -252,4 +256,12 @@ private static V4aRequestSigningResult sign(SdkHttpRequest request, HttpRequest
             signingResult.getSignature(),
             signingConfig);
     }
+
+    private static PayloadChecksumStore checksumCache(SignRequest<? extends AwsCredentialsIdentity> request) {
+        PayloadChecksumStore cache = request.property(CHECKSUM_CACHE);
+        if (cache == null) {
+            return NoOpPayloadChecksumStore.create();
+        }
+        return cache;
+    }
 }
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/AwsChunkedV4PayloadSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/AwsChunkedV4PayloadSigner.java
index 391894b28b39..4f43701f9bf5 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/AwsChunkedV4PayloadSigner.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/AwsChunkedV4PayloadSigner.java
@@ -45,7 +45,9 @@
 import software.amazon.awssdk.http.auth.aws.internal.signer.chunkedencoding.TrailerProvider;
 import software.amazon.awssdk.http.auth.aws.internal.signer.io.ChecksumInputStream;
 import software.amazon.awssdk.http.auth.aws.internal.signer.io.ResettableContentStreamProvider;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
+import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.Pair;
 import software.amazon.awssdk.utils.Validate;
 
@@ -55,16 +57,20 @@
  */
 @SdkInternalApi
 public final class AwsChunkedV4PayloadSigner implements V4PayloadSigner {
+    private static final Logger LOG = Logger.loggerFor(AwsChunkedV4PayloadSigner.class);
 
     private final CredentialScope credentialScope;
     private final int chunkSize;
     private final ChecksumAlgorithm checksumAlgorithm;
+    private final PayloadChecksumStore payloadChecksumStore;
     private final List<Pair<String, List<String>>> preExistingTrailers = new ArrayList<>();
 
     private AwsChunkedV4PayloadSigner(Builder builder) {
         this.credentialScope = Validate.paramNotNull(builder.credentialScope, "CredentialScope");
         this.chunkSize = Validate.isPositive(builder.chunkSize, "ChunkSize");
         this.checksumAlgorithm = builder.checksumAlgorithm;
+        this.payloadChecksumStore = builder.payloadChecksumStore == null ? NoOpPayloadChecksumStore.create() :
+                                    builder.payloadChecksumStore;
     }
 
     public static Builder builder() {
@@ -259,22 +265,43 @@ private void setupChecksumTrailerIfNeeded(ChunkedEncodedInputStream.Builder buil
         if (checksumAlgorithm == null) {
             return;
         }
+
         String checksumHeaderName = checksumHeaderName(checksumAlgorithm);
+
+        String cachedChecksum = getCachedChecksum();
+
+        if (cachedChecksum != null) {
+            LOG.debug(() -> String.format("Cached payload checksum available for algorithm %s: %s. Using cached value",
+                                          checksumAlgorithm.algorithmId(), checksumHeaderName));
+            builder.addTrailer(() -> Pair.of(checksumHeaderName, Collections.singletonList(cachedChecksum)));
+            return;
+        }
+
         SdkChecksum sdkChecksum = fromChecksumAlgorithm(checksumAlgorithm);
         ChecksumInputStream checksumInputStream = new ChecksumInputStream(
             builder.inputStream(),
             Collections.singleton(sdkChecksum)
         );
 
-        TrailerProvider checksumTrailer = new ChecksumTrailerProvider(sdkChecksum, checksumHeaderName);
+        TrailerProvider checksumTrailer =
+            new ChecksumTrailerProvider(sdkChecksum, checksumHeaderName, checksumAlgorithm, payloadChecksumStore);
 
         builder.inputStream(checksumInputStream).addTrailer(checksumTrailer);
     }
 
+    private String getCachedChecksum() {
+        byte[] checksumBytes = payloadChecksumStore.getChecksumValue(checksumAlgorithm);
+        if (checksumBytes != null) {
+            return BinaryUtils.toBase64(checksumBytes);
+        }
+        return null;
+    }
+
     static class Builder {
         private CredentialScope credentialScope;
         private Integer chunkSize;
         private ChecksumAlgorithm checksumAlgorithm;
+        private PayloadChecksumStore payloadChecksumStore;
 
         public Builder credentialScope(CredentialScope credentialScope) {
             this.credentialScope = credentialScope;
@@ -291,6 +318,11 @@ public Builder checksumAlgorithm(ChecksumAlgorithm checksumAlgorithm) {
             return this;
         }
 
+        public Builder checksumCache(PayloadChecksumStore payloadChecksumStore) {
+            this.payloadChecksumStore = payloadChecksumStore;
+            return this;
+        }
+
         public AwsChunkedV4PayloadSigner build() {
             return new AwsChunkedV4PayloadSigner(this);
         }
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/Checksummer.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/Checksummer.java
index 071ed2bdec9c..3c3efb1b65ad 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/Checksummer.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/Checksummer.java
@@ -29,6 +29,7 @@
 import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
 import software.amazon.awssdk.http.ContentStreamProvider;
 import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
 
 /**
@@ -47,8 +48,9 @@ public interface Checksummer {
      * Get a default implementation of a checksummer, which calculates the SHA-256 checksum and places it in the
      * x-amz-content-sha256 header.
      */
-    static Checksummer create() {
+    static Checksummer create(PayloadChecksumStore cache) {
         return new FlexibleChecksummer(
+            cache,
             option().headerName(X_AMZ_CONTENT_SHA256).algorithm(SHA256).formatter(BinaryUtils::toHex).build()
         );
     }
@@ -57,9 +59,10 @@ static Checksummer create() {
      * Get a flexible checksummer that performs two checksums: the given checksum-algorithm and the SHA-256 checksum. It places
      * the SHA-256 checksum in x-amz-content-sha256 header, and the given checksum-algorithm in the x-amz-checksum-[name] header.
      */
-    static Checksummer forFlexibleChecksum(ChecksumAlgorithm checksumAlgorithm) {
+    static Checksummer forFlexibleChecksum(ChecksumAlgorithm checksumAlgorithm, PayloadChecksumStore cache) {
         if (checksumAlgorithm != null) {
             return new FlexibleChecksummer(
+                cache,
                 option().headerName(X_AMZ_CONTENT_SHA256).algorithm(SHA256).formatter(BinaryUtils::toHex)
                         .build(),
                 option().headerName(checksumHeaderName(checksumAlgorithm)).algorithm(checksumAlgorithm)
@@ -82,9 +85,12 @@ static Checksummer forPrecomputed256Checksum(String precomputedSha256) {
      * given checksum string. It places the precomputed checksum in x-amz-content-sha256 header, and the given checksum-algorithm
      * in the x-amz-checksum-[name] header.
      */
-    static Checksummer forFlexibleChecksum(String precomputedSha256, ChecksumAlgorithm checksumAlgorithm) {
+    static Checksummer forFlexibleChecksum(String precomputedSha256,
+                                           ChecksumAlgorithm checksumAlgorithm,
+                                           PayloadChecksumStore cache) {
         if (checksumAlgorithm != null) {
             return new FlexibleChecksummer(
+                cache,
                 option().headerName(X_AMZ_CONTENT_SHA256).algorithm(new ConstantChecksumAlgorithm(precomputedSha256))
                         .formatter(b -> new String(b, StandardCharsets.UTF_8)).build(),
                 option().headerName(checksumHeaderName(checksumAlgorithm)).algorithm(checksumAlgorithm)
@@ -96,7 +102,7 @@ static Checksummer forFlexibleChecksum(String precomputedSha256, ChecksumAlgorit
     }
 
     static Checksummer forNoOp() {
-        return new FlexibleChecksummer();
+        return new FlexibleChecksummer(NoOpPayloadChecksumStore.create());
     }
 
     /**
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSigner.java
index 8ad79a12007e..3865fe4b714b 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSigner.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSigner.java
@@ -24,6 +24,7 @@
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.OptionalDependencyLoaderUtil.getEventStreamV4PayloadSigner;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.PRESIGN_URL_MAX_EXPIRATION_DURATION;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_TRAILER;
+import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_CACHE;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -38,6 +39,7 @@
 import software.amazon.awssdk.http.auth.spi.signer.AsyncSignRequest;
 import software.amazon.awssdk.http.auth.spi.signer.AsyncSignedRequest;
 import software.amazon.awssdk.http.auth.spi.signer.BaseSignRequest;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.http.auth.spi.signer.SignRequest;
 import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
 import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
@@ -55,7 +57,7 @@ public final class DefaultAwsV4HttpSigner implements AwsV4HttpSigner {
 
     @Override
     public SignedRequest sign(SignRequest<? extends AwsCredentialsIdentity> request) {
-        Checksummer checksummer = checksummer(request, null);
+        Checksummer checksummer = checksummer(request, null, checksumCache(request));
         V4Properties v4Properties = v4Properties(request);
         V4RequestSigner v4RequestSigner = v4RequestSigner(request, v4Properties);
         V4PayloadSigner payloadSigner = v4PayloadSigner(request, v4Properties);
@@ -140,7 +142,7 @@ private static Checksummer asyncChecksummer(BaseSignRequest<?, ? extends AwsCred
         // check for payload signing is done.
         Boolean overridePayloadSigning = shouldTreatAsUnsigned ? false : null;
 
-        return checksummer(request, overridePayloadSigning);
+        return checksummer(request, overridePayloadSigning, PayloadChecksumStore.create());
     }
 
     private static V4PayloadSigner v4PayloadSigner(
@@ -168,6 +170,7 @@ private static V4PayloadSigner v4PayloadSigner(
             return AwsChunkedV4PayloadSigner.builder()
                                             .credentialScope(properties.getCredentialScope())
                                             .chunkSize(DEFAULT_CHUNK_SIZE_IN_BYTES)
+                                            .checksumCache(checksumCache(request))
                                             .checksumAlgorithm(request.property(CHECKSUM_ALGORITHM))
                                             .build();
         }
@@ -261,4 +264,12 @@ private static Duration validateExpirationDuration(Duration expirationDuration)
     private static boolean isBetweenInclusive(Duration start, Duration x, Duration end) {
         return start.compareTo(x) <= 0 && x.compareTo(end) <= 0;
     }
+
+    private static PayloadChecksumStore checksumCache(SignRequest<? extends AwsCredentialsIdentity> request) {
+        PayloadChecksumStore cache = request.property(CHECKSUM_CACHE);
+        if (cache == null) {
+            return NoOpPayloadChecksumStore.create();
+        }
+        return cache;
+    }
 }
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/FlexibleChecksummer.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/FlexibleChecksummer.java
index 2cf8e2cfef26..6c1539462788 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/FlexibleChecksummer.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/FlexibleChecksummer.java
@@ -35,6 +35,7 @@
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.aws.internal.signer.io.ChecksumInputStream;
 import software.amazon.awssdk.http.auth.aws.internal.signer.io.ChecksumSubscriber;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.Validate;
 
 /**
@@ -44,10 +45,12 @@
  */
 @SdkInternalApi
 public final class FlexibleChecksummer implements Checksummer {
+    private final PayloadChecksumStore cache;
     private final Collection<Option> options;
     private final Map<Option, SdkChecksum> optionToSdkChecksum;
 
-    public FlexibleChecksummer(Option... options) {
+    public FlexibleChecksummer(PayloadChecksumStore cache, Option... options) {
+        this.cache = cache;
         this.options = Arrays.asList(options);
         this.optionToSdkChecksum = this.options.stream().collect(
             Collectors.toMap(Function.identity(), o -> fromChecksumAlgorithm(o.algorithm))
@@ -85,9 +88,14 @@ public CompletableFuture<Publisher<ByteBuffer>> checksum(Publisher<ByteBuffer> p
 
     private void addChecksums(SdkHttpRequest.Builder request) {
         optionToSdkChecksum.forEach(
-            (option, sdkChecksum) -> request.putHeader(
-                option.headerName,
-                option.formatter.apply(sdkChecksum.getChecksumBytes()))
+            (option, sdkChecksum) -> {
+                byte[] checksumValue = cache.getChecksumValue(option.algorithm);
+                if (checksumValue == null) {
+                    checksumValue = sdkChecksum.getChecksumBytes();
+                    cache.putChecksumValue(option.algorithm, checksumValue);
+                }
+                request.putHeader(option.headerName, option.formatter.apply(checksumValue));
+            }
         );
     }
 
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/NoOpPayloadChecksumStore.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/NoOpPayloadChecksumStore.java
new file mode 100644
index 000000000000..74e8aaa4e0e7
--- /dev/null
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/NoOpPayloadChecksumStore.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.http.auth.aws.internal.signer;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
+
+@SdkInternalApi
+public final class NoOpPayloadChecksumStore implements PayloadChecksumStore {
+    private NoOpPayloadChecksumStore() {
+    }
+
+    @Override
+    public byte[] putChecksumValue(ChecksumAlgorithm algorithm, byte[] checksum) {
+        return null;
+    }
+
+    @Override
+    public byte[] getChecksumValue(ChecksumAlgorithm algorithm) {
+        return null;
+    }
+
+    @Override
+    public boolean containsChecksumValue(ChecksumAlgorithm algorithm) {
+        return false;
+    }
+
+    public static NoOpPayloadChecksumStore create() {
+        return new NoOpPayloadChecksumStore();
+    }
+}
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProvider.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProvider.java
index bacdb50d975b..4565a61a3933 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProvider.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProvider.java
@@ -19,6 +19,8 @@
 import java.util.List;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.checksums.SdkChecksum;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
 import software.amazon.awssdk.utils.Pair;
 
@@ -27,10 +29,15 @@ public class ChecksumTrailerProvider implements TrailerProvider {
 
     private final SdkChecksum checksum;
     private final String checksumName;
+    private final ChecksumAlgorithm checksumAlgorithm;
+    private final PayloadChecksumStore checksumCache;
 
-    public ChecksumTrailerProvider(SdkChecksum checksum, String checksumName) {
+    public ChecksumTrailerProvider(SdkChecksum checksum, String checksumName, ChecksumAlgorithm checksumAlgorithm,
+                                   PayloadChecksumStore checksumCache) {
         this.checksum = checksum;
         this.checksumName = checksumName;
+        this.checksumAlgorithm = checksumAlgorithm;
+        this.checksumCache = checksumCache;
     }
 
     @Override
@@ -40,9 +47,15 @@ public void reset() {
 
     @Override
     public Pair<String, List<String>> get() {
+        byte[] checksumBytes = checksumCache.getChecksumValue(checksumAlgorithm);
+        if (checksumBytes == null) {
+            checksumBytes = checksum.getChecksumBytes();
+            checksumCache.putChecksumValue(checksumAlgorithm, checksumBytes);
+        }
+
         return Pair.of(
             checksumName,
-            Collections.singletonList(BinaryUtils.toBase64(checksum.getChecksumBytes()))
+            Collections.singletonList(BinaryUtils.toBase64(checksumBytes))
         );
     }
 }
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/util/ChecksumUtil.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/util/ChecksumUtil.java
index 1ae50746efbf..092e5c46ef7d 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/util/ChecksumUtil.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/util/ChecksumUtil.java
@@ -36,6 +36,7 @@
 import software.amazon.awssdk.http.auth.aws.internal.signer.Checksummer;
 import software.amazon.awssdk.http.auth.aws.internal.signer.checksums.ConstantChecksum;
 import software.amazon.awssdk.http.auth.spi.signer.BaseSignRequest;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
 import software.amazon.awssdk.utils.FunctionalUtils;
 import software.amazon.awssdk.utils.Logger;
@@ -157,7 +158,7 @@ public static boolean isEventStreaming(SdkHttpRequest request) {
     }
 
     public static Checksummer checksummer(BaseSignRequest<?, ? extends AwsCredentialsIdentity> request,
-                                          Boolean isPayloadSigningOverride) {
+                                          Boolean isPayloadSigningOverride, PayloadChecksumStore payloadChecksumStore) {
         boolean isPayloadSigning = isPayloadSigningOverride != null ? isPayloadSigningOverride : isPayloadSigning(request);
         boolean isEventStreaming = isEventStreaming(request.request());
         boolean hasChecksumHeader = hasChecksumHeader(request);
@@ -179,9 +180,9 @@ public static Checksummer checksummer(BaseSignRequest<?, ? extends AwsCredential
             }
 
             if (isFlexible) {
-                return Checksummer.forFlexibleChecksum(request.property(CHECKSUM_ALGORITHM));
+                return Checksummer.forFlexibleChecksum(request.property(CHECKSUM_ALGORITHM), payloadChecksumStore);
             }
-            return Checksummer.create();
+            return Checksummer.create(payloadChecksumStore);
         }
 
         if (isFlexible || isTrailing) {
@@ -191,7 +192,7 @@ public static Checksummer checksummer(BaseSignRequest<?, ? extends AwsCredential
         }
 
         if (isFlexible) {
-            return Checksummer.forFlexibleChecksum(UNSIGNED_PAYLOAD, request.property(CHECKSUM_ALGORITHM));
+            return Checksummer.forFlexibleChecksum(UNSIGNED_PAYLOAD, request.property(CHECKSUM_ALGORITHM), payloadChecksumStore);
         }
 
         if (isAnonymous) {
diff --git a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/TestUtils.java b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/TestUtils.java
index bf4d9d8f7860..954ab243bf11 100644
--- a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/TestUtils.java
+++ b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/TestUtils.java
@@ -25,6 +25,10 @@ public final class TestUtils {
     private TestUtils() {
     }
 
+    public static byte[] testPayload() {
+        return "{\"TableName\": \"foo\"}".getBytes();
+    }
+
     // Helpers for generating test requests
     public static <T extends AwsCredentialsIdentity> SignRequest<T> generateBasicRequest(
         T credentials,
@@ -40,7 +44,7 @@ public static <T extends AwsCredentialsIdentity> SignRequest<T> generateBasicReq
                                                      .uri(URI.create("https://demo.us-east-1.amazonaws.com"))
                                                      .build()
                                                      .copy(requestOverrides))
-                          .payload(() -> new ByteArrayInputStream("{\"TableName\": \"foo\"}".getBytes()))
+                          .payload(() -> new ByteArrayInputStream(testPayload()))
                           .putProperty(REGION_NAME, "us-east-1")
                           .putProperty(SERVICE_SIGNING_NAME, "demo")
                           .putProperty(SIGNING_CLOCK,
@@ -56,7 +60,7 @@ public static <T extends AwsCredentialsIdentity> AsyncSignRequest<T> generateBas
     ) {
         SimplePublisher<ByteBuffer> publisher = new SimplePublisher<>();
 
-        publisher.send(ByteBuffer.wrap("{\"TableName\": \"foo\"}".getBytes()));
+        publisher.send(ByteBuffer.wrap(testPayload()));
         publisher.complete();
 
         return AsyncSignRequest.builder(credentials)
diff --git a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/TestUtils.java b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/TestUtils.java
index 683ac5afe770..c73f0d6213aa 100644
--- a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/TestUtils.java
+++ b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/TestUtils.java
@@ -25,6 +25,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.function.Consumer;
 import software.amazon.awssdk.crt.auth.signing.AwsSigningConfig;
@@ -45,6 +46,10 @@ public final class TestUtils {
     private TestUtils() {
     }
 
+    public static byte[] testPayload() {
+        return "Hello world".getBytes(StandardCharsets.UTF_8);
+    }
+
     // Helpers for generating test requests
     public static <T extends AwsCredentialsIdentity> SignRequest<T> generateBasicRequest(
         T credentials,
@@ -60,7 +65,7 @@ public static <T extends AwsCredentialsIdentity> SignRequest<T> generateBasicReq
                                                      .uri(URI.create("https://demo.us-east-1.amazonaws.com"))
                                                      .build()
                                                      .copy(requestOverrides))
-                          .payload(() -> new ByteArrayInputStream("Hello world".getBytes()))
+                          .payload(() -> new ByteArrayInputStream(testPayload()))
                           .putProperty(REGION_SET, RegionSet.create("aws-global"))
                           .putProperty(SERVICE_SIGNING_NAME, "demo")
                           .putProperty(SIGNING_CLOCK, new TickingClock(Instant.ofEpochMilli(1596476903000L)))
diff --git a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSignerTest.java b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSignerTest.java
index 4c1a01f6f2e3..11867d613380 100644
--- a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSignerTest.java
+++ b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSignerTest.java
@@ -32,6 +32,7 @@
 import static software.amazon.awssdk.crt.auth.signing.AwsSigningConfig.AwsSigningAlgorithm.SIGV4_ASYMMETRIC;
 import static software.amazon.awssdk.http.auth.aws.TestUtils.AnonymousCredentialsIdentity;
 import static software.amazon.awssdk.http.auth.aws.crt.TestUtils.generateBasicRequest;
+import static software.amazon.awssdk.http.auth.aws.crt.TestUtils.testPayload;
 import static software.amazon.awssdk.http.auth.aws.crt.internal.util.CrtUtils.toCredentials;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.ChecksumUtil.readAll;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4FamilyHttpSigner.CHECKSUM_ALGORITHM;
@@ -43,20 +44,25 @@
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4aHttpSigner.PAYLOAD_SIGNING_ENABLED;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4aHttpSigner.REGION_SET;
 import static software.amazon.awssdk.http.auth.spi.signer.HttpSigner.SIGNING_CLOCK;
+import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_CACHE;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Stream;
 import org.assertj.core.api.AssertionsForClassTypes;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import software.amazon.awssdk.checksums.SdkChecksum;
 import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
 import software.amazon.awssdk.crt.auth.signing.AwsSigningConfig;
 import software.amazon.awssdk.http.Header;
@@ -65,10 +71,13 @@
 import software.amazon.awssdk.http.auth.aws.TestUtils;
 import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
 import software.amazon.awssdk.http.auth.spi.signer.AsyncSignRequest;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.http.auth.spi.signer.SignRequest;
 import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
 import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
+import software.amazon.awssdk.utils.BinaryUtils;
 import software.amazon.awssdk.utils.ImmutableMap;
+import software.amazon.awssdk.utils.IoUtils;
 
 
 /**
@@ -92,7 +101,7 @@ public static Stream<Map.Entry<ChecksumAlgorithm, String>> checksumAlgorithmToVa
     }
 
     @Test
-    public void sign_withBasicRequest_shouldSignWithHeaders() {
+    void sign_withBasicRequest_shouldSignWithHeaders() {
         AwsCredentialsIdentity credentials =
             AwsCredentialsIdentity.create("AKIDEXAMPLE", "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY");
         SignRequest<AwsCredentialsIdentity> request = generateBasicRequest(
@@ -122,7 +131,7 @@ public void sign_withBasicRequest_shouldSignWithHeaders() {
     }
 
     @Test
-    public void sign_withQuery_shouldSignWithQueryParams() {
+    void sign_withQuery_shouldSignWithQueryParams() {
         AwsCredentialsIdentity credentials =
             AwsCredentialsIdentity.create("AKIDEXAMPLE", "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY");
         SignRequest<AwsCredentialsIdentity> request = generateBasicRequest(
@@ -208,7 +217,7 @@ void sign_requestWithQueryEncodedParamValue_shouldEncodedValue() {
     }
 
     @Test
-    public void sign_withQueryAndExpiration_shouldSignWithQueryParamsAndExpire() {
+    void sign_withQueryAndExpiration_shouldSignWithQueryParamsAndExpire() {
         AwsCredentialsIdentity credentials =
             AwsCredentialsIdentity.create("AKIDEXAMPLE", "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY");
         SignRequest<AwsCredentialsIdentity> request = generateBasicRequest(
@@ -245,7 +254,7 @@ public void sign_withQueryAndExpiration_shouldSignWithQueryParamsAndExpire() {
     }
 
     @Test
-    public void sign_withUnsignedPayload_shouldNotSignPayload() {
+    void sign_withUnsignedPayload_shouldNotSignPayload() {
         AwsCredentialsIdentity credentials =
             AwsCredentialsIdentity.create("AKIDEXAMPLE", "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY");
         SignRequest<AwsCredentialsIdentity> request = generateBasicRequest(
@@ -276,7 +285,7 @@ public void sign_withUnsignedPayload_shouldNotSignPayload() {
     }
 
     @Test
-    public void sign_withAnonymousCredentials_shouldNotSign() {
+    void sign_withAnonymousCredentials_shouldNotSign() {
         AwsCredentialsIdentity credentials = new AnonymousCredentialsIdentity();
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             credentials,
@@ -292,14 +301,14 @@ public void sign_withAnonymousCredentials_shouldNotSign() {
     }
 
     @Test
-    public void signAsync_throwsUnsupportedOperationException() {
+    void signAsync_throwsUnsupportedOperationException() {
         assertThrows(UnsupportedOperationException.class,
                      () -> signer.signAsync((AsyncSignRequest<? extends AwsCredentialsIdentity>) null)
         );
     }
 
     @Test
-    public void sign_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner() {
+    void sign_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -320,7 +329,7 @@ public void sign_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner() {
     }
 
     @Test
-    public void sign_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunkedPayloadSigner() {
+    void sign_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunkedPayloadSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -343,7 +352,7 @@ public void sign_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunked
     }
 
     @Test
-    public void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndTrailer_DelegatesToAwsChunkedPayloadSigner() {
+    void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndTrailer_DelegatesToAwsChunkedPayloadSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -367,7 +376,7 @@ public void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndTrailer_Delegates
     }
 
     @Test
-    public void sign_WithPayloadSigningFalseAndChunkEncodingTrueWithoutTrailer_DelegatesToUnsignedPayload() {
+    void sign_WithPayloadSigningFalseAndChunkEncodingTrueWithoutTrailer_DelegatesToUnsignedPayload() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -384,7 +393,7 @@ public void sign_WithPayloadSigningFalseAndChunkEncodingTrueWithoutTrailer_Deleg
 
     @ParameterizedTest
     @MethodSource("checksumAlgorithmToValueParams")
-    public void sign_checksumAlgorithmPresent_shouldAddChecksumHeader(Map.Entry<ChecksumAlgorithm, String> checksumToValue) {
+    void sign_checksumAlgorithmPresent_shouldAddChecksumHeader(Map.Entry<ChecksumAlgorithm, String> checksumToValue) {
         ChecksumAlgorithm checksumAlgorithm = checksumToValue.getKey();
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
@@ -400,7 +409,7 @@ public void sign_checksumAlgorithmPresent_shouldAddChecksumHeader(Map.Entry<Chec
     }
 
     @Test
-    public void sign_checksumValueProvided_shouldNotOverrideChecksumHeader() {
+    void sign_checksumValueProvided_shouldNotOverrideChecksumHeader() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
                 httpRequest -> httpRequest
@@ -414,7 +423,7 @@ public void sign_checksumValueProvided_shouldNotOverrideChecksumHeader() {
     }
 
     @Test
-    public void sign_withProvidedHostHeader_shouldRespectUserHostHeader() {
+    void sign_withProvidedHostHeader_shouldRespectUserHostHeader() {
         AwsCredentialsIdentity credentials =
             AwsCredentialsIdentity.create("access", "secret");
 
@@ -434,4 +443,152 @@ public void sign_withProvidedHostHeader_shouldRespectUserHostHeader() {
         assertThat(signedRequest.request().firstMatchingHeader("X-Amz-Region-Set")).hasValue("aws-global");
         assertThat(signedRequest.request().firstMatchingHeader("Authorization")).isPresent();
     }
+
+    @Test
+    @Disabled("Broken - We don't pass x-amz-content-sha256 to CRT signer")
+    // TODO: This is currently broken because we don't preserve the 'x-amz-content-sha256' header when sending to CRT to sign:
+    // https://github.com/aws/aws-sdk-java-v2/blob/59e3a000503e1299675698e5c4c7af51f2525669/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/util/CrtUtils.java#L45
+    // Refer to JAVA-8531
+    void sign_WithPayloadSigningTrue_chunkEncodingFalse_cacheContainsChecksum_usesCachedValue() {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        byte[] checksumValue = "my-checksum".getBytes(StandardCharsets.UTF_8);
+        cache.putChecksumValue(SHA256, checksumValue);
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, true)
+                .putProperty(CHUNK_ENCODING_ENABLED, false)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        Optional<String> sha256Header = signedRequest.request().firstMatchingHeader("x-amz-content-sha256");
+        assertThat(sha256Header).hasValue(BinaryUtils.toHex(checksumValue));
+    }
+
+    @Test
+    void sign_WithPayloadSigningTrue_chunkEncodingFalse_cacheEmpty_storesComputedChecksum() throws IOException {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, true)
+                .putProperty(CHUNK_ENCODING_ENABLED, false)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        byte[] requestBytes = IoUtils.toByteArray(signedRequest.payload().get().newStream());
+        byte[] sha256Checksum = computeChecksum(SHA256, requestBytes);
+
+        assertThat(cache.getChecksumValue(SHA256)).isEqualTo(sha256Checksum);
+    }
+
+    @Test
+    void sign_WithPayloadSigningFalse_chunkEncodingTrue_cacheEmpty_storesComputedChecksum() throws IOException {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, false)
+                .putProperty(CHUNK_ENCODING_ENABLED, true)
+                .putProperty(CHECKSUM_ALGORITHM, CRC32)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        String requestPayload = IoUtils.toUtf8String(signedRequest.payload().get().newStream());
+
+        byte[] payloadChecksum = computeChecksum(CRC32, testPayload());
+
+        assertThat(cache.getChecksumValue(CRC32)).isEqualTo(payloadChecksum);
+        assertThat(requestPayload).contains("x-amz-checksum-crc32:" + BinaryUtils.toBase64(payloadChecksum) + "\r\n");
+    }
+
+    @Test
+    void sign_WithPayloadSigningFalse_chunkEncodingTrue_cacheContainsChecksum_usesCachedValue() throws IOException {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        byte[] checksumValue = "my-checksum".getBytes(StandardCharsets.UTF_8);
+        cache.putChecksumValue(CRC32, checksumValue);
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, false)
+                .putProperty(CHUNK_ENCODING_ENABLED, true)
+                .putProperty(CHECKSUM_ALGORITHM, CRC32)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        String requestPayload = IoUtils.toUtf8String(signedRequest.payload().get().newStream());
+
+        assertThat(requestPayload).contains("x-amz-checksum-crc32:" + BinaryUtils.toBase64(checksumValue) + "\r\n");
+    }
+
+    @Test
+    void sign_withPayloadSigningTrue_chunkEncodingFalse_withChecksum_cacheContainsCrc32AndSha256_usesCachedValues() {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        byte[] crc32Value = "my-crc32-checksum".getBytes(StandardCharsets.UTF_8);
+        cache.putChecksumValue(CRC32, crc32Value);
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, true)
+                .putProperty(CHUNK_ENCODING_ENABLED, false)
+                .putProperty(CHECKSUM_ALGORITHM, CRC32)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        SdkHttpRequest httpRequest = signedRequest.request();
+
+        assertThat(httpRequest.firstMatchingHeader("x-amz-checksum-crc32")).hasValue(BinaryUtils.toBase64(crc32Value));
+    }
+
+    @Test
+    void sign_withPayloadSigningTrue_chunkEncodingFalse_withChecksum_cacheEmpty_storesComputeChecksums() {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, true)
+                .putProperty(CHUNK_ENCODING_ENABLED, false)
+                .putProperty(CHECKSUM_ALGORITHM, CRC32)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        signer.sign(request);
+
+        byte[] crc32Value = computeChecksum(CRC32, testPayload());
+        byte[] sha256Value = computeChecksum(SHA256, testPayload());
+
+        AssertionsForClassTypes.assertThat(cache.getChecksumValue(SHA256)).isEqualTo(sha256Value);
+        AssertionsForClassTypes.assertThat(cache.getChecksumValue(CRC32)).isEqualTo(crc32Value);
+    }
+
+    private static byte[] computeChecksum(ChecksumAlgorithm algorithm, byte[] data) {
+        SdkChecksum checksum = SdkChecksum.forAlgorithm(algorithm);
+        checksum.update(data, 0, data.length);
+        return checksum.getChecksumBytes();
+    }
 }
diff --git a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSignerTest.java b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSignerTest.java
index 88d7456a901d..75c59b40e934 100644
--- a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSignerTest.java
+++ b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSignerTest.java
@@ -18,33 +18,45 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static software.amazon.awssdk.checksums.DefaultChecksumAlgorithm.CRC32;
+import static software.amazon.awssdk.checksums.DefaultChecksumAlgorithm.SHA256;
 import static software.amazon.awssdk.http.auth.aws.TestUtils.generateBasicAsyncRequest;
 import static software.amazon.awssdk.http.auth.aws.TestUtils.generateBasicRequest;
+import static software.amazon.awssdk.http.auth.aws.TestUtils.testPayload;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.CONTENT_ENCODING;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner.AUTH_LOCATION;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner.CHECKSUM_ALGORITHM;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner.CHUNK_ENCODING_ENABLED;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner.EXPIRATION_DURATION;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner.PAYLOAD_SIGNING_ENABLED;
+import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_CACHE;
 
+import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
+import java.util.Optional;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
+import software.amazon.awssdk.checksums.SdkChecksum;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
 import software.amazon.awssdk.http.Header;
+import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.aws.TestUtils;
 import software.amazon.awssdk.http.auth.aws.eventstream.internal.io.SigV4DataFramePublisher;
 import software.amazon.awssdk.http.auth.aws.signer.AwsV4FamilyHttpSigner.AuthLocation;
 import software.amazon.awssdk.http.auth.spi.signer.AsyncSignRequest;
 import software.amazon.awssdk.http.auth.spi.signer.AsyncSignedRequest;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.http.auth.spi.signer.SignRequest;
 import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
 import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
+import software.amazon.awssdk.utils.BinaryUtils;
 import software.amazon.awssdk.utils.ClassLoaderHelper;
+import software.amazon.awssdk.utils.IoUtils;
 
 /**
  * Test the delegation of signing to the correct implementations.
@@ -54,7 +66,7 @@ public class DefaultAwsV4HttpSignerTest {
     DefaultAwsV4HttpSigner signer = new DefaultAwsV4HttpSigner();
 
     @Test
-    public void sign_WithNoAdditonalProperties_DelegatesToHeaderSigner() {
+    void sign_WithNoAdditonalProperties_DelegatesToHeaderSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -69,7 +81,7 @@ public void sign_WithNoAdditonalProperties_DelegatesToHeaderSigner() {
     }
 
     @Test
-    public void signAsync_WithNoAdditonalProperties_DelegatesToHeaderSigner() {
+    void signAsync_WithNoAdditonalProperties_DelegatesToHeaderSigner() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -84,7 +96,7 @@ public void signAsync_WithNoAdditonalProperties_DelegatesToHeaderSigner() {
     }
 
     @Test
-    public void sign_WithQueryAuthLocation_DelegatesToQuerySigner() {
+    void sign_WithQueryAuthLocation_DelegatesToQuerySigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -98,7 +110,7 @@ public void sign_WithQueryAuthLocation_DelegatesToQuerySigner() {
     }
 
     @Test
-    public void signAsync_WithQueryAuthLocation_DelegatesToQuerySigner() {
+    void signAsync_WithQueryAuthLocation_DelegatesToQuerySigner() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -113,7 +125,7 @@ public void signAsync_WithQueryAuthLocation_DelegatesToQuerySigner() {
 
     @ParameterizedTest
     @ValueSource(longs = {-1, 0, 604801})
-    public void sign_WithQueryAuthLocationAndInvalidExpiration_Throws(long seconds) {
+    void sign_WithQueryAuthLocationAndInvalidExpiration_Throws(long seconds) {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -128,7 +140,7 @@ public void sign_WithQueryAuthLocationAndInvalidExpiration_Throws(long seconds)
 
     @ParameterizedTest
     @ValueSource(longs = {-1, 0, 604801})
-    public void signAsync_WithQueryAuthLocationAndInvalidExpiration_Throws(long seconds) {
+    void signAsync_WithQueryAuthLocationAndInvalidExpiration_Throws(long seconds) {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -142,7 +154,7 @@ public void signAsync_WithQueryAuthLocationAndInvalidExpiration_Throws(long seco
     }
 
     @Test
-    public void sign_WithQueryAuthLocationAndExpiration_DelegatesToPresignedSigner() {
+    void sign_WithQueryAuthLocationAndExpiration_DelegatesToPresignedSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -158,7 +170,7 @@ public void sign_WithQueryAuthLocationAndExpiration_DelegatesToPresignedSigner()
     }
 
     @Test
-    public void signAsync_WithQueryAuthLocationAndExpiration_DelegatesToPresignedSigner() {
+    void signAsync_WithQueryAuthLocationAndExpiration_DelegatesToPresignedSigner() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -174,7 +186,7 @@ public void signAsync_WithQueryAuthLocationAndExpiration_DelegatesToPresignedSig
     }
 
     @Test
-    public void sign_WithHeaderAuthLocationAndExpirationDuration_Throws() {
+    void sign_WithHeaderAuthLocationAndExpirationDuration_Throws() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -188,7 +200,7 @@ public void sign_WithHeaderAuthLocationAndExpirationDuration_Throws() {
     }
 
     @Test
-    public void signAsync_WithHeaderAuthLocationAndExpirationDuration_Throws() {
+    void signAsync_WithHeaderAuthLocationAndExpirationDuration_Throws() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -202,7 +214,7 @@ public void signAsync_WithHeaderAuthLocationAndExpirationDuration_Throws() {
     }
 
     @Test
-    public void sign_withAnonymousCreds_shouldNotSign() {
+    void sign_withAnonymousCreds_shouldNotSign() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             new TestUtils.AnonymousCredentialsIdentity(),
             httpRequest -> {
@@ -218,7 +230,7 @@ public void sign_withAnonymousCreds_shouldNotSign() {
     }
 
     @Test
-    public void signAsync_withAnonymousCreds_shouldNotSign() {
+    void signAsync_withAnonymousCreds_shouldNotSign() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             new TestUtils.AnonymousCredentialsIdentity(),
             httpRequest -> {
@@ -234,7 +246,7 @@ public void signAsync_withAnonymousCreds_shouldNotSign() {
     }
 
     @Test
-    public void sign_WithPayloadSigningFalse_DelegatesToUnsignedPayloadSigner() {
+    void sign_WithPayloadSigningFalse_DelegatesToUnsignedPayloadSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -249,7 +261,7 @@ public void sign_WithPayloadSigningFalse_DelegatesToUnsignedPayloadSigner() {
     }
 
     @Test
-    public void signAsync_WithPayloadSigningFalse_DelegatesToUnsignedPayloadSigner() {
+    void signAsync_WithPayloadSigningFalse_DelegatesToUnsignedPayloadSigner() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -264,7 +276,7 @@ public void signAsync_WithPayloadSigningFalse_DelegatesToUnsignedPayloadSigner()
     }
 
     @Test
-    public void sign_WithPayloadSigningFalseAndHttpAndNoPayload_DelegatesToUnsignedPayloadSigner() {
+    void sign_WithPayloadSigningFalseAndHttpAndNoPayload_DelegatesToUnsignedPayloadSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest ->
@@ -280,7 +292,7 @@ public void sign_WithPayloadSigningFalseAndHttpAndNoPayload_DelegatesToUnsignedP
     }
 
     @Test
-    public void signAsync_WithPayloadSigningFalseAndHttpAndNoPayload_DelegatesToUnsignedPayloadSigner() {
+    void signAsync_WithPayloadSigningFalseAndHttpAndNoPayload_DelegatesToUnsignedPayloadSigner() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest ->
@@ -296,7 +308,7 @@ public void signAsync_WithPayloadSigningFalseAndHttpAndNoPayload_DelegatesToUnsi
     }
 
     @Test
-    public void sign_WithEventStreamContentTypeWithoutHttpAuthAwsEventStreamModule_throws() {
+    void sign_WithEventStreamContentTypeWithoutHttpAuthAwsEventStreamModule_throws() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -316,7 +328,7 @@ public void sign_WithEventStreamContentTypeWithoutHttpAuthAwsEventStreamModule_t
     }
 
     @Test
-    public void signAsync_WithEventStreamContentTypeWithoutHttpAuthAwsEventStreamModule_throws() {
+    void signAsync_WithEventStreamContentTypeWithoutHttpAuthAwsEventStreamModule_throws() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -336,7 +348,7 @@ public void signAsync_WithEventStreamContentTypeWithoutHttpAuthAwsEventStreamMod
     }
 
     @Test
-    public void sign_WithEventStreamContentType_Throws() {
+    void sign_WithEventStreamContentType_Throws() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -349,7 +361,7 @@ public void sign_WithEventStreamContentType_Throws() {
     }
 
     @Test
-    public void signAsync_WithEventStreamContentType_DelegatesToEventStreamPayloadSigner() {
+    void signAsync_WithEventStreamContentType_DelegatesToEventStreamPayloadSigner() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -364,7 +376,7 @@ public void signAsync_WithEventStreamContentType_DelegatesToEventStreamPayloadSi
     }
 
     @Test
-    public void sign_WithEventStreamContentTypeAndUnsignedPayload_Throws() {
+    void sign_WithEventStreamContentTypeAndUnsignedPayload_Throws() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -377,7 +389,7 @@ public void sign_WithEventStreamContentTypeAndUnsignedPayload_Throws() {
     }
 
     @Test
-    public void signAsync_WithEventStreamContentTypeAndUnsignedPayload_Throws() {
+    void signAsync_WithEventStreamContentTypeAndUnsignedPayload_Throws() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -390,7 +402,7 @@ public void signAsync_WithEventStreamContentTypeAndUnsignedPayload_Throws() {
     }
 
     @Test
-    public void sign_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner() {
+    void sign_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -410,7 +422,7 @@ public void sign_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner() {
     // TODO(sra-identity-and-auth): Once chunk-encoding support in async is added, we can enable these tests.
     @Disabled("Chunk-encoding is not currently supported in the Async signing path - it is handled in HttpChecksumStage for now.")
     @Test
-    public void signAsync_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner_futureBehavior() {
+    void signAsync_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner_futureBehavior() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -430,7 +442,7 @@ public void signAsync_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner_f
 
     // TODO(sra-identity-and-auth): Replace this test with the above test once chunk-encoding support is added
     @Test
-    public void signAsync_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner() {
+    void signAsync_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -448,7 +460,7 @@ public void signAsync_WithChunkEncodingTrue_DelegatesToAwsChunkedPayloadSigner()
     }
 
     @Test
-    public void sign_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunkedPayloadSigner() {
+    void sign_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunkedPayloadSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -470,7 +482,7 @@ public void sign_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunked
     // TODO(sra-identity-and-auth): Once chunk-encoding support in async is added, we can enable these tests.
     @Disabled("Chunk-encoding is not currently supported in the Async signing path - it is handled in HttpChecksumStage for now.")
     @Test
-    public void signAsync_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunkedPayloadSigner_futureBehavior() {
+    void signAsync_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunkedPayloadSigner_futureBehavior() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -492,7 +504,7 @@ public void signAsync_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsCh
 
     // TODO(sra-identity-and-auth): Replace this test with the above test once chunk-encoding support is added
     @Test
-    public void signAsync_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunkedPayloadSigner() {
+    void signAsync_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsChunkedPayloadSigner() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -512,7 +524,7 @@ public void signAsync_WithChunkEncodingTrueAndChecksumAlgorithm_DelegatesToAwsCh
     }
 
     @Test
-    public void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndFlexibleChecksum_DelegatesToAwsChunkedPayloadSigner() {
+    void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndFlexibleChecksum_DelegatesToAwsChunkedPayloadSigner() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -535,7 +547,7 @@ public void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndFlexibleChecksum_
     // TODO(sra-identity-and-auth): Once chunk-encoding support in async is added, we can enable these tests.
     @Disabled("Chunk-encoding is not currently supported in the Async signing path - it is handled in HttpChecksumStage for now.")
     @Test
-    public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndTrailer_DelegatesToAwsChunkedPayloadSigner_futureBehavior() {
+    void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndTrailer_DelegatesToAwsChunkedPayloadSigner_futureBehavior() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -558,7 +570,7 @@ public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndTrailer_Dele
 
     // TODO(sra-identity-and-auth): Replace this test with the above test once chunk-encoding support is added
     @Test
-    public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndTrailer_DelegatesToAwsChunkedPayloadSigner() {
+    void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndTrailer_DelegatesToAwsChunkedPayloadSigner() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest
@@ -579,7 +591,7 @@ public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndTrailer_Dele
     }
 
     @Test
-    public void sign_WithPayloadSigningFalseAndChunkEncodingTrue_DelegatesToUnsignedPayload() {
+    void sign_WithPayloadSigningFalseAndChunkEncodingTrue_DelegatesToUnsignedPayload() {
         // Currently, there is no use-case for unsigned chunk-encoding without trailers, so we should assert it falls back to
         // unsigned-payload (not chunk-encoded)
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
@@ -597,7 +609,7 @@ public void sign_WithPayloadSigningFalseAndChunkEncodingTrue_DelegatesToUnsigned
     }
 
     @Test
-    public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueWithoutTrailer_DelegatesToUnsignedPayload() {
+    void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueWithoutTrailer_DelegatesToUnsignedPayload() {
         // Currently, there is no use-case for unsigned chunk-encoding without trailers, so we should assert it falls back to
         // unsigned-payload (not chunk-encoded)
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
@@ -615,7 +627,7 @@ public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueWithoutTrailer_
     }
 
     @Test
-    public void sign_WithPayloadSigningFalseAndChunkEncodingTrueWithChecksumHeader_DelegatesToUnsignedPayload() {
+    void sign_WithPayloadSigningFalseAndChunkEncodingTrueWithChecksumHeader_DelegatesToUnsignedPayload() {
         // If a checksum is given explicitly, we shouldn't treat it as a flexible-checksum-enabled request
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
@@ -634,7 +646,7 @@ public void sign_WithPayloadSigningFalseAndChunkEncodingTrueWithChecksumHeader_D
     }
 
     @Test
-    public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueWithChecksumHeader_DelegatesToUnsignedPayload() {
+    void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueWithChecksumHeader_DelegatesToUnsignedPayload() {
         // If a checksum is given explicitly, we shouldn't treat it as a flexible-checksum-enabled request
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
@@ -653,7 +665,7 @@ public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueWithChecksumHea
     }
 
     @Test
-    public void sign_withChecksumAlgorithm_DelegatesToChecksummerWithThatChecksumAlgorithm() {
+    void sign_withChecksumAlgorithm_DelegatesToChecksummerWithThatChecksumAlgorithm() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -668,7 +680,7 @@ public void sign_withChecksumAlgorithm_DelegatesToChecksummerWithThatChecksumAlg
     }
 
     @Test
-    public void signAsync_withChecksumAlgorithm_DelegatesToChecksummerWithThatChecksumAlgorithm() {
+    void signAsync_withChecksumAlgorithm_DelegatesToChecksummerWithThatChecksumAlgorithm() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -683,7 +695,7 @@ public void signAsync_withChecksumAlgorithm_DelegatesToChecksummerWithThatChecks
     }
 
     @Test
-    public void sign_withChecksumAlgorithmAndPayloadSigningFalse_DelegatesToChecksummerWithThatChecksumAlgorithm() {
+    void sign_withChecksumAlgorithmAndPayloadSigningFalse_DelegatesToChecksummerWithThatChecksumAlgorithm() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -700,7 +712,7 @@ public void sign_withChecksumAlgorithmAndPayloadSigningFalse_DelegatesToChecksum
     }
 
     @Test
-    public void signAsync_withChecksumAlgorithmAndPayloadSigningFalse_DelegatesToChecksummerWithThatChecksumAlgorithm() {
+    void signAsync_withChecksumAlgorithmAndPayloadSigningFalse_DelegatesToChecksummerWithThatChecksumAlgorithm() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> {
@@ -717,7 +729,7 @@ public void signAsync_withChecksumAlgorithmAndPayloadSigningFalse_DelegatesToChe
     }
 
     @Test
-    public void sign_WithPayloadSigningFalseAndHttp_FallsBackToPayloadSigning() {
+    void sign_WithPayloadSigningFalseAndHttp_FallsBackToPayloadSigning() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
@@ -732,7 +744,7 @@ public void sign_WithPayloadSigningFalseAndHttp_FallsBackToPayloadSigning() {
     }
 
     @Test
-    public void signAsync_WithPayloadSigningFalseAndHttp_FallsBackToPayloadSigning() {
+    void signAsync_WithPayloadSigningFalseAndHttp_FallsBackToPayloadSigning() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
@@ -747,7 +759,7 @@ public void signAsync_WithPayloadSigningFalseAndHttp_FallsBackToPayloadSigning()
     }
 
     @Test
-    public void sign_WithPayloadSigningTrueAndChunkEncodingTrueAndHttp_SignsPayload() {
+    void sign_WithPayloadSigningTrueAndChunkEncodingTrueAndHttp_SignsPayload() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
@@ -767,7 +779,7 @@ public void sign_WithPayloadSigningTrueAndChunkEncodingTrueAndHttp_SignsPayload(
     // TODO(sra-identity-and-auth): Once chunk-encoding is implemented in the async path, the assertions this test makes should
     //  be different - the assertions should mirror the above case.
     @Test
-    public void signAsync_WithPayloadSigningTrueAndChunkEncodingTrueAndHttp_IgnoresPayloadSigning() {
+    void signAsync_WithPayloadSigningTrueAndChunkEncodingTrueAndHttp_IgnoresPayloadSigning() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
@@ -783,7 +795,7 @@ public void signAsync_WithPayloadSigningTrueAndChunkEncodingTrueAndHttp_IgnoresP
     }
 
     @Test
-    public void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndHttp_SignsPayload() {
+    void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndHttp_SignsPayload() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
@@ -803,7 +815,7 @@ public void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndHttp_SignsPayload
     // TODO(sra-identity-and-auth): Once chunk-encoding is implemented in the async path, the assertions this test makes should
     //  be different - the assertions should mirror the above case.
     @Test
-    public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndHttp_DoesNotFallBackToPayloadSigning() {
+    void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndHttp_DoesNotFallBackToPayloadSigning() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
@@ -819,7 +831,7 @@ public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndHttp_DoesNot
     }
 
     @Test
-    public void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndFlexibleChecksumAndHttp_SignsPayload() {
+    void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndFlexibleChecksumAndHttp_SignsPayload() {
         SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
@@ -841,7 +853,7 @@ public void sign_WithPayloadSigningFalseAndChunkEncodingTrueAndFlexibleChecksumA
     // TODO(sra-identity-and-auth): Once chunk-encoding is implemented in the async path, the assertions this test makes should
     //  be different - the assertions should mirror the above case.
     @Test
-    public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndFlexibleChecksumAndHttp_DoesNotFallBackToPayloadSigning() {
+    void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndFlexibleChecksumAndHttp_DoesNotFallBackToPayloadSigning() {
         AsyncSignRequest<? extends AwsCredentialsIdentity> request = generateBasicAsyncRequest(
             AwsCredentialsIdentity.create("access", "secret"),
             httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
@@ -856,4 +868,151 @@ public void signAsync_WithPayloadSigningFalseAndChunkEncodingTrueAndFlexibleChec
         assertThat(signedRequest.request().firstMatchingHeader("x-amz-content-sha256"))
             .hasValue("STREAMING-UNSIGNED-PAYLOAD-TRAILER");
     }
+
+    @Test
+    void sign_WithPayloadSigningTrue_chunkEncodingFalse_cacheContainsChecksum_usesCachedValue() {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        byte[] checksumValue = "my-checksum".getBytes(StandardCharsets.UTF_8);
+        cache.putChecksumValue(SHA256, checksumValue);
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, true)
+                .putProperty(CHUNK_ENCODING_ENABLED, false)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        Optional<String> sha256Header = signedRequest.request().firstMatchingHeader("x-amz-content-sha256");
+        assertThat(sha256Header).hasValue(BinaryUtils.toHex(checksumValue));
+    }
+
+    @Test
+    void sign_WithPayloadSigningTrue_chunkEncodingFalse_cacheEmpty_storesComputedChecksum() throws IOException {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, true)
+                .putProperty(CHUNK_ENCODING_ENABLED, false)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        byte[] requestBytes = IoUtils.toByteArray(signedRequest.payload().get().newStream());
+        byte[] sha256Checksum = computeChecksum(SHA256, requestBytes);
+
+        assertThat(cache.getChecksumValue(SHA256)).isEqualTo(sha256Checksum);
+    }
+
+    @Test
+    void sign_WithPayloadSigningFalse_chunkEncodingTrue_cacheEmpty_storesComputedChecksum() throws IOException {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, false)
+                .putProperty(CHUNK_ENCODING_ENABLED, true)
+                .putProperty(CHECKSUM_ALGORITHM, CRC32)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        String requestPayload = IoUtils.toUtf8String(signedRequest.payload().get().newStream());
+
+        byte[] payloadChecksum = computeChecksum(CRC32, testPayload());
+
+        assertThat(cache.getChecksumValue(CRC32)).isEqualTo(payloadChecksum);
+        assertThat(requestPayload).contains("x-amz-checksum-crc32:" + BinaryUtils.toBase64(payloadChecksum) + "\r\n");
+    }
+
+    @Test
+    void sign_WithPayloadSigningFalse_chunkEncodingTrue_cacheContainsChecksum_usesCachedValue() throws IOException {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        byte[] checksumValue = "my-checksum".getBytes(StandardCharsets.UTF_8);
+        cache.putChecksumValue(CRC32, checksumValue);
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, false)
+                .putProperty(CHUNK_ENCODING_ENABLED, true)
+                .putProperty(CHECKSUM_ALGORITHM, CRC32)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        String requestPayload = IoUtils.toUtf8String(signedRequest.payload().get().newStream());
+
+        assertThat(requestPayload).contains("x-amz-checksum-crc32:" + BinaryUtils.toBase64(checksumValue) + "\r\n");
+    }
+
+    @Test
+    void sign_withPayloadSigningTrue_chunkEncodingFalse_withChecksum_cacheContainsCrc32AndSha256_usesCachedValues() {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        byte[] crc32Value = "my-crc32-checksum".getBytes(StandardCharsets.UTF_8);
+        cache.putChecksumValue(CRC32, crc32Value);
+
+        byte[] sha256Value = "my-sha256-checksum".getBytes(StandardCharsets.UTF_8);
+        cache.putChecksumValue(SHA256, sha256Value);
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, true)
+                .putProperty(CHUNK_ENCODING_ENABLED, false)
+                .putProperty(CHECKSUM_ALGORITHM, CRC32)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        SignedRequest signedRequest = signer.sign(request);
+
+        SdkHttpRequest httpRequest = signedRequest.request();
+        assertThat(httpRequest.firstMatchingHeader("x-amz-content-sha256")).hasValue(BinaryUtils.toHex(sha256Value));
+        assertThat(httpRequest.firstMatchingHeader("x-amz-checksum-crc32")).hasValue(BinaryUtils.toBase64(crc32Value));
+    }
+
+    @Test
+    void sign_withPayloadSigningTrue_chunkEncodingFalse_withChecksum_cacheEmpty_storesComputeChecksums() {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        SignRequest<? extends AwsCredentialsIdentity> request = generateBasicRequest(
+            AwsCredentialsIdentity.create("access", "secret"),
+            httpRequest -> httpRequest.uri(URI.create("http://demo.us-east-1.amazonaws.com")),
+            signRequest -> signRequest
+                .putProperty(PAYLOAD_SIGNING_ENABLED, true)
+                .putProperty(CHUNK_ENCODING_ENABLED, false)
+                .putProperty(CHECKSUM_ALGORITHM, CRC32)
+                .putProperty(CHECKSUM_CACHE, cache)
+        );
+
+        signer.sign(request);
+
+        byte[] crc32Value = computeChecksum(CRC32, testPayload());
+        byte[] sha256Value = computeChecksum(SHA256, testPayload());
+
+        assertThat(cache.getChecksumValue(SHA256)).isEqualTo(sha256Value);
+        assertThat(cache.getChecksumValue(CRC32)).isEqualTo(crc32Value);
+    }
+
+    private static byte[] computeChecksum(ChecksumAlgorithm algorithm, byte[] data) {
+        SdkChecksum checksum = SdkChecksum.forAlgorithm(algorithm);
+        checksum.update(data, 0, data.length);
+        return checksum.getChecksumBytes();
+    }
 }
diff --git a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/FlexibleChecksummerTest.java b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/FlexibleChecksummerTest.java
index 25417a1acb81..2e44069e6549 100644
--- a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/FlexibleChecksummerTest.java
+++ b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/FlexibleChecksummerTest.java
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.http.auth.aws.internal.signer;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static software.amazon.awssdk.checksums.DefaultChecksumAlgorithm.CRC32;
 import static software.amazon.awssdk.checksums.DefaultChecksumAlgorithm.CRC64NVME;
@@ -31,6 +32,7 @@
 import software.amazon.awssdk.http.ContentStreamProvider;
 import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
 
 public class FlexibleChecksummerTest {
@@ -45,7 +47,7 @@ public class FlexibleChecksummerTest {
 
     @Test
     public void checksummer_withNoChecksums_shouldNotAddAnyChecksum() {
-        FlexibleChecksummer checksummer = new FlexibleChecksummer();
+        FlexibleChecksummer checksummer = new FlexibleChecksummer(PayloadChecksumStore.create());
         SdkHttpRequest expectedRequest = request.build();
 
         checksummer.checksum(payload, request);
@@ -55,7 +57,7 @@ public void checksummer_withNoChecksums_shouldNotAddAnyChecksum() {
 
     @Test
     public void checksummerAsync_withNoChecksums_shouldNotAddAnyChecksum() {
-        FlexibleChecksummer checksummer = new FlexibleChecksummer();
+        FlexibleChecksummer checksummer = new FlexibleChecksummer(PayloadChecksumStore.create());
         SdkHttpRequest expectedRequest = request.build();
 
         checksummer.checksum(payloadAsync, request);
@@ -66,6 +68,7 @@ public void checksummerAsync_withNoChecksums_shouldNotAddAnyChecksum() {
     @Test
     public void checksummer_withOneChecksum_shouldAddOneChecksum() {
         FlexibleChecksummer checksummer = new FlexibleChecksummer(
+            PayloadChecksumStore.create(),
             option().headerName("sha256").algorithm(SHA256).formatter(BinaryUtils::toHex).build()
         );
         SdkHttpRequest expectedRequest = request
@@ -80,6 +83,7 @@ public void checksummer_withOneChecksum_shouldAddOneChecksum() {
     @Test
     public void checksummerAsync_withOneChecksum_shouldAddOneChecksum() {
         FlexibleChecksummer checksummer = new FlexibleChecksummer(
+            PayloadChecksumStore.create(),
             option().headerName("sha256").algorithm(SHA256).formatter(BinaryUtils::toBase64).build()
         );
         SdkHttpRequest expectedRequest = request
@@ -94,6 +98,7 @@ public void checksummerAsync_withOneChecksum_shouldAddOneChecksum() {
     @Test
     public void checksummer_withMultipleChecksums_shouldAddAllChecksums() {
         FlexibleChecksummer checksummer = new FlexibleChecksummer(
+            PayloadChecksumStore.create(),
             option().headerName("sha256").algorithm(SHA256).formatter(BinaryUtils::toHex).build(),
             option().headerName("crc32").algorithm(CRC32).formatter(BinaryUtils::toBase64).build(),
             option().headerName("crc64nvme").algorithm(CRC64NVME).formatter(BinaryUtils::toBase64).build()
@@ -112,6 +117,7 @@ public void checksummer_withMultipleChecksums_shouldAddAllChecksums() {
     @Test
     public void checksummerAsync_withMultipleChecksums_shouldAddAllChecksums() {
         FlexibleChecksummer checksummer = new FlexibleChecksummer(
+            PayloadChecksumStore.create(),
             option().headerName("sha256").algorithm(SHA256).formatter(BinaryUtils::toBase64).build(),
             option().headerName("crc32").algorithm(CRC32).formatter(BinaryUtils::toHex).build(),
             option().headerName("crc64nvme").algorithm(CRC64NVME).formatter(BinaryUtils::toBase64).build()
@@ -126,4 +132,66 @@ public void checksummerAsync_withMultipleChecksums_shouldAddAllChecksums() {
 
         assertEquals(expectedRequest.headers(), request.build().headers());
     }
+
+    @Test
+    public void checksummer_withCachedValue_shouldPreferCachedValue() {
+        byte[] checksumValue = "HelloWorld".getBytes(StandardCharsets.UTF_8);
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+        cache.putChecksumValue(SHA256, checksumValue);
+
+        FlexibleChecksummer checksummer = new FlexibleChecksummer(
+            cache,
+            option().headerName("sha256").algorithm(SHA256).formatter(BinaryUtils::toBase64).build()
+        );
+
+        checksummer.checksum(payload, request);
+
+        assertThat(request.firstMatchingHeader("sha256")).hasValue(BinaryUtils.toBase64(checksumValue));
+    }
+
+    @Test
+    public void checksummer_noCachedValue_shouldCacheComputedValue() {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        FlexibleChecksummer checksummer = new FlexibleChecksummer(
+            cache,
+            option().headerName("sha256").algorithm(SHA256).formatter(BinaryUtils::toBase64).build()
+        );
+
+        checksummer.checksum(payload, request);
+
+        assertThat(cache.getChecksumValue(SHA256))
+            .isEqualTo(BinaryUtils.fromBase64("LCa0a2j/xo/5m0U8HTBBNBNCLXBkg7+g+YpeiGJm564="));
+    }
+
+    @Test
+    void checksummerAsync_withCachedValue_shouldPreferCachedValue() {
+        byte[] checksumValue = "HelloWorld".getBytes(StandardCharsets.UTF_8);
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+        cache.putChecksumValue(SHA256, checksumValue);
+
+        FlexibleChecksummer checksummer = new FlexibleChecksummer(
+            cache,
+            option().headerName("sha256").algorithm(SHA256).formatter(BinaryUtils::toBase64).build()
+        );
+
+        checksummer.checksum(payloadAsync, request);
+
+        assertThat(request.firstMatchingHeader("sha256")).hasValue(BinaryUtils.toBase64(checksumValue));
+    }
+
+    @Test
+    void checksummerAsync_noCachedValue_shouldCacheComputedValue() {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        FlexibleChecksummer checksummer = new FlexibleChecksummer(
+            cache,
+            option().headerName("sha256").algorithm(SHA256).formatter(BinaryUtils::toBase64).build()
+        );
+
+        checksummer.checksum(payloadAsync, request);
+
+        assertThat(BinaryUtils.toBase64(cache.getChecksumValue(SHA256)))
+            .isEqualTo("LCa0a2j/xo/5m0U8HTBBNBNCLXBkg7+g+YpeiGJm564=");
+    }
 }
diff --git a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProviderTest.java b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProviderTest.java
new file mode 100644
index 000000000000..7cf58cb7825b
--- /dev/null
+++ b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProviderTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.http.auth.aws.internal.signer.chunkedencoding;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.checksums.DefaultChecksumAlgorithm;
+import software.amazon.awssdk.checksums.SdkChecksum;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
+import software.amazon.awssdk.utils.BinaryUtils;
+import software.amazon.awssdk.utils.Pair;
+
+public class ChecksumTrailerProviderTest {
+
+    @Test
+    void reset_resetsChecksum() {
+        SdkChecksum mockCrc32 = mock(SdkChecksum.class);
+
+        ChecksumTrailerProvider provider = new ChecksumTrailerProvider(mockCrc32,
+                                                                       "my-checksum",
+                                                                       DefaultChecksumAlgorithm.CRC32,
+                                                                       PayloadChecksumStore.create());
+
+        provider.reset();
+
+        verify(mockCrc32).reset();
+    }
+
+    @Test
+    void get_cacheContainsChecksumValue_usesCachedValued() {
+        SdkChecksum mockCrc32 = mock(SdkChecksum.class);
+        byte[] checksumValue = "Hello".getBytes(StandardCharsets.UTF_8);
+        when(mockCrc32.getChecksumBytes()).thenReturn(checksumValue);
+
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+        cache.putChecksumValue(DefaultChecksumAlgorithm.CRC32, checksumValue);
+
+        ChecksumTrailerProvider provider = new ChecksumTrailerProvider(mockCrc32,
+                                                                       "my-checksum-crc32",
+                                                                       DefaultChecksumAlgorithm.CRC32,
+                                                                       cache);
+
+        Pair<String, List<String>> result = provider.get();
+
+        assertThat(result.right().get(0)).isEqualTo(BinaryUtils.toBase64(checksumValue));
+        verifyNoInteractions(mockCrc32);
+    }
+
+    @Test
+    public void get_cacheEmpty_storesSdkChecksumValue() {
+        SdkChecksum mockCrc32 = mock(SdkChecksum.class);
+        byte[] checksumValue = "Hello".getBytes(StandardCharsets.UTF_8);
+        when(mockCrc32.getChecksumBytes()).thenReturn(checksumValue);
+
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        ChecksumTrailerProvider provider = new ChecksumTrailerProvider(mockCrc32,
+                                                                       "my-checksum-crc32",
+                                                                       DefaultChecksumAlgorithm.CRC32,
+                                                                       cache);
+
+        Pair<String, List<String>> result = provider.get();
+
+        assertThat(result.right().get(0)).isEqualTo(BinaryUtils.toBase64(checksumValue));
+        assertThat(cache.getChecksumValue(DefaultChecksumAlgorithm.CRC32)).isEqualTo(checksumValue);
+    }
+}
diff --git a/core/http-auth-spi/pom.xml b/core/http-auth-spi/pom.xml
index d7848b7287a1..30e43ecd54dc 100644
--- a/core/http-auth-spi/pom.xml
+++ b/core/http-auth-spi/pom.xml
@@ -49,6 +49,11 @@
             <artifactId>http-client-spi</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>checksums-spi</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams</artifactId>
diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/signer/DefaultPayloadChecksumStore.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/signer/DefaultPayloadChecksumStore.java
new file mode 100644
index 000000000000..d2b995c19c6d
--- /dev/null
+++ b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/signer/DefaultPayloadChecksumStore.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.http.auth.spi.internal.signer;
+
+import java.util.concurrent.ConcurrentHashMap;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
+
+/**
+ * Default implementation of {@link PayloadChecksumStore}.
+ */
+@SdkInternalApi
+@ThreadSafe
+public class DefaultPayloadChecksumStore implements PayloadChecksumStore {
+    private final ConcurrentHashMap<String, byte[]> cache = new ConcurrentHashMap<>();
+
+    @Override
+    public byte[] putChecksumValue(ChecksumAlgorithm algorithm, byte[] value) {
+        return cache.put(algorithm.algorithmId(), value);
+    }
+
+    @Override
+    public byte[] getChecksumValue(ChecksumAlgorithm algorithm) {
+        return cache.get(algorithm.algorithmId());
+    }
+
+    @Override
+    public boolean containsChecksumValue(ChecksumAlgorithm algorithm) {
+        return cache.containsKey(algorithm.algorithmId());
+    }
+}
diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/PayloadChecksumStore.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/PayloadChecksumStore.java
new file mode 100644
index 000000000000..f8c8a9d47c7d
--- /dev/null
+++ b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/PayloadChecksumStore.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.http.auth.spi.signer;
+
+import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
+import software.amazon.awssdk.http.auth.spi.internal.signer.DefaultPayloadChecksumStore;
+
+/**
+ * Storage object for storing computed checksums for a request payload.
+ */
+@SdkProtectedApi
+public interface PayloadChecksumStore {
+    /**
+     * Store the checksum value computed using the given algorithm.
+     *
+     * @return The previous value stored for this algorithm or {@code null} if not present.
+     */
+    byte[] putChecksumValue(ChecksumAlgorithm algorithm, byte[] checksum);
+
+    /**
+     * Retrieve the stored checksum value for the given algorithm.
+     *
+     * @return The checksum value for the given algorithm or {@code null} if not present.
+     */
+    byte[] getChecksumValue(ChecksumAlgorithm algorithm);
+
+    /**
+     * Returns {@code true} if the store contains a checksum value for the given algorithm, {@code false} otherwise.
+     */
+    boolean containsChecksumValue(ChecksumAlgorithm algorithm);
+
+    /**
+     * Returns the default implementation of this interface.
+     */
+    static PayloadChecksumStore create() {
+        return new DefaultPayloadChecksumStore();
+    }
+}
diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/SdkInternalHttpSignerProperty.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/SdkInternalHttpSignerProperty.java
new file mode 100644
index 000000000000..bb4a4c3310bf
--- /dev/null
+++ b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/SdkInternalHttpSignerProperty.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.http.auth.spi.signer;
+
+import software.amazon.awssdk.annotations.SdkProtectedApi;
+
+/**
+ * {@code HttpSigner} properties intended for use only by internal components of the SDK and SDK-provided implementations of
+ * this SPI.
+ */
+@SdkProtectedApi
+public final class SdkInternalHttpSignerProperty {
+
+    /**
+     * A cache for storing checksums calculated for a payload.
+     *
+     * <p>Note, checksums may not be relevant to some signers.
+     */
+    public static final SignerProperty<PayloadChecksumStore> CHECKSUM_CACHE =
+        SignerProperty.create(SdkInternalHttpSignerProperty.class, "ChecksumCache");
+
+    private SdkInternalHttpSignerProperty() {
+    }
+}
diff --git a/core/http-auth-spi/src/test/java/software/amazon/awssdk/http/auth/spi/signer/PayloadChecksumStoreTest.java b/core/http-auth-spi/src/test/java/software/amazon/awssdk/http/auth/spi/signer/PayloadChecksumStoreTest.java
new file mode 100644
index 000000000000..4ab329b0ee5d
--- /dev/null
+++ b/core/http-auth-spi/src/test/java/software/amazon/awssdk/http/auth/spi/signer/PayloadChecksumStoreTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.http.auth.spi.signer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
+import software.amazon.awssdk.http.auth.spi.internal.signer.DefaultPayloadChecksumStore;
+
+public class PayloadChecksumStoreTest {
+    private static final ChecksumAlgorithm ALGORITHM  = () -> "crc32";
+
+    @Test
+    void putChecksumValue_noPreviousEntry_returnsNull() {
+        DefaultPayloadChecksumStore cache = new DefaultPayloadChecksumStore();
+
+        byte[] previous = cache.putChecksumValue(ALGORITHM, new byte[] {1, 2, 3});
+
+        assertThat(previous).isNull();
+    }
+
+    @Test
+    public void putChecksumValue_previousEntry_returnsValue() {
+        DefaultPayloadChecksumStore cache = new DefaultPayloadChecksumStore();
+
+        byte[] previous = {1, 2, 3};
+        cache.putChecksumValue(ALGORITHM, previous);
+
+        byte[] cached = cache.putChecksumValue(ALGORITHM, new byte[] {4, 5, 6});
+
+        assertThat(cached).isEqualTo(previous);
+    }
+
+    @Test
+    public void getChecksumValue_noEntry_returnsNull() {
+        DefaultPayloadChecksumStore cache = new DefaultPayloadChecksumStore();
+
+        assertThat(cache.getChecksumValue(ALGORITHM)).isNull();
+    }
+
+    @Test
+    public void getChecksumValue_hasEntry_returnsValue() {
+        DefaultPayloadChecksumStore cache = new DefaultPayloadChecksumStore();
+
+        byte[] value = {1, 2, 3};
+        cache.putChecksumValue(ALGORITHM, value);
+
+        assertThat(cache.getChecksumValue(ALGORITHM)).isEqualTo(value);
+    }
+
+    @Test
+    void containsChecksumValue_noEntry_returnsFalse() {
+        DefaultPayloadChecksumStore cache = new DefaultPayloadChecksumStore();
+        assertThat(cache.containsChecksumValue(ALGORITHM)).isFalse();
+    }
+
+    @Test
+    void containsChecksumValue_hasEntry_returnsValue() {
+        DefaultPayloadChecksumStore cache = new DefaultPayloadChecksumStore();
+        byte[] value = {1, 2, 3};
+        cache.putChecksumValue(ALGORITHM, value);
+        assertThat(cache.containsChecksumValue(ALGORITHM)).isTrue();
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java
index bd09c48d9f43..80e3142c7022 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java
@@ -36,6 +36,8 @@
 import software.amazon.awssdk.http.SdkHttpExecutionAttributes;
 import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
 import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeProvider;
+import software.amazon.awssdk.http.auth.spi.signer.HttpSigner;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.identity.spi.IdentityProviders;
 import software.amazon.awssdk.utils.AttributeMap;
 
@@ -204,6 +206,12 @@ public final class SdkInternalExecutionAttribute extends SdkExecutionAttribute {
     public static final ExecutionAttribute<String> TOKEN_CONFIGURED_FROM_ENV = new ExecutionAttribute<>(
         "TokenConfiguredFromEnv");
 
+    /**
+     * The cache used by {@link HttpSigner} implementations to store payload checksums.
+     */
+    public static final ExecutionAttribute<PayloadChecksumStore> CHECKSUM_CACHE =
+        new ExecutionAttribute<>("ChecksumCache");
+
     /**
      * The backing attribute for RESOLVED_CHECKSUM_SPECS.
      * This holds the real ChecksumSpecs value, and is used to map to the ChecksumAlgorithm signer property
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/LegacyPayloadChecksumCache.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/LegacyPayloadChecksumCache.java
new file mode 100644
index 000000000000..7f3f5ed93b4b
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/LegacyPayloadChecksumCache.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.core.internal.checksums;
+
+import java.util.concurrent.ConcurrentHashMap;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.checksums.Algorithm;
+
+/**
+ * Cache for storing computed payload checksums. Only to be used in the legacy signing paths.
+ */
+@SdkInternalApi
+@SuppressWarnings("deprecation")
+public class LegacyPayloadChecksumCache {
+    private final ConcurrentHashMap<Algorithm, byte[]> cache = new ConcurrentHashMap<>();
+
+    public byte[] putChecksumValue(Algorithm algorithm, byte[] checksumValue) {
+        return cache.put(algorithm, checksumValue);
+    }
+
+    public byte[] getChecksumValue(Algorithm algorithm) {
+        return cache.get(algorithm);
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java
index d7bb3c699fb5..6f958cc975e9 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java
@@ -54,6 +54,7 @@
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.aws.internal.signer.util.ChecksumUtil;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.Md5Utils;
@@ -76,6 +77,7 @@ public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder request, Re
             throws Exception {
 
         if (sraSigningEnabled(context)) {
+            ensurePayloadChecksumCachePresent(context.executionAttributes());
             return sraChecksum(request, context);
         }
 
@@ -319,6 +321,14 @@ private void addFlexibleChecksumInHeader(SdkHttpFullRequest.Builder request, Req
         }
     }
 
+    private void ensurePayloadChecksumCachePresent(ExecutionAttributes executionAttributes) {
+        PayloadChecksumStore cache = executionAttributes.getAttribute(SdkInternalExecutionAttribute.CHECKSUM_CACHE);
+        if (cache == null) {
+            cache = PayloadChecksumStore.create();
+            executionAttributes.putAttribute(SdkInternalExecutionAttribute.CHECKSUM_CACHE, cache);
+        }
+    }
+
     static final class ChecksumCalculatingStreamProvider implements ContentStreamProvider {
         private final ContentStreamProvider underlyingInputStreamProvider;
         private final String checksumHeaderForTrailer;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
index d92628c2bba2..d9b65f43f386 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
@@ -35,6 +35,8 @@
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
 import software.amazon.awssdk.http.auth.spi.signer.HttpSigner;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
+import software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty;
 import software.amazon.awssdk.http.auth.spi.signer.SignRequest;
 import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
 import software.amazon.awssdk.identity.spi.Identity;
@@ -89,8 +91,12 @@ private <T extends Identity> SdkHttpFullRequest sraSignRequest(SdkHttpFullReques
         CompletableFuture<? extends T> identityFuture = selectedAuthScheme.identity();
         T identity = CompletableFutureUtils.joinLikeSync(identityFuture);
 
+        // Should not be null, added by HttpChecksumStage for SRA signed requests
+        PayloadChecksumStore payloadChecksumStore =
+            context.executionAttributes().getAttribute(SdkInternalExecutionAttribute.CHECKSUM_CACHE);
+
         Pair<SdkHttpFullRequest, Duration> measuredSign = MetricUtils.measureDuration(
-            () -> doSraSign(request, selectedAuthScheme, identity));
+            () -> doSraSign(request, selectedAuthScheme, identity, payloadChecksumStore));
         context.attemptMetricCollector().reportMetric(CoreMetric.SIGNING_DURATION, measuredSign.right());
 
         SdkHttpFullRequest signedRequest = measuredSign.left();
@@ -100,10 +106,12 @@ private <T extends Identity> SdkHttpFullRequest sraSignRequest(SdkHttpFullReques
 
     private <T extends Identity> SdkHttpFullRequest doSraSign(SdkHttpFullRequest request,
                                                               SelectedAuthScheme<T> selectedAuthScheme,
-                                                              T identity) {
+                                                              T identity,
+                                                              PayloadChecksumStore payloadChecksumStore) {
         SignRequest.Builder<T> signRequestBuilder = SignRequest
             .builder(identity)
             .putProperty(HttpSigner.SIGNING_CLOCK, signingClock())
+            .putProperty(SdkInternalHttpSignerProperty.CHECKSUM_CACHE, payloadChecksumStore)
             .request(request)
             .payload(request.contentStreamProvider().orElse(null));
         AuthSchemeOption authSchemeOption = selectedAuthScheme.authSchemeOption();
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageSraTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageSraTest.java
index e9fc44d106bb..65d778839f4f 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageSraTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageSraTest.java
@@ -20,6 +20,7 @@
 import static software.amazon.awssdk.core.HttpChecksumConstant.SIGNING_METHOD;
 import static software.amazon.awssdk.core.interceptor.SdkExecutionAttribute.RESOLVED_CHECKSUM_SPECS;
 import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.AUTH_SCHEMES;
+import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.CHECKSUM_CACHE;
 import static software.amazon.awssdk.core.internal.signer.SigningMethod.UNSIGNED_PAYLOAD;
 import static software.amazon.awssdk.http.Header.CONTENT_LENGTH;
 import static software.amazon.awssdk.http.Header.CONTENT_MD5;
@@ -44,6 +45,7 @@
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.auth.aws.internal.signer.util.ChecksumUtil;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import utils.ValidSdkObjects;
 
 public class HttpChecksumStageSraTest {
@@ -143,6 +145,31 @@ public void async_flexibleChecksumInTrailer_addsFlexibleChecksumInTrailer() thro
         assertThat(requestBuilder.firstMatchingHeader(CHECKSUM_SPECS_HEADER)).isEmpty();
     }
 
+    @Test
+    public void execute_checksumCacheAttributeNotPresent_shouldCreate() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
+        RequestExecutionContext ctx =
+            flexibleChecksumRequestContext(ClientType.SYNC, ChecksumSpecs.builder().isRequestChecksumRequired(true), false);
+
+        new HttpChecksumStage(ClientType.SYNC).execute(requestBuilder, ctx);
+
+        assertThat(ctx.executionAttributes().getAttribute(CHECKSUM_CACHE)).isNotNull();
+    }
+
+    @Test
+    public void execute_checksumCacheAttributePresent_shouldNotOverwrite() throws Exception {
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+
+        SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
+        RequestExecutionContext ctx =
+            flexibleChecksumRequestContext(ClientType.SYNC, ChecksumSpecs.builder().isRequestChecksumRequired(true), false);
+        ctx.executionAttributes().putAttribute(CHECKSUM_CACHE, cache);
+
+        new HttpChecksumStage(ClientType.SYNC).execute(requestBuilder, ctx);
+
+        assertThat(ctx.executionAttributes().getAttribute(CHECKSUM_CACHE)).isSameAs(cache);
+    }
+
     private SdkHttpFullRequest.Builder createHttpRequestBuilder() {
         return SdkHttpFullRequest.builder().contentStreamProvider(REQUEST_BODY.contentStreamProvider());
     }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStageTest.java
index 865535a6298d..b0d87b547bd9 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStageTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStageTest.java
@@ -23,6 +23,7 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static software.amazon.awssdk.core.interceptor.SdkExecutionAttribute.TIME_OFFSET;
+import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.CHECKSUM_CACHE;
 import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.SELECTED_AUTH_SCHEME;
 import static software.amazon.awssdk.core.metrics.CoreMetric.SIGNING_DURATION;
 
@@ -54,6 +55,8 @@
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
 import software.amazon.awssdk.http.auth.spi.signer.HttpSigner;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
+import software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty;
 import software.amazon.awssdk.http.auth.spi.signer.SignRequest;
 import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
 import software.amazon.awssdk.http.auth.spi.signer.SignerProperty;
@@ -372,6 +375,35 @@ public void execute_selectedAuthScheme_signer_doesPreSraSign() throws Exception
         verifyNoInteractions(httpSigner);
     }
 
+    @Test
+    public void execute_checksumCacheAttributePresent_propagatesChecksumCacheToSigner() throws Exception {
+        SelectedAuthScheme<Identity> selectedAuthScheme = new SelectedAuthScheme<>(
+            CompletableFuture.completedFuture(identity),
+            httpSigner,
+            AuthSchemeOption.builder()
+                            .schemeId("my.auth#myAuth")
+                            .putSignerProperty(SIGNER_PROPERTY, "value")
+                            .build());
+        RequestExecutionContext context = createContext(selectedAuthScheme, null);
+
+        PayloadChecksumStore cache = PayloadChecksumStore.create();
+        context.executionAttributes().putAttribute(CHECKSUM_CACHE, cache);
+
+        SdkHttpRequest signedRequest = ValidSdkObjects.sdkHttpFullRequest().build();
+        when(httpSigner.sign(ArgumentMatchers.<SignRequest<? extends Identity>>any()))
+            .thenReturn(SignedRequest.builder()
+                                     .request(signedRequest)
+                                     .build());
+
+        SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
+        stage.execute(request, context);
+
+        ArgumentCaptor<SignRequest<? extends Identity>> signRequestCaptor = ArgumentCaptor.forClass(SignRequest.class);
+        verify(httpSigner).sign(signRequestCaptor.capture());
+
+        assertThat(signRequestCaptor.getValue().property(SdkInternalHttpSignerProperty.CHECKSUM_CACHE)).isSameAs(cache);
+    }
+
     private RequestExecutionContext createContext(SelectedAuthScheme<Identity> selectedAuthScheme, Signer oldSigner) {
         SdkRequest sdkRequest = ValidSdkObjects.sdkRequest();
         InterceptorContext interceptorContext =
diff --git a/services/s3/pom.xml b/services/s3/pom.xml
index d4fc5651e5e2..91094507365b 100644
--- a/services/s3/pom.xml
+++ b/services/s3/pom.xml
@@ -158,6 +158,12 @@
             <version>${awsjavasdk.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <artifactId>retries</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java
new file mode 100644
index 000000000000..6b30d935087f
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.services.s3.checksums;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.checksums.RequestChecksumCalculation;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.http.AbortableInputStream;
+import software.amazon.awssdk.http.ExecutableHttpRequest;
+import software.amazon.awssdk.http.HttpExecuteRequest;
+import software.amazon.awssdk.http.HttpExecuteResponse;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.retries.StandardRetryStrategy;
+import software.amazon.awssdk.retries.api.BackoffStrategy;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+import software.amazon.awssdk.utils.IoUtils;
+
+/**
+ * Tests to ensure that checksum values are not recomputed between retries.
+ */
+public class ChecksumReuseTest {
+    private static final String BUCKET = "test-bucket";
+    private static final String KEY = "test-key";
+    private static final AwsCredentialsProvider CREDENTIALS_PROVIDER = StaticCredentialsProvider.create(
+        AwsBasicCredentials.create("akid", "skid"));
+
+    @Test
+    public void putObject_serverResponds500_usesSameChecksumOnRetries() {
+        MockHttpClient httpClient = new MockHttpClient();
+
+        S3Client s3 = S3Client.builder()
+                              .region(Region.US_WEST_2)
+                              .credentialsProvider(CREDENTIALS_PROVIDER)
+                              .requestChecksumCalculation(RequestChecksumCalculation.WHEN_SUPPORTED)
+                              .httpClient(httpClient)
+                              .overrideConfiguration(o -> o.retryStrategy(StandardRetryStrategy.builder()
+                                                                                               .maxAttempts(4)
+                                                                                               .backoffStrategy(BackoffStrategy.retryImmediately())
+                                                                                               .build()))
+                              .build();
+
+        RequestBody requestBody = RequestBody.fromInputStream(new RandomInputStream(), 4096);
+
+        assertThatThrownBy(() -> s3.putObject(r -> r.bucket(BUCKET).key(KEY).checksumAlgorithm(ChecksumAlgorithm.CRC32),
+                                              requestBody))
+            .isInstanceOf(S3Exception.class)
+            // Ensure we actually retried
+            .matches(e -> ((SdkException) e).numAttempts() == 4);
+
+        List<String> trailingChecksumHeaders = new ArrayList<>();
+        for (byte[] requestPayload : httpClient.requestPayloads) {
+            String payloadAsString = new String(requestPayload, StandardCharsets.UTF_8);
+            for (String part : payloadAsString.split("\r\n")) {
+                if (part.startsWith("x-amz-checksum-crc32")) {
+                    trailingChecksumHeaders.add(part);
+                    break;
+                }
+            }
+        }
+
+        // sanity check, ensure each request has a trailing checksum header
+        assertThat(trailingChecksumHeaders).hasSize(4);
+        // All checksum trailers should be the same
+        assertThat(trailingChecksumHeaders.stream().distinct().count()).isEqualTo(1);
+    }
+
+    private static class MockHttpClient implements SdkHttpClient {
+        private List<byte[]> requestPayloads = new ArrayList<>();
+
+        @Override
+        public ExecutableHttpRequest prepareRequest(HttpExecuteRequest request) {
+            return new MockExecutableHttpRequest(request.contentStreamProvider().get().newStream(), requestPayloads);
+        }
+
+        @Override
+        public void close() {
+        }
+    }
+
+    private static class MockExecutableHttpRequest implements ExecutableHttpRequest {
+        private final InputStream content;
+        private final List<byte[]> requestPayloads;
+
+        private MockExecutableHttpRequest(InputStream content, List<byte[]> requestPayloads) {
+            this.content = content;
+            this.requestPayloads = requestPayloads;
+        }
+
+        @Override
+        public HttpExecuteResponse call() throws IOException {
+            requestPayloads.add(IoUtils.toByteArray(content));
+
+            return HttpExecuteResponse.builder()
+                                      .response(SdkHttpFullResponse.builder().statusCode(503)
+                                                                   .build())
+                                      .responseBody(AbortableInputStream.create(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8))))
+                                      .build();
+        }
+
+        @Override
+        public void abort() {
+        }
+    }
+
+    /**
+     * A stream that randomly returns either 'a' or 'b' from each read() invocation.
+     */
+    private static class RandomInputStream extends InputStream {
+        private final Random rng = new Random();
+
+        @Override
+        public int read() throws IOException {
+            if (rng.nextBoolean()) {
+                return 'a';
+            }
+            return 'b';
+        }
+
+        @Override
+        public boolean markSupported() {
+            return true;
+        }
+
+        @Override
+        public synchronized void mark(int readlimit) {
+        }
+
+        @Override
+        public synchronized void reset() throws IOException {
+        }
+    }
+}

From 110e858ad9d5c80853603037d8514d2b13207e67 Mon Sep 17 00:00:00 2001
From: Dongie Agnir <261310+dagnir@users.noreply.github.com>
Date: Thu, 25 Sep 2025 13:22:19 -0700
Subject: [PATCH 2/4] Reuse computed checkums for async payloads (#6441)

* Reuse computed checkums for async payloads

This is a continuation of #6413 that adds support for checksum reuse on
async payloads.

Additionally, this commit renames references to "ChecksumCache" to
"ChecksumStore".

* Fix cross module issue
---
 .../signer/AwsChunkedV4aPayloadSigner.java    |  10 +-
 .../signer/DefaultAwsCrtV4aHttpSigner.java    |  10 +-
 .../signer/AwsChunkedV4PayloadSigner.java     |  10 +-
 .../signer/DefaultAwsV4HttpSigner.java        |  10 +-
 .../ChecksumTrailerProvider.java              |  10 +-
 .../DefaultAwsCrtV4aHttpSignerTest.java       |  14 +--
 .../signer/DefaultAwsV4HttpSignerTest.java    |  14 +--
 .../signer/SdkInternalHttpSignerProperty.java |   6 +-
 .../SdkInternalExecutionAttribute.java        |   6 +-
 .../ChecksumCalculatingAsyncRequestBody.java  |  35 +++++-
 .../checksums/NoOpPayloadChecksumStore.java   |  45 ++++++++
 .../pipeline/stages/HttpChecksumStage.java    |  14 ++-
 .../http/pipeline/stages/SigningStage.java    |   4 +-
 ...ecksumCalculatingAsyncRequestBodyTest.java |  57 ++++++++++
 .../stages/HttpChecksumStageSraTest.java      |  12 +-
 .../pipeline/stages/SigningStageTest.java     |   8 +-
 .../s3/checksums/ChecksumReuseTest.java       | 104 +++++++++++++++++-
 17 files changed, 301 insertions(+), 68 deletions(-)
 create mode 100644 core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/NoOpPayloadChecksumStore.java

diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/AwsChunkedV4aPayloadSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/AwsChunkedV4aPayloadSigner.java
index 644e204f34b0..de5d16b92799 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/AwsChunkedV4aPayloadSigner.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/AwsChunkedV4aPayloadSigner.java
@@ -66,8 +66,8 @@ private AwsChunkedV4aPayloadSigner(Builder builder) {
         this.credentialScope = Validate.paramNotNull(builder.credentialScope, "CredentialScope");
         this.chunkSize = Validate.isPositive(builder.chunkSize, "ChunkSize");
         this.checksumAlgorithm = builder.checksumAlgorithm;
-        this.payloadChecksumStore = builder.payloadChecksumStore == null ? NoOpPayloadChecksumStore.create() :
-                                    builder.payloadChecksumStore;
+        this.payloadChecksumStore = builder.checksumStore == null ? NoOpPayloadChecksumStore.create() :
+                                    builder.checksumStore;
     }
 
     public static Builder builder() {
@@ -282,7 +282,7 @@ static final class Builder {
         private CredentialScope credentialScope;
         private Integer chunkSize;
         private ChecksumAlgorithm checksumAlgorithm;
-        private PayloadChecksumStore payloadChecksumStore;
+        private PayloadChecksumStore checksumStore;
 
         public Builder credentialScope(CredentialScope credentialScope) {
             this.credentialScope = credentialScope;
@@ -299,8 +299,8 @@ public Builder checksumAlgorithm(ChecksumAlgorithm checksumAlgorithm) {
             return this;
         }
 
-        public Builder checksumCache(PayloadChecksumStore checksumCache) {
-            this.payloadChecksumStore = checksumCache;
+        public Builder checksumStore(PayloadChecksumStore checksumStore) {
+            this.checksumStore = checksumStore;
             return this;
         }
 
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java
index a77385b5c036..af2a14e93823 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSigner.java
@@ -33,7 +33,7 @@
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.CredentialUtils.sanitizeCredentials;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.PRESIGN_URL_MAX_EXPIRATION_DURATION;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_TRAILER;
-import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_CACHE;
+import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_STORE;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -73,7 +73,7 @@ public final class DefaultAwsCrtV4aHttpSigner implements AwsV4aHttpSigner {
 
     @Override
     public SignedRequest sign(SignRequest<? extends AwsCredentialsIdentity> request) {
-        Checksummer checksummer = checksummer(request, null, checksumCache(request));
+        Checksummer checksummer = checksummer(request, null, checksumStore(request));
         V4aProperties v4aProperties = v4aProperties(request);
         AwsSigningConfig signingConfig = signingConfig(request, v4aProperties);
         V4aPayloadSigner payloadSigner = v4aPayloadSigner(request, v4aProperties);
@@ -120,7 +120,7 @@ private static V4aPayloadSigner v4aPayloadSigner(
                                              .credentialScope(v4aProperties.getCredentialScope())
                                              .chunkSize(DEFAULT_CHUNK_SIZE_IN_BYTES)
                                              .checksumAlgorithm(request.property(CHECKSUM_ALGORITHM))
-                                             .checksumCache(checksumCache(request))
+                                             .checksumStore(checksumStore(request))
                                              .build();
         }
 
@@ -257,8 +257,8 @@ private static V4aRequestSigningResult sign(SdkHttpRequest request, HttpRequest
             signingConfig);
     }
 
-    private static PayloadChecksumStore checksumCache(SignRequest<? extends AwsCredentialsIdentity> request) {
-        PayloadChecksumStore cache = request.property(CHECKSUM_CACHE);
+    private static PayloadChecksumStore checksumStore(SignRequest<? extends AwsCredentialsIdentity> request) {
+        PayloadChecksumStore cache = request.property(CHECKSUM_STORE);
         if (cache == null) {
             return NoOpPayloadChecksumStore.create();
         }
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/AwsChunkedV4PayloadSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/AwsChunkedV4PayloadSigner.java
index 4f43701f9bf5..8e2e3a3a168b 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/AwsChunkedV4PayloadSigner.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/AwsChunkedV4PayloadSigner.java
@@ -69,8 +69,8 @@ private AwsChunkedV4PayloadSigner(Builder builder) {
         this.credentialScope = Validate.paramNotNull(builder.credentialScope, "CredentialScope");
         this.chunkSize = Validate.isPositive(builder.chunkSize, "ChunkSize");
         this.checksumAlgorithm = builder.checksumAlgorithm;
-        this.payloadChecksumStore = builder.payloadChecksumStore == null ? NoOpPayloadChecksumStore.create() :
-                                    builder.payloadChecksumStore;
+        this.payloadChecksumStore = builder.checksumStore == null ? NoOpPayloadChecksumStore.create() :
+                                    builder.checksumStore;
     }
 
     public static Builder builder() {
@@ -301,7 +301,7 @@ static class Builder {
         private CredentialScope credentialScope;
         private Integer chunkSize;
         private ChecksumAlgorithm checksumAlgorithm;
-        private PayloadChecksumStore payloadChecksumStore;
+        private PayloadChecksumStore checksumStore;
 
         public Builder credentialScope(CredentialScope credentialScope) {
             this.credentialScope = credentialScope;
@@ -318,8 +318,8 @@ public Builder checksumAlgorithm(ChecksumAlgorithm checksumAlgorithm) {
             return this;
         }
 
-        public Builder checksumCache(PayloadChecksumStore payloadChecksumStore) {
-            this.payloadChecksumStore = payloadChecksumStore;
+        public Builder checksumStore(PayloadChecksumStore checksumStore) {
+            this.checksumStore = checksumStore;
             return this;
         }
 
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSigner.java
index 3865fe4b714b..66ee6d4cf733 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSigner.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSigner.java
@@ -24,7 +24,7 @@
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.OptionalDependencyLoaderUtil.getEventStreamV4PayloadSigner;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.PRESIGN_URL_MAX_EXPIRATION_DURATION;
 import static software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerConstant.X_AMZ_TRAILER;
-import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_CACHE;
+import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_STORE;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -57,7 +57,7 @@ public final class DefaultAwsV4HttpSigner implements AwsV4HttpSigner {
 
     @Override
     public SignedRequest sign(SignRequest<? extends AwsCredentialsIdentity> request) {
-        Checksummer checksummer = checksummer(request, null, checksumCache(request));
+        Checksummer checksummer = checksummer(request, null, checksumStore(request));
         V4Properties v4Properties = v4Properties(request);
         V4RequestSigner v4RequestSigner = v4RequestSigner(request, v4Properties);
         V4PayloadSigner payloadSigner = v4PayloadSigner(request, v4Properties);
@@ -170,7 +170,7 @@ private static V4PayloadSigner v4PayloadSigner(
             return AwsChunkedV4PayloadSigner.builder()
                                             .credentialScope(properties.getCredentialScope())
                                             .chunkSize(DEFAULT_CHUNK_SIZE_IN_BYTES)
-                                            .checksumCache(checksumCache(request))
+                                            .checksumStore(checksumStore(request))
                                             .checksumAlgorithm(request.property(CHECKSUM_ALGORITHM))
                                             .build();
         }
@@ -265,8 +265,8 @@ private static boolean isBetweenInclusive(Duration start, Duration x, Duration e
         return start.compareTo(x) <= 0 && x.compareTo(end) <= 0;
     }
 
-    private static PayloadChecksumStore checksumCache(SignRequest<? extends AwsCredentialsIdentity> request) {
-        PayloadChecksumStore cache = request.property(CHECKSUM_CACHE);
+    private static PayloadChecksumStore checksumStore(SignRequest<? extends AwsCredentialsIdentity> request) {
+        PayloadChecksumStore cache = request.property(CHECKSUM_STORE);
         if (cache == null) {
             return NoOpPayloadChecksumStore.create();
         }
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProvider.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProvider.java
index 4565a61a3933..dbe4d7c856b0 100644
--- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProvider.java
+++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/internal/signer/chunkedencoding/ChecksumTrailerProvider.java
@@ -30,14 +30,14 @@ public class ChecksumTrailerProvider implements TrailerProvider {
     private final SdkChecksum checksum;
     private final String checksumName;
     private final ChecksumAlgorithm checksumAlgorithm;
-    private final PayloadChecksumStore checksumCache;
+    private final PayloadChecksumStore checksumStore;
 
     public ChecksumTrailerProvider(SdkChecksum checksum, String checksumName, ChecksumAlgorithm checksumAlgorithm,
-                                   PayloadChecksumStore checksumCache) {
+                                   PayloadChecksumStore checksumStore) {
         this.checksum = checksum;
         this.checksumName = checksumName;
         this.checksumAlgorithm = checksumAlgorithm;
-        this.checksumCache = checksumCache;
+        this.checksumStore = checksumStore;
     }
 
     @Override
@@ -47,10 +47,10 @@ public void reset() {
 
     @Override
     public Pair<String, List<String>> get() {
-        byte[] checksumBytes = checksumCache.getChecksumValue(checksumAlgorithm);
+        byte[] checksumBytes = checksumStore.getChecksumValue(checksumAlgorithm);
         if (checksumBytes == null) {
             checksumBytes = checksum.getChecksumBytes();
-            checksumCache.putChecksumValue(checksumAlgorithm, checksumBytes);
+            checksumStore.putChecksumValue(checksumAlgorithm, checksumBytes);
         }
 
         return Pair.of(
diff --git a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSignerTest.java b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSignerTest.java
index 11867d613380..e1036e7e7cf9 100644
--- a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSignerTest.java
+++ b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/crt/internal/signer/DefaultAwsCrtV4aHttpSignerTest.java
@@ -44,7 +44,7 @@
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4aHttpSigner.PAYLOAD_SIGNING_ENABLED;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4aHttpSigner.REGION_SET;
 import static software.amazon.awssdk.http.auth.spi.signer.HttpSigner.SIGNING_CLOCK;
-import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_CACHE;
+import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_STORE;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -461,7 +461,7 @@ void sign_WithPayloadSigningTrue_chunkEncodingFalse_cacheContainsChecksum_usesCa
             signRequest -> signRequest
                 .putProperty(PAYLOAD_SIGNING_ENABLED, true)
                 .putProperty(CHUNK_ENCODING_ENABLED, false)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -480,7 +480,7 @@ void sign_WithPayloadSigningTrue_chunkEncodingFalse_cacheEmpty_storesComputedChe
             signRequest -> signRequest
                 .putProperty(PAYLOAD_SIGNING_ENABLED, true)
                 .putProperty(CHUNK_ENCODING_ENABLED, false)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -502,7 +502,7 @@ void sign_WithPayloadSigningFalse_chunkEncodingTrue_cacheEmpty_storesComputedChe
                 .putProperty(PAYLOAD_SIGNING_ENABLED, false)
                 .putProperty(CHUNK_ENCODING_ENABLED, true)
                 .putProperty(CHECKSUM_ALGORITHM, CRC32)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -529,7 +529,7 @@ void sign_WithPayloadSigningFalse_chunkEncodingTrue_cacheContainsChecksum_usesCa
                 .putProperty(PAYLOAD_SIGNING_ENABLED, false)
                 .putProperty(CHUNK_ENCODING_ENABLED, true)
                 .putProperty(CHECKSUM_ALGORITHM, CRC32)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -553,7 +553,7 @@ void sign_withPayloadSigningTrue_chunkEncodingFalse_withChecksum_cacheContainsCr
                 .putProperty(PAYLOAD_SIGNING_ENABLED, true)
                 .putProperty(CHUNK_ENCODING_ENABLED, false)
                 .putProperty(CHECKSUM_ALGORITHM, CRC32)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -574,7 +574,7 @@ void sign_withPayloadSigningTrue_chunkEncodingFalse_withChecksum_cacheEmpty_stor
                 .putProperty(PAYLOAD_SIGNING_ENABLED, true)
                 .putProperty(CHUNK_ENCODING_ENABLED, false)
                 .putProperty(CHECKSUM_ALGORITHM, CRC32)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         signer.sign(request);
diff --git a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSignerTest.java b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSignerTest.java
index 75c59b40e934..3c4ea21cce58 100644
--- a/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSignerTest.java
+++ b/core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/DefaultAwsV4HttpSignerTest.java
@@ -28,7 +28,7 @@
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner.CHUNK_ENCODING_ENABLED;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner.EXPIRATION_DURATION;
 import static software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner.PAYLOAD_SIGNING_ENABLED;
-import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_CACHE;
+import static software.amazon.awssdk.http.auth.spi.signer.SdkInternalHttpSignerProperty.CHECKSUM_STORE;
 
 import java.io.IOException;
 import java.net.URI;
@@ -882,7 +882,7 @@ void sign_WithPayloadSigningTrue_chunkEncodingFalse_cacheContainsChecksum_usesCa
             signRequest -> signRequest
                 .putProperty(PAYLOAD_SIGNING_ENABLED, true)
                 .putProperty(CHUNK_ENCODING_ENABLED, false)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -901,7 +901,7 @@ void sign_WithPayloadSigningTrue_chunkEncodingFalse_cacheEmpty_storesComputedChe
             signRequest -> signRequest
                 .putProperty(PAYLOAD_SIGNING_ENABLED, true)
                 .putProperty(CHUNK_ENCODING_ENABLED, false)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -923,7 +923,7 @@ void sign_WithPayloadSigningFalse_chunkEncodingTrue_cacheEmpty_storesComputedChe
                 .putProperty(PAYLOAD_SIGNING_ENABLED, false)
                 .putProperty(CHUNK_ENCODING_ENABLED, true)
                 .putProperty(CHECKSUM_ALGORITHM, CRC32)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -950,7 +950,7 @@ void sign_WithPayloadSigningFalse_chunkEncodingTrue_cacheContainsChecksum_usesCa
                 .putProperty(PAYLOAD_SIGNING_ENABLED, false)
                 .putProperty(CHUNK_ENCODING_ENABLED, true)
                 .putProperty(CHECKSUM_ALGORITHM, CRC32)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -977,7 +977,7 @@ void sign_withPayloadSigningTrue_chunkEncodingFalse_withChecksum_cacheContainsCr
                 .putProperty(PAYLOAD_SIGNING_ENABLED, true)
                 .putProperty(CHUNK_ENCODING_ENABLED, false)
                 .putProperty(CHECKSUM_ALGORITHM, CRC32)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         SignedRequest signedRequest = signer.sign(request);
@@ -998,7 +998,7 @@ void sign_withPayloadSigningTrue_chunkEncodingFalse_withChecksum_cacheEmpty_stor
                 .putProperty(PAYLOAD_SIGNING_ENABLED, true)
                 .putProperty(CHUNK_ENCODING_ENABLED, false)
                 .putProperty(CHECKSUM_ALGORITHM, CRC32)
-                .putProperty(CHECKSUM_CACHE, cache)
+                .putProperty(CHECKSUM_STORE, cache)
         );
 
         signer.sign(request);
diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/SdkInternalHttpSignerProperty.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/SdkInternalHttpSignerProperty.java
index bb4a4c3310bf..d95db35f6e46 100644
--- a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/SdkInternalHttpSignerProperty.java
+++ b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/SdkInternalHttpSignerProperty.java
@@ -25,12 +25,12 @@
 public final class SdkInternalHttpSignerProperty {
 
     /**
-     * A cache for storing checksums calculated for a payload.
+     * An object for storing checksums calculated for a payload.
      *
      * <p>Note, checksums may not be relevant to some signers.
      */
-    public static final SignerProperty<PayloadChecksumStore> CHECKSUM_CACHE =
-        SignerProperty.create(SdkInternalHttpSignerProperty.class, "ChecksumCache");
+    public static final SignerProperty<PayloadChecksumStore> CHECKSUM_STORE =
+        SignerProperty.create(SdkInternalHttpSignerProperty.class, "ChecksumStore");
 
     private SdkInternalHttpSignerProperty() {
     }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java
index 80e3142c7022..3fe0f69d3ab8 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java
@@ -207,10 +207,10 @@ public final class SdkInternalExecutionAttribute extends SdkExecutionAttribute {
         "TokenConfiguredFromEnv");
 
     /**
-     * The cache used by {@link HttpSigner} implementations to store payload checksums.
+     * The store used by {@link HttpSigner} implementations to store payload checksums.
      */
-    public static final ExecutionAttribute<PayloadChecksumStore> CHECKSUM_CACHE =
-        new ExecutionAttribute<>("ChecksumCache");
+    public static final ExecutionAttribute<PayloadChecksumStore> CHECKSUM_STORE =
+        new ExecutionAttribute<>("ChecksumStore");
 
     /**
      * The backing attribute for RESOLVED_CHECKSUM_SPECS.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ChecksumCalculatingAsyncRequestBody.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ChecksumCalculatingAsyncRequestBody.java
index 2226c67fcdc9..c903829d07e2 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ChecksumCalculatingAsyncRequestBody.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ChecksumCalculatingAsyncRequestBody.java
@@ -34,7 +34,9 @@
 import software.amazon.awssdk.core.async.SdkPublisher;
 import software.amazon.awssdk.core.checksums.Algorithm;
 import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.internal.checksums.NoOpPayloadChecksumStore;
 import software.amazon.awssdk.core.internal.util.HttpChecksumUtils;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
 import software.amazon.awssdk.utils.Validate;
 import software.amazon.awssdk.utils.async.DelegatingSubscriber;
@@ -55,6 +57,7 @@ public class ChecksumCalculatingAsyncRequestBody implements AsyncRequestBody {
     private final ChecksumAlgorithm algorithm;
     private final String trailerHeader;
     private final long totalBytes;
+    private final PayloadChecksumStore payloadChecksumStore;
 
     private ChecksumCalculatingAsyncRequestBody(DefaultBuilder builder) {
 
@@ -66,6 +69,7 @@ private ChecksumCalculatingAsyncRequestBody(DefaultBuilder builder) {
         this.sdkChecksum = builder.algorithm != null ? SdkChecksum.forAlgorithm(algorithm) : null;
         this.trailerHeader = builder.trailerHeader;
         this.totalBytes = initTotalBytes(wrapped, builder.contentLengthHeader);
+        this.payloadChecksumStore = builder.checksumStore != null ? builder.checksumStore : NoOpPayloadChecksumStore.create();
     }
 
     static long initTotalBytes(AsyncRequestBody wrapped, Long contentLengthHeader) {
@@ -118,6 +122,8 @@ public interface Builder extends SdkBuilder<ChecksumCalculatingAsyncRequestBody.
          * @return This builder for method chaining.
          */
         ChecksumCalculatingAsyncRequestBody.Builder contentLengthHeader(Long contentLengthHeader);
+
+        ChecksumCalculatingAsyncRequestBody.Builder checksumStore(PayloadChecksumStore checksumStore);
     }
 
     private static final class DefaultBuilder implements ChecksumCalculatingAsyncRequestBody.Builder {
@@ -126,6 +132,7 @@ private static final class DefaultBuilder implements ChecksumCalculatingAsyncReq
         private ChecksumAlgorithm algorithm;
         private String trailerHeader;
         private Long contentLengthHeader;
+        private PayloadChecksumStore checksumStore;
 
         @Override
         public ChecksumCalculatingAsyncRequestBody build() {
@@ -155,6 +162,12 @@ public Builder contentLengthHeader(Long contentLength) {
             this.contentLengthHeader = contentLength;
             return this;
         }
+
+        @Override
+        public Builder checksumStore(PayloadChecksumStore checksumStore) {
+            this.checksumStore = checksumStore;
+            return this;
+        }
     }
 
     @Override
@@ -182,7 +195,12 @@ public void subscribe(Subscriber<? super ByteBuffer> s) {
 
         SynchronousChunkBuffer synchronousChunkBuffer = new SynchronousChunkBuffer(totalBytes);
         alwaysInvokeOnNext(wrapped.flatMapIterable(synchronousChunkBuffer::buffer))
-                 .subscribe(new ChecksumCalculatingSubscriber(s, sdkChecksum, trailerHeader, totalBytes));
+                 .subscribe(new ChecksumCalculatingSubscriber(s,
+                                                              algorithm,
+                                                              sdkChecksum,
+                                                              payloadChecksumStore,
+                                                              trailerHeader,
+                                                              totalBytes));
     }
 
     private SdkPublisher<ByteBuffer> alwaysInvokeOnNext(SdkPublisher<ByteBuffer> source) {
@@ -192,17 +210,24 @@ private SdkPublisher<ByteBuffer> alwaysInvokeOnNext(SdkPublisher<ByteBuffer> sou
     private static final class ChecksumCalculatingSubscriber implements Subscriber<ByteBuffer> {
 
         private final Subscriber<? super ByteBuffer> wrapped;
+        private final ChecksumAlgorithm algorithm;
         private final SdkChecksum checksum;
+        private final PayloadChecksumStore checksumStore;
         private final String trailerHeader;
         private byte[] checksumBytes;
         private final AtomicLong remainingBytes;
         private Subscription subscription;
 
         ChecksumCalculatingSubscriber(Subscriber<? super ByteBuffer> wrapped,
+                                      ChecksumAlgorithm algorithm,
                                       SdkChecksum checksum,
-                                      String trailerHeader, long totalBytes) {
+                                      PayloadChecksumStore checksumStore,
+                                      String trailerHeader,
+                                      long totalBytes) {
             this.wrapped = wrapped;
+            this.algorithm = algorithm;
             this.checksum = checksum;
+            this.checksumStore = checksumStore;
             this.trailerHeader = trailerHeader;
             this.remainingBytes = new AtomicLong(totalBytes);
         }
@@ -223,7 +248,11 @@ public void onNext(ByteBuffer byteBuffer) {
                     byteBuffer.reset();
                 }
                 if (lastByte && checksumBytes == null && checksum != null) {
-                    checksumBytes = checksum.getChecksumBytes();
+                    checksumBytes = checksumStore.getChecksumValue(algorithm);
+                    if (checksumBytes == null) {
+                        checksumBytes = checksum.getChecksumBytes();
+                        checksumStore.putChecksumValue(algorithm, checksumBytes);
+                    }
                     ByteBuffer allocatedBuffer = getFinalChecksumAppendedChunk(byteBuffer);
                     wrapped.onNext(allocatedBuffer);
                 } else if (byteBuffer.hasRemaining()) {
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/NoOpPayloadChecksumStore.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/NoOpPayloadChecksumStore.java
new file mode 100644
index 000000000000..68c4b23cc687
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/NoOpPayloadChecksumStore.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.core.internal.checksums;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
+
+@SdkInternalApi
+public final class NoOpPayloadChecksumStore implements PayloadChecksumStore {
+    private NoOpPayloadChecksumStore() {
+    }
+
+    @Override
+    public byte[] putChecksumValue(ChecksumAlgorithm algorithm, byte[] checksum) {
+        return null;
+    }
+
+    @Override
+    public byte[] getChecksumValue(ChecksumAlgorithm algorithm) {
+        return null;
+    }
+
+    @Override
+    public boolean containsChecksumValue(ChecksumAlgorithm algorithm) {
+        return false;
+    }
+
+    public static NoOpPayloadChecksumStore create() {
+        return new NoOpPayloadChecksumStore();
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java
index 6f958cc975e9..b2925f55c3d3 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java
@@ -22,6 +22,7 @@
 import static software.amazon.awssdk.core.HttpChecksumConstant.SIGNING_METHOD;
 import static software.amazon.awssdk.core.interceptor.SdkExecutionAttribute.RESOLVED_CHECKSUM_SPECS;
 import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.AUTH_SCHEMES;
+import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.CHECKSUM_STORE;
 import static software.amazon.awssdk.core.internal.io.AwsChunkedInputStream.DEFAULT_CHUNK_SIZE;
 import static software.amazon.awssdk.core.internal.util.ChunkContentUtils.calculateChecksumTrailerLength;
 import static software.amazon.awssdk.core.internal.util.ChunkContentUtils.calculateStreamContentLength;
@@ -77,7 +78,7 @@ public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder request, Re
             throws Exception {
 
         if (sraSigningEnabled(context)) {
-            ensurePayloadChecksumCachePresent(context.executionAttributes());
+            ensurePayloadChecksumStorePresent(context.executionAttributes());
             return sraChecksum(request, context);
         }
 
@@ -246,6 +247,7 @@ private void addFlexibleChecksumInTrailer(SdkHttpFullRequest.Builder request, Re
                     ChecksumCalculatingAsyncRequestBody.builder()
                                                        .asyncRequestBody(context.requestProvider())
                                                        .algorithm(checksumSpecs.algorithmV2())
+                                                       .checksumStore(getPayloadChecksumStore(context.executionAttributes()))
                                                        .trailerHeader(checksumSpecs.headerName());
                 Optional<Long> maybeContentLengthHeader = request.firstMatchingHeader("Content-Length")
                                                                  .map(Long::parseLong);
@@ -321,14 +323,18 @@ private void addFlexibleChecksumInHeader(SdkHttpFullRequest.Builder request, Req
         }
     }
 
-    private void ensurePayloadChecksumCachePresent(ExecutionAttributes executionAttributes) {
-        PayloadChecksumStore cache = executionAttributes.getAttribute(SdkInternalExecutionAttribute.CHECKSUM_CACHE);
+    private void ensurePayloadChecksumStorePresent(ExecutionAttributes executionAttributes) {
+        PayloadChecksumStore cache = getPayloadChecksumStore(executionAttributes);
         if (cache == null) {
             cache = PayloadChecksumStore.create();
-            executionAttributes.putAttribute(SdkInternalExecutionAttribute.CHECKSUM_CACHE, cache);
+            executionAttributes.putAttribute(CHECKSUM_STORE, cache);
         }
     }
 
+    private PayloadChecksumStore getPayloadChecksumStore(ExecutionAttributes executionAttributes) {
+        return executionAttributes.getAttribute(CHECKSUM_STORE);
+    }
+
     static final class ChecksumCalculatingStreamProvider implements ContentStreamProvider {
         private final ContentStreamProvider underlyingInputStreamProvider;
         private final String checksumHeaderForTrailer;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
index d9b65f43f386..3d3240c3d4d8 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
@@ -93,7 +93,7 @@ private <T extends Identity> SdkHttpFullRequest sraSignRequest(SdkHttpFullReques
 
         // Should not be null, added by HttpChecksumStage for SRA signed requests
         PayloadChecksumStore payloadChecksumStore =
-            context.executionAttributes().getAttribute(SdkInternalExecutionAttribute.CHECKSUM_CACHE);
+            context.executionAttributes().getAttribute(SdkInternalExecutionAttribute.CHECKSUM_STORE);
 
         Pair<SdkHttpFullRequest, Duration> measuredSign = MetricUtils.measureDuration(
             () -> doSraSign(request, selectedAuthScheme, identity, payloadChecksumStore));
@@ -111,7 +111,7 @@ private <T extends Identity> SdkHttpFullRequest doSraSign(SdkHttpFullRequest req
         SignRequest.Builder<T> signRequestBuilder = SignRequest
             .builder(identity)
             .putProperty(HttpSigner.SIGNING_CLOCK, signingClock())
-            .putProperty(SdkInternalHttpSignerProperty.CHECKSUM_CACHE, payloadChecksumStore)
+            .putProperty(SdkInternalHttpSignerProperty.CHECKSUM_STORE, payloadChecksumStore)
             .request(request)
             .payload(request.contentStreamProvider().orElse(null));
         AuthSchemeOption authSchemeOption = selectedAuthScheme.authSchemeOption();
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ChecksumCalculatingAsyncRequestBodyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ChecksumCalculatingAsyncRequestBodyTest.java
index eddc94da63ed..c17d2c3fdaab 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ChecksumCalculatingAsyncRequestBodyTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ChecksumCalculatingAsyncRequestBodyTest.java
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.core.internal.async;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -42,6 +43,7 @@
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.internal.util.Mimetype;
 import software.amazon.awssdk.http.async.SimpleSubscriber;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -301,6 +303,61 @@ public void explicit0ContentLength_containsEmptyStringTrailingChecksum(TestCase
         assertThat(sb.toString()).isEqualTo(expectedEmptyString);
     }
 
+    @Test
+    void subscribe_checksumStoreContainsChecksumValue_reusesValue() {
+        byte[] content = "Hello world".getBytes(StandardCharsets.UTF_8);
+        AsyncRequestBody body = AsyncRequestBody.fromBytes(content);
+
+        byte[] checksumValue = "my-checksum".getBytes(StandardCharsets.UTF_8);
+        PayloadChecksumStore store = PayloadChecksumStore.create();
+        store.putChecksumValue(DefaultChecksumAlgorithm.CRC32, checksumValue);
+
+        String trailerHeader = "x-amz-checksum-crc32";
+        ChecksumCalculatingAsyncRequestBody checksumBody =
+            ChecksumCalculatingAsyncRequestBody.builder()
+                                               .contentLengthHeader((long) content.length)
+                                               .trailerHeader(trailerHeader)
+                                               .algorithm(DefaultChecksumAlgorithm.CRC32)
+                                               .checksumStore(store)
+                                               .asyncRequestBody(body)
+                                               .build();
+
+        String encoded = toString(checksumBody);
+
+        assertThat(encoded).endsWith(String.format("%s:%s\r\n\r\n", trailerHeader, BinaryUtils.toBase64(checksumValue)));
+    }
+
+    @Test
+    void subscribe_checksumStoreEmpty_storesComputedValue() {
+        byte[] content = "Hello world".getBytes(StandardCharsets.UTF_8);
+        AsyncRequestBody body = AsyncRequestBody.fromBytes(content);
+
+        String expectedChecksum = "i9aeUg==";
+
+        PayloadChecksumStore store = PayloadChecksumStore.create();
+
+        String trailerHeader = "x-amz-checksum-crc32";
+        ChecksumCalculatingAsyncRequestBody checksumBody =
+            ChecksumCalculatingAsyncRequestBody.builder()
+                                               .contentLengthHeader((long) content.length)
+                                               .trailerHeader(trailerHeader)
+                                               .algorithm(DefaultChecksumAlgorithm.CRC32)
+                                               .checksumStore(store)
+                                               .asyncRequestBody(body)
+                                               .build();
+
+        String encoded = toString(checksumBody);
+
+        assertThat(encoded).endsWith(String.format("%s:%s\r\n\r\n", trailerHeader, expectedChecksum));
+        assertThat(store.getChecksumValue(DefaultChecksumAlgorithm.CRC32)).isEqualTo(BinaryUtils.fromBase64(expectedChecksum));
+    }
+
+    private static String toString(Publisher<ByteBuffer> publisher) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        Flowable.fromPublisher(publisher).blockingForEach(chunk -> baos.write(BinaryUtils.copyAllBytesFrom(chunk)));
+        return new String(baos.toByteArray(), StandardCharsets.UTF_8);
+    }
+
     static class EmptyBufferPublisher implements AsyncRequestBody {
 
         private final ByteBuffer[] buffers = new ByteBuffer[2];
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageSraTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageSraTest.java
index 65d778839f4f..ed166597a441 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageSraTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageSraTest.java
@@ -20,7 +20,7 @@
 import static software.amazon.awssdk.core.HttpChecksumConstant.SIGNING_METHOD;
 import static software.amazon.awssdk.core.interceptor.SdkExecutionAttribute.RESOLVED_CHECKSUM_SPECS;
 import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.AUTH_SCHEMES;
-import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.CHECKSUM_CACHE;
+import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.CHECKSUM_STORE;
 import static software.amazon.awssdk.core.internal.signer.SigningMethod.UNSIGNED_PAYLOAD;
 import static software.amazon.awssdk.http.Header.CONTENT_LENGTH;
 import static software.amazon.awssdk.http.Header.CONTENT_MD5;
@@ -146,28 +146,28 @@ public void async_flexibleChecksumInTrailer_addsFlexibleChecksumInTrailer() thro
     }
 
     @Test
-    public void execute_checksumCacheAttributeNotPresent_shouldCreate() throws Exception {
+    public void execute_checksumStoreAttributeNotPresent_shouldCreate() throws Exception {
         SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
         RequestExecutionContext ctx =
             flexibleChecksumRequestContext(ClientType.SYNC, ChecksumSpecs.builder().isRequestChecksumRequired(true), false);
 
         new HttpChecksumStage(ClientType.SYNC).execute(requestBuilder, ctx);
 
-        assertThat(ctx.executionAttributes().getAttribute(CHECKSUM_CACHE)).isNotNull();
+        assertThat(ctx.executionAttributes().getAttribute(CHECKSUM_STORE)).isNotNull();
     }
 
     @Test
-    public void execute_checksumCacheAttributePresent_shouldNotOverwrite() throws Exception {
+    public void execute_checksumStoreAttributePresent_shouldNotOverwrite() throws Exception {
         PayloadChecksumStore cache = PayloadChecksumStore.create();
 
         SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
         RequestExecutionContext ctx =
             flexibleChecksumRequestContext(ClientType.SYNC, ChecksumSpecs.builder().isRequestChecksumRequired(true), false);
-        ctx.executionAttributes().putAttribute(CHECKSUM_CACHE, cache);
+        ctx.executionAttributes().putAttribute(CHECKSUM_STORE, cache);
 
         new HttpChecksumStage(ClientType.SYNC).execute(requestBuilder, ctx);
 
-        assertThat(ctx.executionAttributes().getAttribute(CHECKSUM_CACHE)).isSameAs(cache);
+        assertThat(ctx.executionAttributes().getAttribute(CHECKSUM_STORE)).isSameAs(cache);
     }
 
     private SdkHttpFullRequest.Builder createHttpRequestBuilder() {
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStageTest.java
index b0d87b547bd9..d86ba2c70e5b 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStageTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStageTest.java
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static software.amazon.awssdk.core.interceptor.SdkExecutionAttribute.TIME_OFFSET;
-import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.CHECKSUM_CACHE;
+import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.CHECKSUM_STORE;
 import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.SELECTED_AUTH_SCHEME;
 import static software.amazon.awssdk.core.metrics.CoreMetric.SIGNING_DURATION;
 
@@ -376,7 +376,7 @@ public void execute_selectedAuthScheme_signer_doesPreSraSign() throws Exception
     }
 
     @Test
-    public void execute_checksumCacheAttributePresent_propagatesChecksumCacheToSigner() throws Exception {
+    public void execute_checksumStoreAttributePresent_propagatesChecksumStoreToSigner() throws Exception {
         SelectedAuthScheme<Identity> selectedAuthScheme = new SelectedAuthScheme<>(
             CompletableFuture.completedFuture(identity),
             httpSigner,
@@ -387,7 +387,7 @@ public void execute_checksumCacheAttributePresent_propagatesChecksumCacheToSigne
         RequestExecutionContext context = createContext(selectedAuthScheme, null);
 
         PayloadChecksumStore cache = PayloadChecksumStore.create();
-        context.executionAttributes().putAttribute(CHECKSUM_CACHE, cache);
+        context.executionAttributes().putAttribute(CHECKSUM_STORE, cache);
 
         SdkHttpRequest signedRequest = ValidSdkObjects.sdkHttpFullRequest().build();
         when(httpSigner.sign(ArgumentMatchers.<SignRequest<? extends Identity>>any()))
@@ -401,7 +401,7 @@ public void execute_checksumCacheAttributePresent_propagatesChecksumCacheToSigne
         ArgumentCaptor<SignRequest<? extends Identity>> signRequestCaptor = ArgumentCaptor.forClass(SignRequest.class);
         verify(httpSigner).sign(signRequestCaptor.capture());
 
-        assertThat(signRequestCaptor.getValue().property(SdkInternalHttpSignerProperty.CHECKSUM_CACHE)).isSameAs(cache);
+        assertThat(signRequestCaptor.getValue().property(SdkInternalHttpSignerProperty.CHECKSUM_STORE)).isSameAs(cache);
     }
 
     private RequestExecutionContext createContext(SelectedAuthScheme<Identity> selectedAuthScheme, Signer oldSigner) {
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java
index 6b30d935087f..4158945ef302 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java
@@ -18,17 +18,26 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import io.reactivex.Flowable;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.checksums.RequestChecksumCalculation;
 import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.core.sync.RequestBody;
@@ -38,12 +47,19 @@
 import software.amazon.awssdk.http.HttpExecuteResponse;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.http.async.AsyncExecuteRequest;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
+import software.amazon.awssdk.http.async.SdkHttpContentPublisher;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.retries.StandardRetryStrategy;
 import software.amazon.awssdk.retries.api.BackoffStrategy;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm;
+import software.amazon.awssdk.services.s3.model.PutObjectResponse;
 import software.amazon.awssdk.services.s3.model.S3Exception;
+import software.amazon.awssdk.utils.BinaryUtils;
 import software.amazon.awssdk.utils.IoUtils;
 
 /**
@@ -55,6 +71,18 @@ public class ChecksumReuseTest {
     private static final AwsCredentialsProvider CREDENTIALS_PROVIDER = StaticCredentialsProvider.create(
         AwsBasicCredentials.create("akid", "skid"));
 
+    private static ExecutorService executorService;
+
+    @BeforeAll
+    public static void setup() {
+        executorService = Executors.newSingleThreadExecutor();
+    }
+
+    @AfterAll
+    public static void teardown() {
+        executorService.shutdownNow();
+    }
+
     @Test
     public void putObject_serverResponds500_usesSameChecksumOnRetries() {
         MockHttpClient httpClient = new MockHttpClient();
@@ -78,11 +106,45 @@ public void putObject_serverResponds500_usesSameChecksumOnRetries() {
             // Ensure we actually retried
             .matches(e -> ((SdkException) e).numAttempts() == 4);
 
+        assertAllTrailingChecksumsMatch(httpClient.requestPayloads);
+    }
+
+    @Test
+    void asyncPutObject_serverResponds500_usesSameChecksumOnRetries() {
+        MockAsyncHttpClient httpClient = new MockAsyncHttpClient();
+
+        S3AsyncClient s3 = S3AsyncClient.builder()
+                                        .region(Region.US_WEST_2)
+                                        .credentialsProvider(CREDENTIALS_PROVIDER)
+                                        .requestChecksumCalculation(RequestChecksumCalculation.WHEN_SUPPORTED)
+                                        .httpClient(httpClient)
+                                        .overrideConfiguration(o -> o.retryStrategy(StandardRetryStrategy.builder()
+                                                                                                         .maxAttempts(4)
+                                                                                                         .backoffStrategy(BackoffStrategy.retryImmediately())
+                                                                                                         .build()))
+            .build();
+
+        AsyncRequestBody requestBody = AsyncRequestBody.fromInputStream(new RandomInputStream(),
+                                                                        4096L,
+                                                                        executorService);
+
+        CompletableFuture<PutObjectResponse> responseFuture =
+            s3.putObject(r -> r.bucket(BUCKET).key(KEY).checksumAlgorithm(ChecksumAlgorithm.CRC32), requestBody);
+
+        assertThatThrownBy(responseFuture::join)
+            .hasCauseInstanceOf(S3Exception.class)
+            .matches(e -> ((SdkException) e.getCause()).numAttempts() == 4);
+
+        assertAllTrailingChecksumsMatch(httpClient.requestPayloads);
+    }
+
+    private void assertAllTrailingChecksumsMatch(List<byte[]> requestPayloads) {
         List<String> trailingChecksumHeaders = new ArrayList<>();
-        for (byte[] requestPayload : httpClient.requestPayloads) {
+
+        for (byte[] requestPayload : requestPayloads) {
             String payloadAsString = new String(requestPayload, StandardCharsets.UTF_8);
             for (String part : payloadAsString.split("\r\n")) {
-                if (part.startsWith("x-amz-checksum-crc32")) {
+                if (part.startsWith("x-amz-checksum-crc32:")) {
                     trailingChecksumHeaders.add(part);
                     break;
                 }
@@ -122,9 +184,11 @@ public HttpExecuteResponse call() throws IOException {
             requestPayloads.add(IoUtils.toByteArray(content));
 
             return HttpExecuteResponse.builder()
-                                      .response(SdkHttpFullResponse.builder().statusCode(503)
+                                      .response(SdkHttpFullResponse.builder()
+                                                                   .statusCode(503)
                                                                    .build())
-                                      .responseBody(AbortableInputStream.create(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8))))
+                                      .responseBody(AbortableInputStream.create(
+                                          new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8))))
                                       .build();
         }
 
@@ -160,4 +224,36 @@ public synchronized void mark(int readlimit) {
         public synchronized void reset() throws IOException {
         }
     }
+
+    private static class MockAsyncHttpClient implements SdkAsyncHttpClient {
+        private final List<byte[]> requestPayloads = new ArrayList<>();
+
+        @Override
+        public CompletableFuture<Void> execute(AsyncExecuteRequest request) {
+            SdkHttpContentPublisher contentPublisher = request.requestContentPublisher();
+
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            Flowable.fromPublisher(contentPublisher).blockingForEach(bb -> baos.write(BinaryUtils.copyBytesFrom(bb)));
+
+            requestPayloads.add( baos.toByteArray());
+
+            SdkAsyncHttpResponseHandler responseHandler = request.responseHandler();
+
+            SdkHttpFullResponse response = SdkHttpFullResponse.builder()
+                                                              .statusCode(503)
+                                                              .build();
+
+            responseHandler.onHeaders(response);
+
+            CompletableFuture<Void> future = new CompletableFuture<>();
+            responseHandler.onStream(Flowable.just(ByteBuffer.wrap("".getBytes(StandardCharsets.UTF_8)))
+                                             .doAfterTerminate(() -> future.complete(null)));
+
+            return future;
+        }
+
+        @Override
+        public void close() {
+        }
+    }
 }

From 4cb921014f84b0e2ac8f97753de06b0327f6d5a1 Mon Sep 17 00:00:00 2001
From: Dongie Agnir <261310+dagnir@users.noreply.github.com>
Date: Fri, 26 Sep 2025 11:23:48 -0700
Subject: [PATCH 3/4] Reuse checksums in legacy signing codepath (#6444)

* Reuse checksums in legacy signing codepath

This commit adds support for reusing calculated payload checksums over
retries in the legacy (i.e. non-SRA) signing codepaths.

* S3 testing with non-SRA
---
 core/auth/pom.xml                             |   5 +
 .../AwsSignedChunkedEncodingInputStream.java  |  18 ++-
 .../checksums/LegacyPayloadChecksumCache.java |  37 -----
 .../pipeline/stages/HttpChecksumStage.java    |  49 +++++--
 .../io/AwsChunkedEncodingInputStream.java     |  30 +++-
 ...AwsUnsignedChunkedEncodingInputStream.java |  17 ++-
 .../stages/HttpChecksumStageNonSraTest.java   | 132 +++++++++++++++++-
 .../s3/checksums/ChecksumReuseTest.java       |  63 +++++++++
 8 files changed, 288 insertions(+), 63 deletions(-)
 delete mode 100644 core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/LegacyPayloadChecksumCache.java

diff --git a/core/auth/pom.xml b/core/auth/pom.xml
index 64d46909f109..57e87fea7b68 100644
--- a/core/auth/pom.xml
+++ b/core/auth/pom.xml
@@ -93,6 +93,11 @@
             <artifactId>http-auth-spi</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>checksums-spi</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.eventstream</groupId>
             <artifactId>eventstream</artifactId>
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/chunkedencoding/AwsSignedChunkedEncodingInputStream.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/chunkedencoding/AwsSignedChunkedEncodingInputStream.java
index 3174eb7c6caa..a7772fe9f54e 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/chunkedencoding/AwsSignedChunkedEncodingInputStream.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/chunkedencoding/AwsSignedChunkedEncodingInputStream.java
@@ -19,11 +19,13 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
 import software.amazon.awssdk.core.checksums.Algorithm;
 import software.amazon.awssdk.core.checksums.SdkChecksum;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig;
 import software.amazon.awssdk.core.internal.io.AwsChunkedEncodingInputStream;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
 
 /**
@@ -60,12 +62,15 @@ public final class AwsSignedChunkedEncodingInputStream extends AwsChunkedEncodin
      * @param config          The configuration allows the user to customize chunk size and buffer size.
      *                        See {@link AwsChunkedEncodingConfig} for default values.
      */
-    private AwsSignedChunkedEncodingInputStream(InputStream in, SdkChecksum sdkChecksum,
+    private AwsSignedChunkedEncodingInputStream(InputStream in,
+                                                ChecksumAlgorithm checksumAlgorithm,
+                                                SdkChecksum sdkChecksum,
+                                                PayloadChecksumStore checksumStore,
                                                 String checksumHeaderForTrailer,
                                                 String headerSignature,
                                                 AwsChunkSigner chunkSigner,
                                                 AwsChunkedEncodingConfig config) {
-        super(in, sdkChecksum, checksumHeaderForTrailer, config);
+        super(in, checksumAlgorithm, sdkChecksum, checksumStore, checksumHeaderForTrailer, config);
         this.chunkSigner = chunkSigner;
         this.previousChunkSignature = headerSignature;
         this.headerSignature = headerSignature;
@@ -103,9 +108,14 @@ public Builder awsChunkSigner(AwsChunkSigner awsChunkSigner) {
 
         public AwsSignedChunkedEncodingInputStream build() {
 
-            return new AwsSignedChunkedEncodingInputStream(this.inputStream, this.sdkChecksum, this.checksumHeaderForTrailer,
+            return new AwsSignedChunkedEncodingInputStream(this.inputStream,
+                                                           this.checksumAlgorithm,
+                                                           this.sdkChecksum,
+                                                           this.checksumStore,
+                                                           this.checksumHeaderForTrailer,
                                                            this.headerSignature,
-                                                           this.awsChunkSigner, this.awsChunkedEncodingConfig);
+                                                           this.awsChunkSigner,
+                                                           this.awsChunkedEncodingConfig);
         }
     }
 
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/LegacyPayloadChecksumCache.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/LegacyPayloadChecksumCache.java
deleted file mode 100644
index 7f3f5ed93b4b..000000000000
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/checksums/LegacyPayloadChecksumCache.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file 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.
- */
-
-package software.amazon.awssdk.core.internal.checksums;
-
-import java.util.concurrent.ConcurrentHashMap;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.checksums.Algorithm;
-
-/**
- * Cache for storing computed payload checksums. Only to be used in the legacy signing paths.
- */
-@SdkInternalApi
-@SuppressWarnings("deprecation")
-public class LegacyPayloadChecksumCache {
-    private final ConcurrentHashMap<Algorithm, byte[]> cache = new ConcurrentHashMap<>();
-
-    public byte[] putChecksumValue(Algorithm algorithm, byte[] checksumValue) {
-        return cache.put(algorithm, checksumValue);
-    }
-
-    public byte[] getChecksumValue(Algorithm algorithm) {
-        return cache.get(algorithm);
-    }
-}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java
index b2925f55c3d3..ca4b4d8f7f2c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStage.java
@@ -77,8 +77,9 @@ public HttpChecksumStage(ClientType clientType) {
     public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder request, RequestExecutionContext context)
             throws Exception {
 
+        ensurePayloadChecksumStorePresent(context.executionAttributes());
+
         if (sraSigningEnabled(context)) {
-            ensurePayloadChecksumStorePresent(context.executionAttributes());
             return sraChecksum(request, context);
         }
 
@@ -87,9 +88,10 @@ public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder request, Re
 
     private SdkHttpFullRequest.Builder legacyChecksum(SdkHttpFullRequest.Builder request, RequestExecutionContext context) {
         ChecksumSpecs resolvedChecksumSpecs = getResolvedChecksumSpecs(context.executionAttributes());
+        PayloadChecksumStore checksumStore = getPayloadChecksumStore(context.executionAttributes());
 
         if (md5ChecksumRequired(request, context)) {
-            addMd5ChecksumInHeader(request);
+            addMd5ChecksumInHeader(request, checksumStore);
             return request;
         }
 
@@ -99,7 +101,7 @@ private SdkHttpFullRequest.Builder legacyChecksum(SdkHttpFullRequest.Builder req
         }
 
         if (flexibleChecksumInHeaderRequired(context, resolvedChecksumSpecs)) {
-            addFlexibleChecksumInHeader(request, context, resolvedChecksumSpecs);
+            addFlexibleChecksumInHeader(request, context, resolvedChecksumSpecs, checksumStore);
             return request;
         }
 
@@ -174,10 +176,14 @@ private boolean md5ChecksumRequired(SdkHttpFullRequest.Builder request, RequestE
      * request body to use that buffered content. We obviously don't want to do that for giant streams, so we haven't opted to do
      * that yet.
      */
-    private void addMd5ChecksumInHeader(SdkHttpFullRequest.Builder request) {
+    private void addMd5ChecksumInHeader(SdkHttpFullRequest.Builder request, PayloadChecksumStore checksumStore) {
         try {
-            String payloadMd5 = Md5Utils.md5AsBase64(request.contentStreamProvider().newStream());
-            request.putHeader(Header.CONTENT_MD5, payloadMd5);
+            byte[] payloadMd5 = checksumStore.getChecksumValue(DefaultChecksumAlgorithm.MD5);
+            if (payloadMd5 == null) {
+                payloadMd5 = Md5Utils.computeMD5Hash(request.contentStreamProvider().newStream());
+                checksumStore.putChecksumValue(DefaultChecksumAlgorithm.MD5, payloadMd5);
+            }
+            request.putHeader(Header.CONTENT_MD5, BinaryUtils.toBase64(payloadMd5));
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
@@ -237,7 +243,11 @@ private void addFlexibleChecksumInTrailer(SdkHttpFullRequest.Builder request, Re
         int chunkSize = 0;
 
         if (clientType == ClientType.SYNC) {
-            request.contentStreamProvider(new ChecksumCalculatingStreamProvider(request.contentStreamProvider(), checksumSpecs));
+            request.contentStreamProvider(
+                new ChecksumCalculatingStreamProvider(request.contentStreamProvider(),
+                                                      checksumSpecs,
+                                                      getPayloadChecksumStore(context.executionAttributes())
+                ));
             originalContentLength =
                 context.executionContext().interceptorContext().requestBody().get().optionalContentLength().orElse(0L);
             chunkSize = DEFAULT_CHUNK_SIZE;
@@ -311,13 +321,19 @@ private boolean flexibleChecksumInHeaderRequired(RequestExecutionContext context
      * that yet.
      */
     private void addFlexibleChecksumInHeader(SdkHttpFullRequest.Builder request, RequestExecutionContext context,
-                                             ChecksumSpecs checksumSpecs) {
+                                             ChecksumSpecs checksumSpecs, PayloadChecksumStore checksumStore) {
         try {
             Algorithm legacyAlgorithm = checksumSpecs.algorithm();
-            String payloadChecksum = BinaryUtils.toBase64(HttpChecksumUtils.computeChecksum(
-                context.executionContext().interceptorContext().requestBody().get().contentStreamProvider().newStream(),
-                legacyAlgorithm));
-            request.putHeader(checksumSpecs.headerName(), payloadChecksum);
+            ChecksumAlgorithm newAlgorithm = HttpChecksumUtils.toNewChecksumAlgorithm(legacyAlgorithm);
+            byte[] payloadChecksum = checksumStore.getChecksumValue(newAlgorithm);
+            if (payloadChecksum == null) {
+                payloadChecksum = HttpChecksumUtils.computeChecksum(
+                    context.executionContext().interceptorContext().requestBody().get().contentStreamProvider().newStream(),
+                    legacyAlgorithm);
+                checksumStore.putChecksumValue(newAlgorithm, payloadChecksum);
+            }
+            String headerValue = BinaryUtils.toBase64(payloadChecksum);
+            request.putHeader(checksumSpecs.headerName(), headerValue);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
@@ -339,16 +355,21 @@ static final class ChecksumCalculatingStreamProvider implements ContentStreamPro
         private final ContentStreamProvider underlyingInputStreamProvider;
         private final String checksumHeaderForTrailer;
         private final ChecksumSpecs checksumSpecs;
+        private final PayloadChecksumStore checksumStore;
         private InputStream currentStream;
+        private final ChecksumAlgorithm checksumAlgorithm;
         private software.amazon.awssdk.core.checksums.SdkChecksum sdkChecksum;
 
         ChecksumCalculatingStreamProvider(ContentStreamProvider underlyingInputStreamProvider,
-                                          ChecksumSpecs checksumSpecs) {
+                                          ChecksumSpecs checksumSpecs,
+                                          PayloadChecksumStore checksumStore) {
             this.underlyingInputStreamProvider = underlyingInputStreamProvider;
             this.sdkChecksum = software.amazon.awssdk.core.checksums.SdkChecksum.forAlgorithm(
                 checksumSpecs.algorithm());
+            this.checksumAlgorithm = HttpChecksumUtils.toNewChecksumAlgorithm(checksumSpecs.algorithm());
             this.checksumHeaderForTrailer = checksumSpecs.headerName();
             this.checksumSpecs = checksumSpecs;
+            this.checksumStore = checksumStore;
         }
 
         @Override
@@ -356,7 +377,9 @@ public InputStream newStream() {
             closeCurrentStream();
             currentStream = AwsUnsignedChunkedEncodingInputStream.builder()
                                                                  .inputStream(underlyingInputStreamProvider.newStream())
+                                                                 .checksumAlgorithm(checksumAlgorithm)
                                                                  .sdkChecksum(sdkChecksum)
+                                                                 .checksumStore(checksumStore)
                                                                  .checksumHeaderForTrailer(checksumHeaderForTrailer)
                                                                  .build();
             return currentStream;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/AwsChunkedEncodingInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/AwsChunkedEncodingInputStream.java
index ec4870f5e686..0b98608a67e7 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/AwsChunkedEncodingInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/AwsChunkedEncodingInputStream.java
@@ -20,8 +20,11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
 import software.amazon.awssdk.core.checksums.SdkChecksum;
+import software.amazon.awssdk.core.internal.checksums.NoOpPayloadChecksumStore;
 import software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.Validate;
 
 /**
@@ -45,7 +48,9 @@ public abstract class AwsChunkedEncodingInputStream extends AwsChunkedInputStrea
     protected boolean isTrailingTerminated = true;
     private final int chunkSize;
     private final int maxBufferSize;
+    private final ChecksumAlgorithm checksumAlgorithm;
     private final SdkChecksum sdkChecksum;
+    private final PayloadChecksumStore checksumStore;
     private boolean isLastTrailingCrlf;
 
     /**
@@ -58,7 +63,10 @@ public abstract class AwsChunkedEncodingInputStream extends AwsChunkedInputStrea
      *                        See {@link AwsChunkedEncodingConfig} for default values.
      */
     protected AwsChunkedEncodingInputStream(InputStream in,
-                                            SdkChecksum sdkChecksum, String checksumHeaderForTrailer,
+                                            ChecksumAlgorithm checksumAlgorithm,
+                                            SdkChecksum sdkChecksum,
+                                            PayloadChecksumStore checksumStore,
+                                            String checksumHeaderForTrailer,
                                             AwsChunkedEncodingConfig config) {
         AwsChunkedEncodingConfig awsChunkedEncodingConfig = config == null ? AwsChunkedEncodingConfig.create() : config;
 
@@ -78,14 +86,18 @@ protected AwsChunkedEncodingInputStream(InputStream in,
         if (maxBufferSize < chunkSize) {
             throw new IllegalArgumentException("Max buffer size should not be less than chunk size");
         }
+        this.checksumAlgorithm = checksumAlgorithm;
         this.sdkChecksum = sdkChecksum;
+        this.checksumStore = checksumStore == null ? NoOpPayloadChecksumStore.create() : checksumStore;
         this.checksumHeaderForTrailer = checksumHeaderForTrailer;
     }
 
     protected abstract static class Builder<T extends Builder> {
 
         protected InputStream inputStream;
+        protected ChecksumAlgorithm checksumAlgorithm;
         protected SdkChecksum sdkChecksum;
+        protected PayloadChecksumStore checksumStore;
         protected String checksumHeaderForTrailer;
         protected AwsChunkedEncodingConfig awsChunkedEncodingConfig;
 
@@ -110,6 +122,11 @@ public T awsChunkedEncodingConfig(AwsChunkedEncodingConfig awsChunkedEncodingCon
             return (T) this;
         }
 
+        public T checksumAlgorithm(ChecksumAlgorithm checksumAlgorithm) {
+            this.checksumAlgorithm = checksumAlgorithm;
+            return (T) this;
+        }
+
         /**
          *
          * @param sdkChecksum  Instance of SdkChecksum, this can be null if we do not want to calculate Checksum
@@ -120,6 +137,11 @@ public T sdkChecksum(SdkChecksum sdkChecksum) {
             return (T) this;
         }
 
+        public T checksumStore(PayloadChecksumStore checksumStore) {
+            this.checksumStore = checksumStore;
+            return (T) this;
+        }
+
         /**
          *
          * @param checksumHeaderForTrailer String value of Trailer header where checksum will be updated.
@@ -166,7 +188,11 @@ private boolean setUpTrailingChunks() {
             return true;
         }
         if (calculatedChecksum == null) {
-            calculatedChecksum = sdkChecksum.getChecksumBytes();
+            calculatedChecksum = checksumStore.getChecksumValue(checksumAlgorithm);
+            if (calculatedChecksum == null) {
+                calculatedChecksum = sdkChecksum.getChecksumBytes();
+                checksumStore.putChecksumValue(checksumAlgorithm, calculatedChecksum);
+            }
             currentChunkIterator = new ChunkContentIterator(createChecksumChunkHeader());
             return false;
         } else if (!isLastTrailingCrlf) {
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/AwsUnsignedChunkedEncodingInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/AwsUnsignedChunkedEncodingInputStream.java
index 4c7f46a248cf..14b1cab5bf6c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/AwsUnsignedChunkedEncodingInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/AwsUnsignedChunkedEncodingInputStream.java
@@ -18,9 +18,11 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
 import software.amazon.awssdk.core.checksums.SdkChecksum;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
 import software.amazon.awssdk.utils.BinaryUtils;
 
 /**
@@ -29,10 +31,13 @@
 @SdkInternalApi
 public class AwsUnsignedChunkedEncodingInputStream extends AwsChunkedEncodingInputStream {
 
-    private AwsUnsignedChunkedEncodingInputStream(InputStream in, AwsChunkedEncodingConfig awsChunkedEncodingConfig,
+    private AwsUnsignedChunkedEncodingInputStream(InputStream in,
+                                                  AwsChunkedEncodingConfig awsChunkedEncodingConfig,
+                                                  ChecksumAlgorithm checksumAlgorithm,
                                                   SdkChecksum sdkChecksum,
+                                                  PayloadChecksumStore checksumStore,
                                                   String checksumHeaderForTrailer) {
-        super(in, sdkChecksum, checksumHeaderForTrailer, awsChunkedEncodingConfig);
+        super(in, checksumAlgorithm, sdkChecksum, checksumStore, checksumHeaderForTrailer, awsChunkedEncodingConfig);
     }
 
     public static Builder builder() {
@@ -85,8 +90,12 @@ protected byte[] createChecksumChunkHeader() {
     public static final class Builder extends AwsChunkedEncodingInputStream.Builder<Builder> {
         public AwsUnsignedChunkedEncodingInputStream build() {
             return new AwsUnsignedChunkedEncodingInputStream(
-                    this.inputStream, this.awsChunkedEncodingConfig,
-                    this.sdkChecksum, this.checksumHeaderForTrailer);
+                    this.inputStream,
+                    this.awsChunkedEncodingConfig,
+                    this.checksumAlgorithm,
+                    this.sdkChecksum,
+                    this.checksumStore,
+                    this.checksumHeaderForTrailer);
         }
     }
 }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageNonSraTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageNonSraTest.java
index 0e1b9efe07e1..a099e91ab6ce 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageNonSraTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HttpChecksumStageNonSraTest.java
@@ -23,6 +23,7 @@
 import static software.amazon.awssdk.http.Header.CONTENT_LENGTH;
 import static software.amazon.awssdk.http.Header.CONTENT_MD5;
 
+import java.nio.charset.StandardCharsets;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -41,6 +42,10 @@
 import software.amazon.awssdk.core.signer.NoOpSigner;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.auth.spi.signer.PayloadChecksumStore;
+import software.amazon.awssdk.utils.BinaryUtils;
+import software.amazon.awssdk.utils.IoUtils;
 import utils.ValidSdkObjects;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -48,6 +53,8 @@ public class HttpChecksumStageNonSraTest {
     private static final String CHECKSUM_SPECS_HEADER = "x-amz-checksum-sha256";
     private static final RequestBody REQUEST_BODY = RequestBody.fromString("TestBody");
     private static final AsyncRequestBody ASYNC_REQUEST_BODY = AsyncRequestBody.fromString("TestBody");
+    private static final String PAYLOAD_CHECKSUM_SHA256 = "/T5YuTxNWthvWXg+TJMwl60XKcAnLMrrOZe/jA9Y+eI=";
+
     private final HttpChecksumStage syncStage = new HttpChecksumStage(ClientType.SYNC);
     private final HttpChecksumStage asyncStage = new HttpChecksumStage(ClientType.ASYNC);
 
@@ -69,6 +76,40 @@ public void sync_md5Required_addsMd5Checksum_doesNotAddFlexibleChecksums() throw
         assertThat(requestBuilder.firstMatchingHeader(CHECKSUM_SPECS_HEADER)).isEmpty();
     }
 
+    @Test
+    public void sync_md5Required_checksumValueInStore_usesExistingValue() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
+        boolean isAsyncStreaming = false;
+        RequestExecutionContext ctx = md5RequiredRequestContext(isAsyncStreaming);
+
+        byte[] checksumValue = "my-md5".getBytes(StandardCharsets.UTF_8);
+        PayloadChecksumStore store = PayloadChecksumStore.create();
+        store.putChecksumValue(DefaultChecksumAlgorithm.MD5, checksumValue);
+
+        ctx.executionAttributes().putAttribute(SdkInternalExecutionAttribute.CHECKSUM_STORE, store);
+
+        syncStage.execute(requestBuilder, ctx);
+
+        assertThat(requestBuilder.headers().get(CONTENT_MD5)).containsExactly(BinaryUtils.toBase64(checksumValue));
+    }
+
+    @Test
+    public void sync_md5Required_checksumStoreEmpty_storesComputedMd5() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
+        boolean isAsyncStreaming = false;
+        RequestExecutionContext ctx = md5RequiredRequestContext(isAsyncStreaming);
+
+        PayloadChecksumStore store = PayloadChecksumStore.create();
+        ctx.executionAttributes().putAttribute(SdkInternalExecutionAttribute.CHECKSUM_STORE, store);
+
+        syncStage.execute(requestBuilder, ctx);
+
+        String expectedChecksum = "9dzKaiLL99all2ZyHa76RA==";
+
+        assertThat(requestBuilder.headers().get(CONTENT_MD5)).containsExactly(expectedChecksum);
+        assertThat(store.getChecksumValue(DefaultChecksumAlgorithm.MD5)).isEqualTo(BinaryUtils.fromBase64(expectedChecksum));
+    }
+
     @Test
     public void async_nonStreaming_md5Required_addsMd5Checksum_doesNotAddFlexibleChecksums() throws Exception {
         SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
@@ -119,6 +160,40 @@ public void syncWithCustomSigner_flexibleChecksumInTrailerRequired_addsFlexibleC
         assertThat(requestBuilder.firstMatchingHeader(CHECKSUM_SPECS_HEADER)).isEmpty();
     }
 
+    @Test
+    public void syncWithCustomSigner_flexibleChecksumInTrailerRequired_storeEmpty_storesComputedValue() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
+
+        RequestExecutionContext ctx = noOpSignerRequestContext(ClientType.SYNC);
+
+        PayloadChecksumStore store = PayloadChecksumStore.create();
+        ctx.executionAttributes().putAttribute(SdkInternalExecutionAttribute.CHECKSUM_STORE, store);
+
+        syncStage.execute(requestBuilder, ctx);
+
+        String content = IoUtils.toUtf8String(requestBuilder.build().contentStreamProvider().get().newStream());
+        assertThat(getTrailingChecksum(content)).isEqualTo(String.format("%s:%s", CHECKSUM_SPECS_HEADER, PAYLOAD_CHECKSUM_SHA256));
+        assertThat(store.getChecksumValue(DefaultChecksumAlgorithm.SHA256)).isEqualTo(BinaryUtils.fromBase64(PAYLOAD_CHECKSUM_SHA256));
+    }
+
+    @Test
+    public void syncWithCustomSigner_flexibleChecksumInTrailerRequired_checksumValueInStore_usesExistingValue() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
+
+        RequestExecutionContext ctx = noOpSignerRequestContext(ClientType.SYNC);
+        PayloadChecksumStore store = PayloadChecksumStore.create();
+        byte[] checksumValue = "my-sha256".getBytes(StandardCharsets.UTF_8);
+        store.putChecksumValue(DefaultChecksumAlgorithm.SHA256, checksumValue);
+
+        ctx.executionAttributes().putAttribute(SdkInternalExecutionAttribute.CHECKSUM_STORE, store);
+
+        syncStage.execute(requestBuilder, ctx);
+
+        String content = IoUtils.toUtf8String(requestBuilder.build().contentStreamProvider().get().newStream());
+        assertThat(getTrailingChecksum(content)).isEqualTo(String.format("%s:%s", CHECKSUM_SPECS_HEADER,
+                                                                         BinaryUtils.toBase64(checksumValue)));
+    }
+
     @Test
     public void asyncWithCustomSigner_flexibleChecksumInTrailerRequired_addsFlexibleChecksumInTrailer() throws Exception {
         SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
@@ -181,7 +256,7 @@ public void sync_flexibleChecksumInHeaderRequired_addsFlexibleChecksumInHeader_d
 
         syncStage.execute(requestBuilder, ctx);
 
-        assertThat(requestBuilder.headers().get(CHECKSUM_SPECS_HEADER)).containsExactly("/T5YuTxNWthvWXg+TJMwl60XKcAnLMrrOZe/jA9Y+eI=");
+        assertThat(requestBuilder.headers().get(CHECKSUM_SPECS_HEADER)).containsExactly(PAYLOAD_CHECKSUM_SHA256);
 
         assertThat(requestBuilder.firstMatchingHeader(HEADER_FOR_TRAILER_REFERENCE)).isEmpty();
         assertThat(requestBuilder.firstMatchingHeader("Content-encoding")).isEmpty();
@@ -191,6 +266,44 @@ public void sync_flexibleChecksumInHeaderRequired_addsFlexibleChecksumInHeader_d
         assertThat(requestBuilder.firstMatchingHeader(CONTENT_MD5)).isEmpty();
     }
 
+    @Test
+    public void sync_flexibleChecksumInHeaderRequired_checksumValueInStore_usesExistingValue() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
+        boolean isStreaming = false;
+
+        RequestExecutionContext ctx = syncFlexibleChecksumRequiredRequestContext(isStreaming);
+
+        byte[] checksumValue = "my-sha256".getBytes(StandardCharsets.UTF_8);
+        PayloadChecksumStore store = PayloadChecksumStore.create();
+        // Test context uses SHA-256 as the flexible checksum
+        store.putChecksumValue(DefaultChecksumAlgorithm.SHA256, checksumValue);
+
+        ctx.executionAttributes().putAttribute(SdkInternalExecutionAttribute.CHECKSUM_STORE, store);
+
+        syncStage.execute(requestBuilder, ctx);
+
+        assertThat(requestBuilder.headers().get(CHECKSUM_SPECS_HEADER)).containsExactly(BinaryUtils.toBase64(checksumValue));
+
+    }
+
+    @Test
+    public void sync_flexibleChecksumInHeaderRequired_checksumStoreEmpty_storesComputedSha256() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
+        boolean isStreaming = false;
+
+        RequestExecutionContext ctx = syncFlexibleChecksumRequiredRequestContext(isStreaming);
+
+        PayloadChecksumStore store = PayloadChecksumStore.create();
+
+        ctx.executionAttributes().putAttribute(SdkInternalExecutionAttribute.CHECKSUM_STORE, store);
+
+        syncStage.execute(requestBuilder, ctx);
+
+        assertThat(requestBuilder.headers().get(CHECKSUM_SPECS_HEADER)).containsExactly(PAYLOAD_CHECKSUM_SHA256);
+        // Test context uses SHA-256 as the flexible checksum
+        assertThat(store.getChecksumValue(DefaultChecksumAlgorithm.SHA256)).isEqualTo(BinaryUtils.fromBase64(PAYLOAD_CHECKSUM_SHA256));
+    }
+
     @Test
     public void async_flexibleChecksumInHeaderRequired_addsFlexibleChecksumInHeader_doesNotAddMd5ChecksumAndFlexibleChecksumInTrailer() throws Exception {
         SdkHttpFullRequest.Builder requestBuilder = createHttpRequestBuilder();
@@ -199,7 +312,7 @@ public void async_flexibleChecksumInHeaderRequired_addsFlexibleChecksumInHeader_
 
         asyncStage.execute(requestBuilder, ctx);
 
-        assertThat(requestBuilder.headers().get(CHECKSUM_SPECS_HEADER)).containsExactly("/T5YuTxNWthvWXg+TJMwl60XKcAnLMrrOZe/jA9Y+eI=");
+        assertThat(requestBuilder.headers().get(CHECKSUM_SPECS_HEADER)).containsExactly(PAYLOAD_CHECKSUM_SHA256);
 
         assertThat(requestBuilder.firstMatchingHeader(HEADER_FOR_TRAILER_REFERENCE)).isEmpty();
         assertThat(requestBuilder.firstMatchingHeader("Content-encoding")).isEmpty();
@@ -209,8 +322,21 @@ public void async_flexibleChecksumInHeaderRequired_addsFlexibleChecksumInHeader_
         assertThat(requestBuilder.firstMatchingHeader(CONTENT_MD5)).isEmpty();
     }
 
+    private static String getTrailingChecksum(String payload) {
+        for (String line : payload.split("\r\n")) {
+            if (line.startsWith("x-amz-checksum")) {
+                return line;
+            }
+        }
+        return null;
+    }
+
     private SdkHttpFullRequest.Builder createHttpRequestBuilder() {
-        return SdkHttpFullRequest.builder().contentStreamProvider(REQUEST_BODY.contentStreamProvider());
+        return SdkHttpFullRequest.builder()
+                                 .method(SdkHttpMethod.GET)
+                                 .protocol("https")
+                                 .host("sdk.aws")
+                                 .contentStreamProvider(REQUEST_BODY.contentStreamProvider());
     }
 
     private RequestExecutionContext md5RequiredRequestContext(boolean isAsyncStreaming) {
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java
index 4158945ef302..80f3009734d6 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumReuseTest.java
@@ -37,6 +37,7 @@
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.auth.signer.AwsS3V4Signer;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.checksums.RequestChecksumCalculation;
 import software.amazon.awssdk.core.exception.SdkException;
@@ -109,6 +110,35 @@ public void putObject_serverResponds500_usesSameChecksumOnRetries() {
         assertAllTrailingChecksumsMatch(httpClient.requestPayloads);
     }
 
+    @Test
+    public void putObject_nonSra_serverResponds500_usesSameChecksumOnRetries() {
+        MockHttpClient httpClient = new MockHttpClient();
+
+        S3Client s3 = S3Client.builder()
+                              .region(Region.US_WEST_2)
+                              .credentialsProvider(CREDENTIALS_PROVIDER)
+                              .requestChecksumCalculation(RequestChecksumCalculation.WHEN_SUPPORTED)
+                              .httpClient(httpClient)
+                              .overrideConfiguration(o -> o.retryStrategy(StandardRetryStrategy.builder()
+                                                                                               .maxAttempts(4)
+                                                                                               .backoffStrategy(BackoffStrategy.retryImmediately())
+                                                                                               .build()))
+                              .build();
+
+        RequestBody requestBody = RequestBody.fromInputStream(new RandomInputStream(), 4096);
+
+        assertThatThrownBy(() -> s3.putObject(r -> r.bucket(BUCKET)
+                                                    .key(KEY)
+                                                    .checksumAlgorithm(ChecksumAlgorithm.CRC32)
+                                                    .overrideConfiguration(o -> o.signer(AwsS3V4Signer.create())),
+                                              requestBody))
+            .isInstanceOf(S3Exception.class)
+            // Ensure we actually retried
+            .matches(e -> ((SdkException) e).numAttempts() == 4);
+
+        assertAllTrailingChecksumsMatch(httpClient.requestPayloads);
+    }
+
     @Test
     void asyncPutObject_serverResponds500_usesSameChecksumOnRetries() {
         MockAsyncHttpClient httpClient = new MockAsyncHttpClient();
@@ -138,6 +168,39 @@ void asyncPutObject_serverResponds500_usesSameChecksumOnRetries() {
         assertAllTrailingChecksumsMatch(httpClient.requestPayloads);
     }
 
+    @Test
+    void asyncPutObject_nonSra_serverResponds500_usesSameChecksumOnRetries() {
+        MockAsyncHttpClient httpClient = new MockAsyncHttpClient();
+
+        S3AsyncClient s3 = S3AsyncClient.builder()
+                                        .region(Region.US_WEST_2)
+                                        .credentialsProvider(CREDENTIALS_PROVIDER)
+                                        .requestChecksumCalculation(RequestChecksumCalculation.WHEN_SUPPORTED)
+                                        .httpClient(httpClient)
+                                        .overrideConfiguration(o -> o.retryStrategy(StandardRetryStrategy.builder()
+                                                                                                         .maxAttempts(4)
+                                                                                                         .backoffStrategy(BackoffStrategy.retryImmediately())
+                                                                                                         .build()))
+                                        .build();
+
+        AsyncRequestBody requestBody = AsyncRequestBody.fromInputStream(new RandomInputStream(),
+                                                                        4096L,
+                                                                        executorService);
+
+        CompletableFuture<PutObjectResponse> responseFuture =
+            s3.putObject(r -> r.bucket(BUCKET)
+                               .key(KEY)
+                               .checksumAlgorithm(ChecksumAlgorithm.CRC32)
+                               .overrideConfiguration(o -> o.signer(AwsS3V4Signer.create())),
+                         requestBody);
+
+        assertThatThrownBy(responseFuture::join)
+            .hasCauseInstanceOf(S3Exception.class)
+            .matches(e -> ((SdkException) e.getCause()).numAttempts() == 4);
+
+        assertAllTrailingChecksumsMatch(httpClient.requestPayloads);
+    }
+
     private void assertAllTrailingChecksumsMatch(List<byte[]> requestPayloads) {
         List<String> trailingChecksumHeaders = new ArrayList<>();
 

From 37061c08d4c990c71de7c214c4028f5129eaffec Mon Sep 17 00:00:00 2001
From: Dongie Agnir <261310+dagnir@users.noreply.github.com>
Date: Fri, 26 Sep 2025 16:14:15 -0700
Subject: [PATCH 4/4] Merge master into feature/master/checksum-reuse (#6451)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Amazon DataZone Update: adding IAM principal id to IAM user profile details

* Amazon Elastic VMware Service Update: CreateEnvironment API now supports parameters (isHcxPublic & hcxNetworkAclId) for HCX migration via public internet, adding flexibility for migration scenarios. New APIs have been added for associating (AssociateEipToVlan) & disassociating (DisassociateEipFromVlan) Elastic IP (EIP) addresses.

* Amazon EC2 Container Service Update: This release supports hook details for Amazon ECS lifecycle hooks.

* Amazon EMR Containers Update: Added nodeLabel support in container provider to aid hardware isolation support for virtual cluster and security configuration.

* Amazon Relational Database Service Update: Adds support for end-to-end IAM authentication in RDS Proxy for MySQL, MariaDB, and PostgreSQL engines.

* Amazon QuickSight Update: This release adds support for Account level custom permissions, additional Dashboard Options, and Null support for Q&A.

* Amazon Prometheus Service Update: Add Vended Logs APIs for Amazon Prometheus Managed Collector

* AWS Elemental MediaLive Update: AWS Elemental MediaLive adds a new feature in MediaPackage output group that enables MediaPackage V2 users to control HLS-related parameters directly in MediaLive. These parameter settings are then reflected in MediaPackage outputs, providing more streamlined control over HLS configurations.

* Amazon GuardDuty Update: Updated Java SDK implementation of entity set status in GuardDuty API.

* Updated endpoints.json and partitions.json.

* Release 2.33.8. Updated CHANGELOG.md, README.md and all pom.xml.

* fix multi line xml tag, and add maven central validation (#6400)

* bump jackson to 2.19.0 (#6358)

* Update version

* Add include source in location flag

* Add changelog

* Update to next snapshot version: 2.33.9-SNAPSHOT

* Payment Cryptography Control Plane Update: Add support for certificates to be signed by 3rd party certificate authorities. New API GetCertificateSigningRequest API and support for providing certificates at run-time for tr-34 import/export

* Release 2.33.9. Updated CHANGELOG.md, README.md and all pom.xml.

* added part count validation for download request (#6353)

* added part count and content range validation for download

* changelog added

* remove contentRange validation since part size could different

* feedback addressed

* delete unused utils

* change validation in futurn complete

* added unit test

* change test name

* minor change

* minor change

* Integration test added

* Unit test fixed

* swap method body of onError and handleError

* minor change

* Update to next snapshot version: 2.33.10-SNAPSHOT

* Remove flaky integ test that has been covered in set up (#6417)

* Exclude release-scripts and scripts folder (#6266)

* AWS Health Imaging Update: Added support for OpenID Connect (OIDC) custom authorizer

* CloudWatch Observability Admin Service Update: CloudWatch Observability Admin adds the ability to enable telemetry centralization in customers' Organizations. The release introduces new APIs to manage centralization rules, which define settings to replicate telemetry data to a central destination in the customers' Organization.

* AWS Cost Explorer Service Update: Added endpoint support for eusc-de-east-1 region.

* AWS S3 Control Update: Introduce three new encryption filters: EncryptionType (SSE-S3, SSE-KMS, DSSE-KMS, SSE-C, NOT-SSE), KmsKeyArn (for SSE-KMS and DSSE-KMS), and BucketKeyEnabled (for SSE-KMS).

* Updated endpoints.json and partitions.json.

* Release 2.33.10. Updated CHANGELOG.md, README.md and all pom.xml.

* Removing SMS service

* remove from aws-sdk-java/pom.xml

* Remove changelog

* Preserve content-length when calling mark in SdkLengthAwareInputStream (#6408)

* Preserve content-length when calling mark in SdkLengthAwareInputStream

* Add test case

* Ensure that markedRemaining is initialized

* Flaky test fix for StoringSubscriberTest (#6420)

* flaky test fix

* changelog removed

* Update to next snapshot version: 2.33.11-SNAPSHOT

* Amazon OpenSearch Ingestion Update: Adds support for cross-account ingestion for push-based sources. This includes resource policies for sharing pipelines across accounts and features for managing pipeline endpoints which enable accessing pipelines across different VPCs, including VPCs in other accounts.

* Amazon Interactive Video Service RealTime Update: IVS now offers customers the ability to control the positioning of participants in both grid and PiP layouts based on custom attribute values in participant tokens.

* AWS Budgets Update: Add support for custom time periods in budget configuration

* Amazon CloudWatch Logs Update: Cloudwatch Logs added support for 2 new API parameters in metric and subscription filter APIs to filter log events based on system field values and emit system field values as dimensions and send them to customer destination as additional metadata.

* Updated endpoints.json and partitions.json.

* Release 2.33.11. Updated CHANGELOG.md, README.md and all pom.xml.

* Update to next snapshot version: 2.33.12-SNAPSHOT

* Remove unused s3 classes (#6428)

* AWS Parallel Computing Service Update: Add support for Amazon EC2 Capacity Blocks for ML

* Amazon Elastic Compute Cloud Update: Add mac-m4.metal and mac-m4pro.metal instance types.

* AWS Network Firewall Update: Network Firewall now prevents TLS handshakes with the target server until after the Server Name Indication (SNI) has been seen and verified. The monitoring dashboard now provides deeper insights into PrivateLink endpoint candidates and offers filters based on IP addresses and protocol.

* Release 2.33.12. Updated CHANGELOG.md, README.md and all pom.xml.

* Update to next snapshot version: 2.33.13-SNAPSHOT

* Feature/master/utils lite lambda trace (#6404)

* Add utils-lite package (#6395)

Add utils-lite package

* Add support for concurrent trace id propagation (#6403)

Add support for concurrent trace id propagation

* Add changelog

* update utils-lite version to match parent

* Fix again version

* Bump version

* Fix braziljson name

* Add thread safe annotation

* Adding a lazy loading of the hashmap

* Refactored code according to comments

* Modify threadLocal to InheritableThreadLocal

* Add javadoc clarification

* Add lambda check to prevent extra checks on non-lambda environments

* Update beforeExecution logic

* Fix checkstyle

* Add test coverage

* update version

* Removing non-determinstic test

* Removing unused dependencies

* update version

* Amazon Chime SDK Messaging Update: Amazon Chime SDK Messaging GetMessagingSessionEndpoint API now returns dual-stack WebSocket endpoints supporting IPv4/IPv6.

* AWS Budgets Update: Added BillingViewHealthStatus Exception which is thrown when a Budget is created or updated with a Billing View that is not in the HEALTHY status

* Amazon Bedrock Update: Release includes an increase to the maximum policy build document size, an update to DeleteAutomatedReasoningPolicyBuildWorkflow to add ResourceInUseException, and corrections to UpdateAutomatedReasoningPolicyTestCaseRequest.

* Amazon Elastic Compute Cloud Update: Allowed AMIs adds support for four new parameters - marketplaceProductCodes, deprecationTimeCondition, creationDateCondition and imageNames

* Release 2.33.13. Updated CHANGELOG.md, README.md and all pom.xml.

* Revert "Feature/master/utils lite lambda trace (#6404)" (#6431)

This reverts commit 65a56541e7b95acb7dac9cd28856c30388e5d13d.

* Update to next snapshot version: 2.33.14-SNAPSHOT

* Migration Tool GA Release (#6430)

* Merge TransferManager recipes to main recipe (#6392)

* Bump OpenRewrite to 3.14.0 (#6394)

* Bump OpenRewrite to 3.6.1

* Bump OpenRewrite to 3.14.0

* Remove redundant import add/remove

* Add v2 import in S3PojoToV2

* Update unit test for exceptions

* Update README and remove "-PREVIEW" from version (#6416)

* Update README

* Remove -PREVIEW from pom

* Add changelog

* Bump minor version to 2.34.0 (#6432)

* Feature/master/utils lite lambda trace again (#6433)

* Add utils-lite package (#6395)

Add utils-lite package

* Add support for concurrent trace id propagation (#6403)

Add support for concurrent trace id propagation

* Add changelog

* update utils-lite version to match parent

* Fix again version

* Bump version

* Fix braziljson name

* Add thread safe annotation

* Adding a lazy loading of the hashmap

* Refactored code according to comments

* Modify threadLocal to InheritableThreadLocal

* Add javadoc clarification

* Add lambda check to prevent extra checks on non-lambda environments

* Update beforeExecution logic

* Fix checkstyle

* Add test coverage

* update version

* Removing non-determinstic test

* Removing unused dependencies

* update version

* Add support for lambda traces via SdkInternalThreadLocal

* Bump version

* Maven Central Migration (#6375)

* adding maven central migration plugin, config and new buildspec

* Update profile config

* fix gpg plugin

* Remove redundant plugin config

* force java 8 on the codebuild

* Fix staging dir path

* Fix cloudwatch reporting

* Fix cloudwatch reporting

* Fix buildspec, add comment

---------

Co-authored-by: Ran Vaknin <rvaknin@dev-dsk-rvaknin2-2a-e69e90c1.us-west-2.amazon.com>
Co-authored-by: RanVaknin <>

* AWS Elemental MediaLive Update: Add MinBitrate for QVBR mode under H264/H265/AV1 output codec. Add GopBReference, GopNumBFrames, SubGopLength fields under H265 output codec.

* Amazon Kendra Intelligent Ranking Update: Model whitespace change - no client difference

* Amazon Bedrock Agent Core Control Plane Fronting Layer Update: Add tagging and VPC support to AgentCore Runtime, Code Interpreter, and Browser resources. Add support for configuring request headers in Runtime. Fix AgentCore Runtime shape names.

* AWS Config Update: Add UNKNOWN state to RemediationExecutionState and add IN_PROGRESS/EXITED/UNKNOWN states to RemediationExecutionStepState.

* Amazon Connect Service Update: This release adds a persistent connection field to UserPhoneConfig that maintains agent's softphone media connection for faster call connections.

* AWS License Manager User Subscriptions Update: Added support for cross-account Active Directories.

* Amazon Simple Queue Service Update: Update invalid character handling documentation for SQS SendMessage API

* Updated endpoints.json and partitions.json.

* Release 2.34.0. Updated CHANGELOG.md, README.md and all pom.xml.

* Update to next snapshot version: 2.34.1-SNAPSHOT

* Amazon Elastic Kubernetes Service Update: Adds support for RepairConfig overrides and configurations in EKS Managed Node Groups.

* EC2 Image Builder Update: Version ARNs are no longer required for the EC2 Image Builder list-image-build-version, list-component-build-version, and list-workflow-build-version APIs. Calling these APIs without the ARN returns all build versions for the given resource type in the requesting account.

* AWS Batch Update: Starting in JAN 2026, AWS Batch will change the default AMI for new Amazon ECS compute environments from Amazon Linux 2 to Amazon Linux 2023. We recommend migrating AWS Batch Amazon ECS compute environments to Amazon Linux 2023 to maintain optimal performance and security.

* Updated endpoints.json and partitions.json.

* Release 2.34.1. Updated CHANGELOG.md, README.md and all pom.xml.

* Update to next snapshot version: 2.34.2-SNAPSHOT

* AWS EntityResolution Update: Support incremental id mapping workflow for AWS Entity Resolution

* AWS Single Sign-On Admin Update: Add support for encryption at rest with Customer Managed KMS Key in AWS IAM Identity Center

* AWS Clean Rooms Service Update: Added support for running incremental ID mapping for rule-based workflows.

* Amazon Simple Systems Manager (SSM) Update: Added Dualstack support to GetDeployablePatchSnapshotForInstance

* Amazon Elastic Compute Cloud Update: Add Amazon EC2 R8gn instance types

* AWS SSO OIDC Update: This release includes exception definition and documentation updates.

* Updated endpoints.json and partitions.json.

* Release 2.34.2. Updated CHANGELOG.md, README.md and all pom.xml.

* Update to next snapshot version: 2.34.3-SNAPSHOT

* Fix OpenRewrite Method Matcher Syntax (#6438)

* add missing ')' to OpenRewrite Mathod Matcher

* add missing ')' to OpenRewrite Method Matcher

---------

Co-authored-by: hdavidh <hdavidh@amazon.com>

* docs: add MBoegers as a contributor for code (#6442)

* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

---------

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: David Ho <70000000+davidh44@users.noreply.github.com>

* Amazon AppStream Update: G6f instance support for AppStream 2.0

* Amazon DynamoDB Accelerator (DAX) Update: This release adds support for IPv6-only, DUAL_STACK DAX instances

* AWS Key Management Service Update: Documentation only updates for KMS.

* Amazon CloudWatch Update: Fix default dualstack FIPS endpoints in AWS GovCloud(US) regions

* Amazon Neptune Update: Doc-only update to address customer use.

* Release 2.34.3. Updated CHANGELOG.md, README.md and all pom.xml.

* Update to next snapshot version: 2.34.4-SNAPSHOT

* Amazon Lightsail Update: Attribute HTTP binding update for Get/Delete operations

* AWS Glue Update: Update GetConnection(s) API to return KmsKeyArn & Add 63 missing connection types

* AWS Network Firewall Update: Network Firewall now introduces Reject and Alert action support for stateful domain list rule groups, providing customers with more granular control over their network traffic.

* Updated endpoints.json and partitions.json.

* Release 2.34.4. Updated CHANGELOG.md, README.md and all pom.xml.

* Update to next snapshot version: 2.34.5-SNAPSHOT

* Optimizations for EnhancedDocument.toJson() (#6446)

* Fix SqsAsyncBatchManager excessive batch flushing under heavy load (#6374) (#6378)

* Synchronize replacement of scheduled flush

Co-authored-by: Cody Thornhill <thornco@amazon.com>
Co-authored-by: John Viegas <70235430+joviegas@users.noreply.github.com>

* Revert "bump jackson to 2.19.0 (#6358)"

This reverts commit 5449862786b041067d645e0d77a6a456c683ec0e.

* Amazon Connect Service Update: Adds supports for manual contact picking (WorkList) operations on Routing Profiles, Agent Management and SearchContacts APIs.

* AWS Cost Explorer Service Update: Support for payer account dimension and billing view health status.

* Data Automation for Amazon Bedrock Update: Added support for configurable Speaker Labeling and Channel Labeling features for Audio modality.

* Agents for Amazon Bedrock Runtime Update: This release enhances the information provided through Flow Traces. New information includes source/next node tracking, execution chains for complex nodes, dependency action (operation) details, and dependency traces.

* Amazon DynamoDB Streams Update: Added support for IPv6 compatible endpoints for DynamoDB Streams.

* AWS Billing Update: Add ability to combine custom billing views to create new consolidated views.

* Amazon Redshift Update: Support tagging and tag propagation to IAM Identity Center for Redshift Idc Applications

* Amazon Elastic Compute Cloud Update: This release includes documentation updates for Amazon EBS General Purpose SSD (gp3) volumes with larger size and higher IOPS and throughput.

* Updated endpoints.json and partitions.json.

* Release 2.34.5. Updated CHANGELOG.md, README.md and all pom.xml.

* AWS Cost Explorer Service Update: Support for payer account dimension and billing view health status.

* Amazon DynamoDB Streams Update: Added support for IPv6 compatible endpoints for DynamoDB Streams.

* Agents for Amazon Bedrock Runtime Update: This release enhances the information provided through Flow Traces. New information includes source/next node tracking, execution chains for complex nodes, dependency action (operation) details, and dependency traces.

* Data Automation for Amazon Bedrock Update: Added support for configurable Speaker Labeling and Channel Labeling features for Audio modality.

* Amazon Connect Service Update: Adds supports for manual contact picking (WorkList) operations on Routing Profiles, Agent Management and SearchContacts APIs.

* AWS Billing Update: Add ability to combine custom billing views to create new consolidated views.

* Amazon Redshift Update: Support tagging and tag propagation to IAM Identity Center for Redshift Idc Applications

* Amazon Elastic Compute Cloud Update: This release includes documentation updates for Amazon EBS General Purpose SSD (gp3) volumes with larger size and higher IOPS and throughput.

* Updated endpoints.json and partitions.json.

* Release 2.34.5. Updated CHANGELOG.md, README.md and all pom.xml.

* Update to next snapshot version: 2.34.6-SNAPSHOT

---------

Co-authored-by: AWS <>
Co-authored-by: aws-sdk-java-automation <43143862+aws-sdk-java-automation@users.noreply.github.com>
Co-authored-by: Ran Vaknin <50976344+RanVaknin@users.noreply.github.com>
Co-authored-by: Bole1155 <49867651+Fred1155@users.noreply.github.com>
Co-authored-by: Zoe Wang <33073555+zoewangg@users.noreply.github.com>
Co-authored-by: John Viegas <70235430+joviegas@users.noreply.github.com>
Co-authored-by: Alex Woods <alexwoo@amazon.com>
Co-authored-by: David Ho <70000000+davidh44@users.noreply.github.com>
Co-authored-by: Ran Vaknin <rvaknin@dev-dsk-rvaknin2-2a-e69e90c1.us-west-2.amazon.com>
Co-authored-by: Merlin Bögershausen <merlin.boegershausen@rwth-aachen.de>
Co-authored-by: hdavidh <hdavidh@amazon.com>
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: thornhillcody <thornhill.cody@gmail.com>
Co-authored-by: Cody Thornhill <thornco@amazon.com>
---
 .all-contributorsrc                           |    9 +
 .brazil.json                                  |    1 +
 .changes/{ => 2.33.x}/2.33.0.json             |    0
 .changes/{ => 2.33.x}/2.33.1.json             |    0
 .changes/2.33.x/2.33.10.json                  |   42 +
 .changes/2.33.x/2.33.11.json                  |   42 +
 .changes/2.33.x/2.33.12.json                  |   24 +
 .changes/2.33.x/2.33.13.json                  |   30 +
 .changes/{ => 2.33.x}/2.33.2.json             |    0
 .changes/{ => 2.33.x}/2.33.3.json             |    0
 .changes/{ => 2.33.x}/2.33.4.json             |    0
 .changes/{ => 2.33.x}/2.33.5.json             |    0
 .changes/{ => 2.33.x}/2.33.6.json             |    0
 .changes/{ => 2.33.x}/2.33.7.json             |    0
 .changes/2.33.x/2.33.8.json                   |   66 +
 .changes/2.33.x/2.33.9.json                   |   18 +
 .changes/2.34.0.json                          |   66 +
 .changes/2.34.1.json                          |   30 +
 .changes/2.34.2.json                          |   48 +
 .changes/2.34.3.json                          |   42 +
 .changes/2.34.4.json                          |   30 +
 .changes/2.34.5.json                          |   72 +
 .../api-surface-area-review-verification.yml  |    2 +-
 .github/workflows/new-module-verification.yml |   31 +-
 CHANGELOG.md                                  |  217 +-
 README.md                                     |   13 +-
 archetypes/archetype-app-quickstart/pom.xml   |    2 +-
 archetypes/archetype-lambda/pom.xml           |    2 +-
 archetypes/archetype-tools/pom.xml            |    4 +-
 archetypes/pom.xml                            |    2 +-
 aws-sdk-java/pom.xml                          |   12 +-
 bom-internal/pom.xml                          |    4 +-
 bom/pom.xml                                   |   12 +-
 buildspecs/release-to-maven-central.yml       |   57 +
 .../maven-central-release-settings.xml        |   21 +
 bundle-logging-bridge/pom.xml                 |    2 +-
 bundle-sdk/pom.xml                            |   34 +-
 bundle/pom.xml                                |   43 +-
 changelogs/2.33.x-CHANGELOG.md                |  344 ++
 codegen-lite-maven-plugin/pom.xml             |    2 +-
 codegen-lite/pom.xml                          |    2 +-
 codegen-maven-plugin/pom.xml                  |    2 +-
 codegen/pom.xml                               |    2 +-
 .../codegen/rules/partitions.json.resource    |    8 +-
 core/annotations/pom.xml                      |    2 +-
 core/arns/pom.xml                             |    2 +-
 core/auth-crt/pom.xml                         |    2 +-
 core/auth/pom.xml                             |    2 +-
 core/aws-core/pom.xml                         |    7 +-
 .../TraceIdExecutionInterceptor.java          |   52 +-
 .../TraceIdExecutionInterceptorTest.java      |   73 +
 core/checksums-spi/pom.xml                    |    2 +-
 core/checksums/pom.xml                        |    2 +-
 core/crt-core/pom.xml                         |    2 +-
 core/endpoints-spi/pom.xml                    |    2 +-
 core/http-auth-aws-crt/pom.xml                |    2 +-
 core/http-auth-aws-eventstream/pom.xml        |    2 +-
 core/http-auth-aws/pom.xml                    |    2 +-
 core/http-auth-spi/pom.xml                    |    2 +-
 core/http-auth/pom.xml                        |    2 +-
 core/identity-spi/pom.xml                     |    2 +-
 core/imds/pom.xml                             |    2 +-
 core/json-utils/pom.xml                       |    2 +-
 core/metrics-spi/pom.xml                      |    2 +-
 core/pom.xml                                  |    2 +-
 core/profiles/pom.xml                         |    2 +-
 core/protocols/aws-cbor-protocol/pom.xml      |    2 +-
 core/protocols/aws-json-protocol/pom.xml      |    2 +-
 core/protocols/aws-query-protocol/pom.xml     |    2 +-
 core/protocols/aws-xml-protocol/pom.xml       |    2 +-
 core/protocols/pom.xml                        |    2 +-
 core/protocols/protocol-core/pom.xml          |    2 +-
 core/protocols/smithy-rpcv2-protocol/pom.xml  |    2 +-
 core/regions/pom.xml                          |    2 +-
 .../regions/internal/region/endpoints.json    |   89 +-
 .../regions/PartitionServiceMetadataTest.java |    2 +-
 core/retries-spi/pom.xml                      |    2 +-
 core/retries/pom.xml                          |    2 +-
 core/sdk-core/pom.xml                         |    2 +-
 .../io/SdkLengthAwareInputStream.java         |   11 +-
 .../io/SdkLengthAwareInputStreamTest.java     |   21 +
 http-client-spi/pom.xml                       |    2 +-
 http-clients/apache-client/pom.xml            |    2 +-
 http-clients/apache5-client/pom.xml           |    2 +-
 http-clients/aws-crt-client/pom.xml           |    2 +-
 http-clients/netty-nio-client/pom.xml         |    2 +-
 http-clients/pom.xml                          |    2 +-
 http-clients/url-connection-client/pom.xml    |    2 +-
 .../cloudwatch-metric-publisher/pom.xml       |    2 +-
 .../emf-metric-logging-publisher/pom.xml      |    2 +-
 metric-publishers/pom.xml                     |    2 +-
 pom.xml                                       |   55 +-
 release-scripts/pom.xml                       |    2 +-
 services-custom/dynamodb-enhanced/pom.xml     |    2 +-
 .../document/JsonStringFormatHelper.java      |   88 +-
 services-custom/iam-policy-builder/pom.xml    |    2 +-
 services-custom/pom.xml                       |    2 +-
 .../s3-event-notifications/pom.xml            |    2 +-
 services-custom/s3-transfer-manager/pom.xml   |    2 +-
 services/accessanalyzer/pom.xml               |    2 +-
 services/account/pom.xml                      |    2 +-
 services/acm/pom.xml                          |    2 +-
 services/acmpca/pom.xml                       |    2 +-
 services/aiops/pom.xml                        |    2 +-
 services/amp/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |  241 +-
 services/amplify/pom.xml                      |    2 +-
 services/amplifybackend/pom.xml               |    2 +-
 services/amplifyuibuilder/pom.xml             |    2 +-
 services/apigateway/pom.xml                   |    2 +-
 services/apigatewaymanagementapi/pom.xml      |    2 +-
 services/apigatewayv2/pom.xml                 |    2 +-
 services/appconfig/pom.xml                    |    2 +-
 services/appconfigdata/pom.xml                |    2 +-
 services/appfabric/pom.xml                    |    2 +-
 services/appflow/pom.xml                      |    2 +-
 services/appintegrations/pom.xml              |    2 +-
 services/applicationautoscaling/pom.xml       |    2 +-
 services/applicationcostprofiler/pom.xml      |    2 +-
 services/applicationdiscovery/pom.xml         |    2 +-
 services/applicationinsights/pom.xml          |    2 +-
 services/applicationsignals/pom.xml           |    2 +-
 services/appmesh/pom.xml                      |    2 +-
 services/apprunner/pom.xml                    |    2 +-
 services/appstream/pom.xml                    |    2 +-
 .../codegen-resources/service-2.json          |   10 +-
 services/appsync/pom.xml                      |    2 +-
 services/apptest/pom.xml                      |    2 +-
 services/arcregionswitch/pom.xml              |    2 +-
 services/arczonalshift/pom.xml                |    2 +-
 services/artifact/pom.xml                     |    2 +-
 services/athena/pom.xml                       |    2 +-
 services/auditmanager/pom.xml                 |    2 +-
 services/autoscaling/pom.xml                  |    2 +-
 services/autoscalingplans/pom.xml             |    2 +-
 services/b2bi/pom.xml                         |    2 +-
 services/backup/pom.xml                       |    2 +-
 services/backupgateway/pom.xml                |    2 +-
 services/backupsearch/pom.xml                 |    2 +-
 services/batch/pom.xml                        |    2 +-
 .../codegen-resources/service-2.json          |   16 +-
 services/bcmdashboards/pom.xml                |    2 +-
 services/bcmdataexports/pom.xml               |    2 +-
 services/bcmpricingcalculator/pom.xml         |    2 +-
 services/bcmrecommendedactions/pom.xml        |    2 +-
 services/bedrock/pom.xml                      |    2 +-
 .../codegen-resources/service-2.json          |   18 +-
 services/bedrockagent/pom.xml                 |    2 +-
 services/bedrockagentcore/pom.xml             |    2 +-
 services/bedrockagentcorecontrol/pom.xml      |    2 +-
 .../codegen-resources/service-2.json          |  841 +++--
 services/bedrockagentruntime/pom.xml          |    2 +-
 .../codegen-resources/service-2.json          | 3335 +++++++++--------
 .../codegen-resources/waiters-2.json          |    5 +
 services/bedrockdataautomation/pom.xml        |    2 +-
 .../codegen-resources/service-2.json          |   43 +-
 services/bedrockdataautomationruntime/pom.xml |    2 +-
 services/bedrockruntime/pom.xml               |    2 +-
 services/billing/pom.xml                      |    2 +-
 .../codegen-resources/service-2.json          |  228 +-
 services/billingconductor/pom.xml             |    2 +-
 services/braket/pom.xml                       |    2 +-
 services/budgets/pom.xml                      |    2 +-
 .../codegen-resources/service-2.json          |   24 +-
 services/chatbot/pom.xml                      |    2 +-
 services/chime/pom.xml                        |    2 +-
 services/chimesdkidentity/pom.xml             |    2 +-
 services/chimesdkmediapipelines/pom.xml       |    2 +-
 services/chimesdkmeetings/pom.xml             |    2 +-
 services/chimesdkmessaging/pom.xml            |    2 +-
 .../codegen-resources/service-2.json          |   32 +-
 services/chimesdkvoice/pom.xml                |    2 +-
 services/cleanrooms/pom.xml                   |    2 +-
 .../codegen-resources/service-2.json          |  145 +-
 services/cleanroomsml/pom.xml                 |    2 +-
 services/cloud9/pom.xml                       |    2 +-
 services/cloudcontrol/pom.xml                 |    2 +-
 services/clouddirectory/pom.xml               |    2 +-
 services/cloudformation/pom.xml               |    2 +-
 services/cloudfront/pom.xml                   |    2 +-
 services/cloudfrontkeyvaluestore/pom.xml      |    2 +-
 services/cloudhsm/pom.xml                     |    2 +-
 services/cloudhsmv2/pom.xml                   |    2 +-
 services/cloudsearch/pom.xml                  |    2 +-
 services/cloudsearchdomain/pom.xml            |    2 +-
 services/cloudtrail/pom.xml                   |    2 +-
 services/cloudtraildata/pom.xml               |    2 +-
 services/cloudwatch/pom.xml                   |    2 +-
 .../codegen-resources/endpoint-rule-set.json  |  409 +-
 .../codegen-resources/endpoint-tests.json     |  460 +--
 services/cloudwatchevents/pom.xml             |    2 +-
 services/cloudwatchlogs/pom.xml               |    2 +-
 .../codegen-resources/service-2.json          |   66 +-
 services/codeartifact/pom.xml                 |    2 +-
 services/codebuild/pom.xml                    |    2 +-
 services/codecatalyst/pom.xml                 |    2 +-
 services/codecommit/pom.xml                   |    2 +-
 services/codeconnections/pom.xml              |    2 +-
 services/codedeploy/pom.xml                   |    2 +-
 services/codeguruprofiler/pom.xml             |    2 +-
 services/codegurureviewer/pom.xml             |    2 +-
 services/codegurusecurity/pom.xml             |    2 +-
 services/codepipeline/pom.xml                 |    2 +-
 services/codestarconnections/pom.xml          |    2 +-
 services/codestarnotifications/pom.xml        |    2 +-
 services/cognitoidentity/pom.xml              |    2 +-
 services/cognitoidentityprovider/pom.xml      |    2 +-
 services/cognitosync/pom.xml                  |    2 +-
 services/comprehend/pom.xml                   |    2 +-
 services/comprehendmedical/pom.xml            |    2 +-
 services/computeoptimizer/pom.xml             |    2 +-
 services/config/pom.xml                       |    2 +-
 .../codegen-resources/service-2.json          |    8 +-
 services/connect/pom.xml                      |    2 +-
 .../codegen-resources/paginators-1.json       |   10 +
 .../codegen-resources/service-2.json          |  354 +-
 services/connectcampaigns/pom.xml             |    2 +-
 services/connectcampaignsv2/pom.xml           |    2 +-
 services/connectcases/pom.xml                 |    2 +-
 services/connectcontactlens/pom.xml           |    2 +-
 services/connectparticipant/pom.xml           |    2 +-
 services/controlcatalog/pom.xml               |    2 +-
 services/controltower/pom.xml                 |    2 +-
 services/costandusagereport/pom.xml           |    2 +-
 services/costexplorer/pom.xml                 |    2 +-
 .../codegen-resources/endpoint-rule-set.json  |   50 +
 .../codegen-resources/service-2.json          |   38 +-
 services/costoptimizationhub/pom.xml          |    2 +-
 services/customerprofiles/pom.xml             |    2 +-
 services/databasemigration/pom.xml            |    2 +-
 services/databrew/pom.xml                     |    2 +-
 services/dataexchange/pom.xml                 |    2 +-
 services/datapipeline/pom.xml                 |    2 +-
 services/datasync/pom.xml                     |    2 +-
 services/datazone/pom.xml                     |    2 +-
 .../codegen-resources/service-2.json          |    4 +
 services/dax/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |   60 +-
 services/deadline/pom.xml                     |    2 +-
 services/detective/pom.xml                    |    2 +-
 services/devicefarm/pom.xml                   |    2 +-
 services/devopsguru/pom.xml                   |    2 +-
 services/directconnect/pom.xml                |    2 +-
 services/directory/pom.xml                    |    2 +-
 services/directoryservicedata/pom.xml         |    2 +-
 services/dlm/pom.xml                          |    2 +-
 services/docdb/pom.xml                        |    2 +-
 services/docdbelastic/pom.xml                 |    2 +-
 services/drs/pom.xml                          |    2 +-
 services/dsql/pom.xml                         |    2 +-
 services/dynamodb/pom.xml                     |    2 +-
 .../dynamodbstreams/endpoint-rule-set.json    |  728 ++--
 .../dynamodbstreams/endpoint-tests.json       |  436 +--
 services/ebs/pom.xml                          |    2 +-
 services/ec2/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |  198 +-
 services/ec2instanceconnect/pom.xml           |    2 +-
 services/ecr/pom.xml                          |    2 +-
 services/ecrpublic/pom.xml                    |    2 +-
 services/ecs/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |   19 +-
 services/efs/pom.xml                          |    2 +-
 services/eks/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |   57 +-
 services/eksauth/pom.xml                      |    2 +-
 services/elasticache/pom.xml                  |    2 +-
 services/elasticbeanstalk/pom.xml             |    2 +-
 services/elasticloadbalancing/pom.xml         |    2 +-
 services/elasticloadbalancingv2/pom.xml       |    2 +-
 services/elasticsearch/pom.xml                |    2 +-
 services/elastictranscoder/pom.xml            |    2 +-
 services/emr/pom.xml                          |    2 +-
 services/emrcontainers/pom.xml                |    2 +-
 .../codegen-resources/service-2.json          |    8 +
 services/emrserverless/pom.xml                |    2 +-
 services/entityresolution/pom.xml             |    2 +-
 .../codegen-resources/service-2.json          |  162 +-
 services/eventbridge/pom.xml                  |    2 +-
 services/evidently/pom.xml                    |    2 +-
 services/evs/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |  172 +-
 services/finspace/pom.xml                     |    2 +-
 services/finspacedata/pom.xml                 |    2 +-
 services/firehose/pom.xml                     |    2 +-
 services/fis/pom.xml                          |    2 +-
 services/fms/pom.xml                          |    2 +-
 services/forecast/pom.xml                     |    2 +-
 services/forecastquery/pom.xml                |    2 +-
 services/frauddetector/pom.xml                |    2 +-
 services/freetier/pom.xml                     |    2 +-
 services/fsx/pom.xml                          |    2 +-
 services/gamelift/pom.xml                     |    2 +-
 services/gameliftstreams/pom.xml              |    2 +-
 services/geomaps/pom.xml                      |    2 +-
 services/geoplaces/pom.xml                    |    2 +-
 services/georoutes/pom.xml                    |    2 +-
 services/glacier/pom.xml                      |    2 +-
 services/globalaccelerator/pom.xml            |    2 +-
 services/glue/pom.xml                         |    2 +-
 .../codegen-resources/service-2.json          |   71 +-
 services/grafana/pom.xml                      |    2 +-
 services/greengrass/pom.xml                   |    2 +-
 services/greengrassv2/pom.xml                 |    2 +-
 services/groundstation/pom.xml                |    2 +-
 services/guardduty/pom.xml                    |    2 +-
 .../codegen-resources/service-2.json          |    2 +-
 services/health/pom.xml                       |    2 +-
 services/healthlake/pom.xml                   |    2 +-
 services/iam/pom.xml                          |    2 +-
 services/identitystore/pom.xml                |    2 +-
 services/imagebuilder/pom.xml                 |    2 +-
 .../codegen-resources/service-2.json          |    3 -
 services/inspector/pom.xml                    |    2 +-
 services/inspector2/pom.xml                   |    2 +-
 services/inspectorscan/pom.xml                |    2 +-
 services/internetmonitor/pom.xml              |    2 +-
 services/invoicing/pom.xml                    |    2 +-
 services/iot/pom.xml                          |    2 +-
 services/iotanalytics/pom.xml                 |    2 +-
 services/iotdataplane/pom.xml                 |    2 +-
 services/iotdeviceadvisor/pom.xml             |    2 +-
 services/iotevents/pom.xml                    |    2 +-
 services/ioteventsdata/pom.xml                |    2 +-
 services/iotfleethub/pom.xml                  |    2 +-
 services/iotfleetwise/pom.xml                 |    2 +-
 services/iotjobsdataplane/pom.xml             |    2 +-
 services/iotmanagedintegrations/pom.xml       |    2 +-
 services/iotsecuretunneling/pom.xml           |    2 +-
 services/iotsitewise/pom.xml                  |    2 +-
 services/iotthingsgraph/pom.xml               |    2 +-
 services/iottwinmaker/pom.xml                 |    2 +-
 services/iotwireless/pom.xml                  |    2 +-
 services/ivs/pom.xml                          |    2 +-
 services/ivschat/pom.xml                      |    2 +-
 services/ivsrealtime/pom.xml                  |    2 +-
 .../codegen-resources/service-2.json          |   12 +-
 services/kafka/pom.xml                        |    2 +-
 services/kafkaconnect/pom.xml                 |    2 +-
 services/kendra/pom.xml                       |    2 +-
 services/kendraranking/pom.xml                |    2 +-
 .../codegen-resources/endpoint-rule-set.json  |   40 +-
 .../codegen-resources/service-2.json          |   10 +-
 services/keyspaces/pom.xml                    |    2 +-
 services/keyspacesstreams/pom.xml             |    2 +-
 services/kinesis/pom.xml                      |    2 +-
 services/kinesisanalytics/pom.xml             |    2 +-
 services/kinesisanalyticsv2/pom.xml           |    2 +-
 services/kinesisvideo/pom.xml                 |    2 +-
 services/kinesisvideoarchivedmedia/pom.xml    |    2 +-
 services/kinesisvideomedia/pom.xml            |    2 +-
 services/kinesisvideosignaling/pom.xml        |    2 +-
 services/kinesisvideowebrtcstorage/pom.xml    |    2 +-
 services/kms/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |   36 +-
 services/lakeformation/pom.xml                |    2 +-
 services/lambda/pom.xml                       |    2 +-
 services/launchwizard/pom.xml                 |    2 +-
 services/lexmodelbuilding/pom.xml             |    2 +-
 services/lexmodelsv2/pom.xml                  |    2 +-
 services/lexruntime/pom.xml                   |    2 +-
 services/lexruntimev2/pom.xml                 |    2 +-
 services/licensemanager/pom.xml               |    2 +-
 .../licensemanagerlinuxsubscriptions/pom.xml  |    2 +-
 .../licensemanagerusersubscriptions/pom.xml   |    2 +-
 .../codegen-resources/service-2.json          |  399 +-
 .../codegen-resources/waiters-2.json          |    5 +
 services/lightsail/pom.xml                    |    2 +-
 .../codegen-resources/service-2.json          |    2 +-
 services/location/pom.xml                     |    2 +-
 services/lookoutequipment/pom.xml             |    2 +-
 services/lookoutmetrics/pom.xml               |    2 +-
 services/lookoutvision/pom.xml                |    2 +-
 services/m2/pom.xml                           |    2 +-
 services/machinelearning/pom.xml              |    2 +-
 services/macie2/pom.xml                       |    2 +-
 services/mailmanager/pom.xml                  |    2 +-
 services/managedblockchain/pom.xml            |    2 +-
 services/managedblockchainquery/pom.xml       |    2 +-
 services/marketplaceagreement/pom.xml         |    2 +-
 services/marketplacecatalog/pom.xml           |    2 +-
 services/marketplacecommerceanalytics/pom.xml |    2 +-
 services/marketplacedeployment/pom.xml        |    2 +-
 services/marketplaceentitlement/pom.xml       |    2 +-
 services/marketplacemetering/pom.xml          |    2 +-
 services/marketplacereporting/pom.xml         |    2 +-
 services/mediaconnect/pom.xml                 |    2 +-
 services/mediaconvert/pom.xml                 |    2 +-
 services/medialive/pom.xml                    |    2 +-
 .../codegen-resources/service-2.json          |  144 +-
 services/mediapackage/pom.xml                 |    2 +-
 services/mediapackagev2/pom.xml               |    2 +-
 services/mediapackagevod/pom.xml              |    2 +-
 services/mediastore/pom.xml                   |    2 +-
 services/mediastoredata/pom.xml               |    2 +-
 services/mediatailor/pom.xml                  |    2 +-
 services/medicalimaging/pom.xml               |    2 +-
 .../codegen-resources/service-2.json          |   55 +-
 services/memorydb/pom.xml                     |    2 +-
 services/mgn/pom.xml                          |    2 +-
 services/migrationhub/pom.xml                 |    2 +-
 services/migrationhubconfig/pom.xml           |    2 +-
 services/migrationhuborchestrator/pom.xml     |    2 +-
 services/migrationhubrefactorspaces/pom.xml   |    2 +-
 services/migrationhubstrategy/pom.xml         |    2 +-
 services/mpa/pom.xml                          |    2 +-
 services/mq/pom.xml                           |    2 +-
 services/mturk/pom.xml                        |    2 +-
 services/mwaa/pom.xml                         |    2 +-
 services/neptune/pom.xml                      |    2 +-
 .../codegen-resources/service-2.json          |    2 +-
 services/neptunedata/pom.xml                  |    2 +-
 services/neptunegraph/pom.xml                 |    2 +-
 services/networkfirewall/pom.xml              |    2 +-
 .../codegen-resources/service-2.json          |   17 +-
 services/networkflowmonitor/pom.xml           |    2 +-
 services/networkmanager/pom.xml               |    2 +-
 services/networkmonitor/pom.xml               |    2 +-
 services/notifications/pom.xml                |    2 +-
 services/notificationscontacts/pom.xml        |    2 +-
 services/oam/pom.xml                          |    2 +-
 services/observabilityadmin/pom.xml           |    2 +-
 .../codegen-resources/paginators-1.json       |    6 +
 .../codegen-resources/service-2.json          |  488 ++-
 services/odb/pom.xml                          |    2 +-
 services/omics/pom.xml                        |    2 +-
 services/opensearch/pom.xml                   |    2 +-
 services/opensearchserverless/pom.xml         |    2 +-
 services/organizations/pom.xml                |    2 +-
 services/osis/pom.xml                         |    2 +-
 .../codegen-resources/paginators-1.json       |   12 +
 .../codegen-resources/service-2.json          |  468 ++-
 services/outposts/pom.xml                     |    2 +-
 services/panorama/pom.xml                     |    2 +-
 services/partnercentralselling/pom.xml        |    2 +-
 services/paymentcryptography/pom.xml          |    2 +-
 .../codegen-resources/service-2.json          |  172 +-
 services/paymentcryptographydata/pom.xml      |    2 +-
 services/pcaconnectorad/pom.xml               |    2 +-
 services/pcaconnectorscep/pom.xml             |    2 +-
 services/pcs/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |   19 +-
 services/personalize/pom.xml                  |    2 +-
 services/personalizeevents/pom.xml            |    2 +-
 services/personalizeruntime/pom.xml           |    2 +-
 services/pi/pom.xml                           |    2 +-
 services/pinpoint/pom.xml                     |    2 +-
 services/pinpointemail/pom.xml                |    2 +-
 services/pinpointsmsvoice/pom.xml             |    2 +-
 services/pinpointsmsvoicev2/pom.xml           |    2 +-
 services/pipes/pom.xml                        |    2 +-
 services/polly/pom.xml                        |    2 +-
 services/pom.xml                              |    3 +-
 services/pricing/pom.xml                      |    2 +-
 services/proton/pom.xml                       |    2 +-
 services/qapps/pom.xml                        |    2 +-
 services/qbusiness/pom.xml                    |    2 +-
 services/qconnect/pom.xml                     |    2 +-
 services/qldb/pom.xml                         |    2 +-
 services/qldbsession/pom.xml                  |    2 +-
 services/quicksight/pom.xml                   |    2 +-
 .../codegen-resources/service-2.json          |  845 +++--
 services/ram/pom.xml                          |    2 +-
 services/rbin/pom.xml                         |    2 +-
 services/rds/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |   24 +-
 services/rdsdata/pom.xml                      |    2 +-
 services/redshift/pom.xml                     |    2 +-
 .../codegen-resources/service-2.json          |   20 +-
 services/redshiftdata/pom.xml                 |    2 +-
 services/redshiftserverless/pom.xml           |    2 +-
 services/rekognition/pom.xml                  |    2 +-
 services/repostspace/pom.xml                  |    2 +-
 services/resiliencehub/pom.xml                |    2 +-
 services/resourceexplorer2/pom.xml            |    2 +-
 services/resourcegroups/pom.xml               |    2 +-
 services/resourcegroupstaggingapi/pom.xml     |    2 +-
 services/robomaker/pom.xml                    |    2 +-
 services/rolesanywhere/pom.xml                |    2 +-
 services/route53/pom.xml                      |    2 +-
 services/route53domains/pom.xml               |    2 +-
 services/route53profiles/pom.xml              |    2 +-
 services/route53recoverycluster/pom.xml       |    2 +-
 services/route53recoverycontrolconfig/pom.xml |    2 +-
 services/route53recoveryreadiness/pom.xml     |    2 +-
 services/route53resolver/pom.xml              |    2 +-
 services/rum/pom.xml                          |    2 +-
 services/s3/pom.xml                           |    2 +-
 .../endpoints/S3EndpointResolver.java         |   31 -
 .../endpoints/S3EndpointResolverContext.java  |  171 -
 .../S3EndpointResolverFactoryContext.java     |   73 -
 ...3ObjectLambdaOperationEndpointBuilder.java |   75 -
 .../MultipartDownloaderSubscriber.java        |   28 +-
 .../S3EndpointResolverContextTest.java        |   58 -
 ...ectLambdaOperationEndpointBuilderTest.java |   91 -
 ...aderSubscriberPartCountValidationTest.java |  120 +
 ...3MultipartClientGetObjectWiremockTest.java |   44 +
 .../utils/MultipartDownloadTestUtils.java     |    1 +
 services/s3control/pom.xml                    |    2 +-
 .../codegen-resources/service-2.json          |   95 +-
 services/s3outposts/pom.xml                   |    2 +-
 services/s3tables/pom.xml                     |    2 +-
 services/s3vectors/pom.xml                    |    2 +-
 services/sagemaker/pom.xml                    |    2 +-
 services/sagemakera2iruntime/pom.xml          |    2 +-
 services/sagemakeredge/pom.xml                |    2 +-
 services/sagemakerfeaturestoreruntime/pom.xml |    2 +-
 services/sagemakergeospatial/pom.xml          |    2 +-
 services/sagemakermetrics/pom.xml             |    2 +-
 services/sagemakerruntime/pom.xml             |    2 +-
 services/savingsplans/pom.xml                 |    2 +-
 services/scheduler/pom.xml                    |    2 +-
 services/schemas/pom.xml                      |    2 +-
 services/secretsmanager/pom.xml               |    2 +-
 services/securityhub/pom.xml                  |    2 +-
 services/securityir/pom.xml                   |    2 +-
 services/securitylake/pom.xml                 |    2 +-
 .../serverlessapplicationrepository/pom.xml   |    2 +-
 services/servicecatalog/pom.xml               |    2 +-
 services/servicecatalogappregistry/pom.xml    |    2 +-
 services/servicediscovery/pom.xml             |    2 +-
 services/servicequotas/pom.xml                |    2 +-
 services/ses/pom.xml                          |    2 +-
 services/sesv2/pom.xml                        |    2 +-
 services/sfn/pom.xml                          |    2 +-
 services/shield/pom.xml                       |    2 +-
 services/signer/pom.xml                       |    2 +-
 services/simspaceweaver/pom.xml               |    2 +-
 services/sms/build.properties                 |   25 -
 .../codegen-resources/customization.config    |   14 -
 .../codegen-resources/endpoint-rule-set.json  |  350 --
 .../codegen-resources/endpoint-tests.json     |  639 ----
 .../codegen-resources/examples-1.json         |    5 -
 .../codegen-resources/paginators-1.json       |   28 -
 .../codegen-resources/service-2.json          | 2613 -------------
 .../src/test/resources/cucumber.properties    |   16 -
 .../servermigration/smoketests/sms.feature    |   12 -
 services/snowball/pom.xml                     |    2 +-
 services/snowdevicemanagement/pom.xml         |    2 +-
 services/sns/pom.xml                          |    2 +-
 services/socialmessaging/pom.xml              |    2 +-
 services/sqs/pom.xml                          |    7 +-
 .../internal/batchmanager/BatchingMap.java    |    4 +-
 .../batchmanager/RequestBatchBuffer.java      |   15 +-
 .../batchmanager/RequestBatchManager.java     |    5 +-
 .../codegen-resources/service-2.json          |    6 +-
 .../BatchingEfficiencyUnderLoadTest.java      |  221 ++
 .../batchmanager/RequestBatchBufferTest.java  |   47 +-
 services/ssm/pom.xml                          |    2 +-
 .../codegen-resources/service-2.json          |   18 +-
 services/ssmcontacts/pom.xml                  |    2 +-
 services/ssmguiconnect/pom.xml                |    2 +-
 services/ssmincidents/pom.xml                 |    2 +-
 services/ssmquicksetup/pom.xml                |    2 +-
 services/ssmsap/pom.xml                       |    2 +-
 services/sso/pom.xml                          |    2 +-
 services/ssoadmin/pom.xml                     |    2 +-
 .../codegen-resources/service-2.json          |  127 +-
 services/ssooidc/pom.xml                      |    2 +-
 .../codegen-resources/service-2.json          |   36 +-
 services/storagegateway/pom.xml               |    2 +-
 services/sts/pom.xml                          |    2 +-
 .../sts/AssumeRoleIntegrationTest.java        |   18 -
 services/supplychain/pom.xml                  |    2 +-
 services/support/pom.xml                      |    2 +-
 services/supportapp/pom.xml                   |    2 +-
 services/swf/pom.xml                          |    2 +-
 services/synthetics/pom.xml                   |    2 +-
 services/taxsettings/pom.xml                  |    2 +-
 services/textract/pom.xml                     |    2 +-
 services/timestreaminfluxdb/pom.xml           |    2 +-
 services/timestreamquery/pom.xml              |    2 +-
 services/timestreamwrite/pom.xml              |    2 +-
 services/tnb/pom.xml                          |    2 +-
 services/transcribe/pom.xml                   |    2 +-
 services/transcribestreaming/pom.xml          |    2 +-
 services/transfer/pom.xml                     |    2 +-
 services/translate/pom.xml                    |    2 +-
 services/trustedadvisor/pom.xml               |    2 +-
 services/verifiedpermissions/pom.xml          |    2 +-
 services/voiceid/pom.xml                      |    2 +-
 services/vpclattice/pom.xml                   |    2 +-
 services/waf/pom.xml                          |    2 +-
 services/wafv2/pom.xml                        |    2 +-
 services/wellarchitected/pom.xml              |    2 +-
 services/wisdom/pom.xml                       |    2 +-
 services/workdocs/pom.xml                     |    2 +-
 services/workmail/pom.xml                     |    2 +-
 services/workmailmessageflow/pom.xml          |    2 +-
 services/workspaces/pom.xml                   |    2 +-
 services/workspacesinstances/pom.xml          |    2 +-
 services/workspacesthinclient/pom.xml         |    2 +-
 services/workspacesweb/pom.xml                |    2 +-
 services/xray/pom.xml                         |    2 +-
 test/architecture-tests/pom.xml               |    7 +-
 .../archtests/UtilsLitePackageTest.java       |   43 +
 test/auth-tests/pom.xml                       |    2 +-
 .../pom.xml                                   |    2 +-
 test/bundle-shading-tests/pom.xml             |    2 +-
 test/codegen-generated-classes-test/pom.xml   |    2 +-
 .../amazon/awssdk/services/TraceIdTest.java   |  256 +-
 test/crt-unavailable-tests/pom.xml            |    2 +-
 test/http-client-benchmarks/pom.xml           |    2 +-
 test/http-client-tests/pom.xml                |    2 +-
 test/module-path-tests/pom.xml                |    2 +-
 .../pom.xml                                   |    2 +-
 test/protocol-tests-core/pom.xml              |    2 +-
 test/protocol-tests/pom.xml                   |    2 +-
 test/region-testing/pom.xml                   |    2 +-
 test/ruleset-testing-core/pom.xml             |    2 +-
 test/s3-benchmarks/pom.xml                    |    2 +-
 test/s3-tests/pom.xml                         |    2 +-
 test/sdk-benchmarks/pom.xml                   |    2 +-
 test/sdk-native-image-test/pom.xml            |    2 +-
 test/service-test-utils/pom.xml               |    2 +-
 test/stability-tests/pom.xml                  |    2 +-
 test/test-utils/pom.xml                       |    2 +-
 test/tests-coverage-reporting/pom.xml         |    7 +-
 test/v2-migration-tests/pom.xml               |    9 +-
 .../v2migrationtests/GradleProjectTest.java   |    3 +-
 .../v2migrationtests/MavenNoCompileTest.java  |    3 +-
 .../v2migrationtests/MavenProjectTest.java    |    3 +-
 .../v2migrationtests/MavenTestBase.java       |   11 +-
 .../MavenTransferManagerTest.java             |   56 -
 .../gradle/before/init.gradle                 |    2 +-
 .../src/main/java/foo/bar/S3EnDateTime.java   |    2 +-
 .../v2migrationtests/maven-tm/after/pom.xml   |   55 -
 .../v2migrationtests/maven-tm/before/pom.xml  |   49 -
 .../v2migrationtests/maven/after/pom.xml      |    5 +
 .../src/main/java/foo/bar/Application.java    |    6 +-
 .../maven/after/src/main/java/foo/bar/S3.java |    3 +-
 .../java/foo/bar/S3RequestConstructor.java    |    6 +-
 .../src/main/java/foo/bar/S3Streaming.java    |    7 +-
 .../main/java/foo/bar/TransferManagerS3.java  |   19 +-
 .../main/java/foo/bar/TransferManagerS3.java  |    0
 third-party/pom.xml                           |    2 +-
 third-party/third-party-jackson-core/pom.xml  |    2 +-
 .../pom.xml                                   |    2 +-
 third-party/third-party-slf4j-api/pom.xml     |    2 +-
 {services/sms => utils-lite}/pom.xml          |   72 +-
 .../utilslite/SdkInternalThreadLocal.java     |   82 +
 .../awssdk/utilslite/ThreadStorageTest.java   |   70 +
 utils/pom.xml                                 |    2 +-
 .../utils/async/StoringSubscriberTest.java    |    4 +-
 v2-migration/README.md                        |   27 +-
 v2-migration/pom.xml                          |    8 +-
 .../v2migration/ConstructorToFluent.java      |    2 +
 .../v2migration/HttpSettingsToHttpClient.java |    6 +
 .../awssdk/v2migration/NewClassToBuilder.java |    4 +
 .../v2migration/S3AddImportsAndComments.java  |    2 +-
 .../S3NonStreamingRequestToV2.java            |    2 +
 .../amazon/awssdk/v2migration/S3PojoToV2.java |   95 +
 .../v2migration/S3PutObjectRequestToV2.java   |   16 +-
 .../v2migration/S3StreamingRequestToV2.java   |    6 +
 .../v2migration/S3StreamingResponseToV2.java  |    2 +
 .../awssdk/v2migration/SdkExceptionToV2.java  |   94 +
 .../TransferManagerMethodsToV2.java           |   27 +-
 .../V1BuilderVariationsToV2Builder.java       |    2 +
 .../internal/utils/NamingUtils.java           |   10 +-
 .../internal/utils/S3TransformUtils.java      |    5 +
 .../ChangeMethodInvocationReturnType.java     |  133 -
 .../rewrite/aws-sdk-java-v1-to-v2-with-tm.yml |   58 -
 .../rewrite/aws-sdk-java-v1-to-v2.yml         |    9 +-
 .../rewrite/change-exception-types.yml        |   22 -
 .../change-s3-event-notification-methods.yml  |    2 +-
 .../META-INF/rewrite/change-s3-types.yml      |   52 +-
 ...change-transfer-manager-simple-methods.yml |   11 +-
 .../rewrite/change-transfer-manager-types.yml |    4 +-
 .../s3-methods-constructor-to-fluent.yml      |   20 +-
 .../v2migration/ChangeConfigTypesTest.java    |    4 +-
 .../v2migration/ChangeExceptionTypesTest.java |    7 +-
 670 files changed, 10832 insertions(+), 9299 deletions(-)
 rename .changes/{ => 2.33.x}/2.33.0.json (100%)
 rename .changes/{ => 2.33.x}/2.33.1.json (100%)
 create mode 100644 .changes/2.33.x/2.33.10.json
 create mode 100644 .changes/2.33.x/2.33.11.json
 create mode 100644 .changes/2.33.x/2.33.12.json
 create mode 100644 .changes/2.33.x/2.33.13.json
 rename .changes/{ => 2.33.x}/2.33.2.json (100%)
 rename .changes/{ => 2.33.x}/2.33.3.json (100%)
 rename .changes/{ => 2.33.x}/2.33.4.json (100%)
 rename .changes/{ => 2.33.x}/2.33.5.json (100%)
 rename .changes/{ => 2.33.x}/2.33.6.json (100%)
 rename .changes/{ => 2.33.x}/2.33.7.json (100%)
 create mode 100644 .changes/2.33.x/2.33.8.json
 create mode 100644 .changes/2.33.x/2.33.9.json
 create mode 100644 .changes/2.34.0.json
 create mode 100644 .changes/2.34.1.json
 create mode 100644 .changes/2.34.2.json
 create mode 100644 .changes/2.34.3.json
 create mode 100644 .changes/2.34.4.json
 create mode 100644 .changes/2.34.5.json
 create mode 100644 buildspecs/release-to-maven-central.yml
 create mode 100644 buildspecs/resources/maven-central-release-settings.xml
 create mode 100644 changelogs/2.33.x-CHANGELOG.md
 create mode 100644 services/bedrockagentruntime/src/main/resources/codegen-resources/waiters-2.json
 create mode 100644 services/licensemanagerusersubscriptions/src/main/resources/codegen-resources/waiters-2.json
 delete mode 100644 services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolver.java
 delete mode 100644 services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContext.java
 delete mode 100644 services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverFactoryContext.java
 delete mode 100644 services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilder.java
 delete mode 100644 services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContextTest.java
 delete mode 100644 services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilderTest.java
 create mode 100644 services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriberPartCountValidationTest.java
 delete mode 100644 services/sms/build.properties
 delete mode 100644 services/sms/src/main/resources/codegen-resources/customization.config
 delete mode 100644 services/sms/src/main/resources/codegen-resources/endpoint-rule-set.json
 delete mode 100644 services/sms/src/main/resources/codegen-resources/endpoint-tests.json
 delete mode 100644 services/sms/src/main/resources/codegen-resources/examples-1.json
 delete mode 100644 services/sms/src/main/resources/codegen-resources/paginators-1.json
 delete mode 100644 services/sms/src/main/resources/codegen-resources/service-2.json
 delete mode 100644 services/sms/src/test/resources/cucumber.properties
 delete mode 100644 services/sms/src/test/resources/software/amazon/awssdk/services/servermigration/smoketests/sms.feature
 create mode 100644 services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/BatchingEfficiencyUnderLoadTest.java
 create mode 100644 test/architecture-tests/src/test/java/software/amazon/awssdk/archtests/UtilsLitePackageTest.java
 delete mode 100644 test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTransferManagerTest.java
 delete mode 100644 test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/after/pom.xml
 delete mode 100644 test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/before/pom.xml
 rename test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/{maven-tm => maven}/after/src/main/java/foo/bar/TransferManagerS3.java (98%)
 rename test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/{maven-tm => maven}/before/src/main/java/foo/bar/TransferManagerS3.java (100%)
 rename {services/sms => utils-lite}/pom.xml (55%)
 create mode 100644 utils-lite/src/main/java/software/amazon/awssdk/utilslite/SdkInternalThreadLocal.java
 create mode 100644 utils-lite/src/test/java/software/amazon/awssdk/utilslite/ThreadStorageTest.java
 create mode 100644 v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3PojoToV2.java
 create mode 100644 v2-migration/src/main/java/software/amazon/awssdk/v2migration/SdkExceptionToV2.java
 delete mode 100644 v2-migration/src/main/java/software/amazon/awssdk/v2migration/openrewrite/ChangeMethodInvocationReturnType.java
 delete mode 100644 v2-migration/src/main/resources/META-INF/rewrite/aws-sdk-java-v1-to-v2-with-tm.yml

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 21353af60c47..43125ea2f146 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1075,6 +1075,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "MBoegers",
+      "name": "Merlin Bögershausen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7557397?v=4",
+      "profile": "https://mboegie.dev",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/.brazil.json b/.brazil.json
index 7d240cb9bf5c..ed43716ef601 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -34,6 +34,7 @@
         "sdk-core": { "packageName": "AwsJavaSdk-Core" },
         "url-connection-client": { "packageName": "AwsJavaSdk-HttpClient-UrlConnectionClient" },
         "utils": { "packageName": "AwsJavaSdk-Core-Utils" },
+        "utils-lite": { "packageName": "AwsJavaSdk-Core-UtilsLite" },
         "imds": { "packageName": "AwsJavaSdk-Imds" },
         "crt-core": { "packageName": "AwsJavaSdk-Core-CrtCore" },
         "checksums-spi": { "packageName": "AwsJavaSdk-Core-ChecksumsSpi" },
diff --git a/.changes/2.33.0.json b/.changes/2.33.x/2.33.0.json
similarity index 100%
rename from .changes/2.33.0.json
rename to .changes/2.33.x/2.33.0.json
diff --git a/.changes/2.33.1.json b/.changes/2.33.x/2.33.1.json
similarity index 100%
rename from .changes/2.33.1.json
rename to .changes/2.33.x/2.33.1.json
diff --git a/.changes/2.33.x/2.33.10.json b/.changes/2.33.x/2.33.10.json
new file mode 100644
index 000000000000..cd6ace609a59
--- /dev/null
+++ b/.changes/2.33.x/2.33.10.json
@@ -0,0 +1,42 @@
+{
+    "version": "2.33.10",
+    "date": "2025-09-15",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "contributor": "",
+            "description": "Added additional validations for multipart download operations in the Java multipart S3 client"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "contributor": "",
+            "description": "Added endpoint support for eusc-de-east-1 region."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Health Imaging",
+            "contributor": "",
+            "description": "Added support for OpenID Connect (OIDC) custom authorizer"
+        },
+        {
+            "type": "feature",
+            "category": "AWS S3 Control",
+            "contributor": "",
+            "description": "Introduce three new encryption filters: EncryptionType (SSE-S3, SSE-KMS, DSSE-KMS, SSE-C, NOT-SSE), KmsKeyArn (for SSE-KMS and DSSE-KMS), and BucketKeyEnabled (for SSE-KMS)."
+        },
+        {
+            "type": "feature",
+            "category": "CloudWatch Observability Admin Service",
+            "contributor": "",
+            "description": "CloudWatch Observability Admin adds the ability to enable telemetry centralization in customers' Organizations. The release introduces new APIs to manage centralization rules, which define settings to replicate telemetry data to a central destination in the customers' Organization."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.33.x/2.33.11.json b/.changes/2.33.x/2.33.11.json
new file mode 100644
index 000000000000..33f0bebe890d
--- /dev/null
+++ b/.changes/2.33.x/2.33.11.json
@@ -0,0 +1,42 @@
+{
+    "version": "2.33.11",
+    "date": "2025-09-16",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Preserve the initial content-length when calling mark in SdkLengthAwareInputStream."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Budgets",
+            "contributor": "",
+            "description": "Add support for custom time periods in budget configuration"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch Logs",
+            "contributor": "",
+            "description": "Cloudwatch Logs added support for 2 new API parameters in metric and subscription filter APIs to filter log events based on system field values and emit system field values as dimensions and send them to customer destination as additional metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Interactive Video Service RealTime",
+            "contributor": "",
+            "description": "IVS now offers customers the ability to control the positioning of participants in both grid and PiP layouts based on custom attribute values in participant tokens."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon OpenSearch Ingestion",
+            "contributor": "",
+            "description": "Adds support for cross-account ingestion for push-based sources. This includes resource policies for sharing pipelines across accounts and features for managing pipeline endpoints which enable accessing pipelines across different VPCs, including VPCs in other accounts."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.33.x/2.33.12.json b/.changes/2.33.x/2.33.12.json
new file mode 100644
index 000000000000..48a91a63cc1a
--- /dev/null
+++ b/.changes/2.33.x/2.33.12.json
@@ -0,0 +1,24 @@
+{
+    "version": "2.33.12",
+    "date": "2025-09-17",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Network Firewall",
+            "contributor": "",
+            "description": "Network Firewall now prevents TLS handshakes with the target server until after the Server Name Indication (SNI) has been seen and verified. The monitoring dashboard now provides deeper insights into PrivateLink endpoint candidates and offers filters based on IP addresses and protocol."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Parallel Computing Service",
+            "contributor": "",
+            "description": "Add support for Amazon EC2 Capacity Blocks for ML"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "Add mac-m4.metal and mac-m4pro.metal instance types."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.33.x/2.33.13.json b/.changes/2.33.x/2.33.13.json
new file mode 100644
index 000000000000..fa5f45ea4885
--- /dev/null
+++ b/.changes/2.33.x/2.33.13.json
@@ -0,0 +1,30 @@
+{
+    "version": "2.33.13",
+    "date": "2025-09-18",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Budgets",
+            "contributor": "",
+            "description": "Added BillingViewHealthStatus Exception which is thrown when a Budget is created or updated with a Billing View that is not in the HEALTHY status"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Bedrock",
+            "contributor": "",
+            "description": "Release includes an increase to the maximum policy build document size, an update to DeleteAutomatedReasoningPolicyBuildWorkflow to add ResourceInUseException, and corrections to UpdateAutomatedReasoningPolicyTestCaseRequest."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Chime SDK Messaging",
+            "contributor": "",
+            "description": "Amazon Chime SDK Messaging GetMessagingSessionEndpoint API now returns dual-stack WebSocket endpoints supporting IPv4/IPv6."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "Allowed AMIs adds support for four new parameters - marketplaceProductCodes, deprecationTimeCondition, creationDateCondition and imageNames"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.33.2.json b/.changes/2.33.x/2.33.2.json
similarity index 100%
rename from .changes/2.33.2.json
rename to .changes/2.33.x/2.33.2.json
diff --git a/.changes/2.33.3.json b/.changes/2.33.x/2.33.3.json
similarity index 100%
rename from .changes/2.33.3.json
rename to .changes/2.33.x/2.33.3.json
diff --git a/.changes/2.33.4.json b/.changes/2.33.x/2.33.4.json
similarity index 100%
rename from .changes/2.33.4.json
rename to .changes/2.33.x/2.33.4.json
diff --git a/.changes/2.33.5.json b/.changes/2.33.x/2.33.5.json
similarity index 100%
rename from .changes/2.33.5.json
rename to .changes/2.33.x/2.33.5.json
diff --git a/.changes/2.33.6.json b/.changes/2.33.x/2.33.6.json
similarity index 100%
rename from .changes/2.33.6.json
rename to .changes/2.33.x/2.33.6.json
diff --git a/.changes/2.33.7.json b/.changes/2.33.x/2.33.7.json
similarity index 100%
rename from .changes/2.33.7.json
rename to .changes/2.33.x/2.33.7.json
diff --git a/.changes/2.33.x/2.33.8.json b/.changes/2.33.x/2.33.8.json
new file mode 100644
index 000000000000..65419bc2b20f
--- /dev/null
+++ b/.changes/2.33.x/2.33.8.json
@@ -0,0 +1,66 @@
+{
+    "version": "2.33.8",
+    "date": "2025-09-11",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaLive",
+            "contributor": "",
+            "description": "AWS Elemental MediaLive adds a new feature in MediaPackage output group that enables MediaPackage V2 users to control HLS-related parameters directly in MediaLive. These parameter settings are then reflected in MediaPackage outputs, providing more streamlined control over HLS configurations."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DataZone",
+            "contributor": "",
+            "description": "adding IAM principal id to IAM user profile details"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Service",
+            "contributor": "",
+            "description": "This release supports hook details for Amazon ECS lifecycle hooks."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EMR Containers",
+            "contributor": "",
+            "description": "Added nodeLabel support in container provider to aid hardware isolation support for virtual cluster and security configuration."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic VMware Service",
+            "contributor": "",
+            "description": "CreateEnvironment API now supports parameters (isHcxPublic & hcxNetworkAclId) for HCX migration via public internet, adding flexibility for migration scenarios. New APIs have been added for associating (AssociateEipToVlan) & disassociating (DisassociateEipFromVlan) Elastic IP (EIP) addresses."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon GuardDuty",
+            "contributor": "",
+            "description": "Updated Java SDK implementation of entity set status in GuardDuty API."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Prometheus Service",
+            "contributor": "",
+            "description": "Add Vended Logs APIs for Amazon Prometheus Managed Collector"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon QuickSight",
+            "contributor": "",
+            "description": "This release adds support for Account level custom permissions, additional Dashboard Options, and Null support for Q&A."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "contributor": "",
+            "description": "Adds support for end-to-end IAM authentication in RDS Proxy for MySQL, MariaDB, and PostgreSQL engines."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.33.x/2.33.9.json b/.changes/2.33.x/2.33.9.json
new file mode 100644
index 000000000000..ea45e26ab4e4
--- /dev/null
+++ b/.changes/2.33.x/2.33.9.json
@@ -0,0 +1,18 @@
+{
+    "version": "2.33.9",
+    "date": "2025-09-12",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Update Jackson and Jackson jr to 2.19.0"
+        },
+        {
+            "type": "feature",
+            "category": "Payment Cryptography Control Plane",
+            "contributor": "",
+            "description": "Add support for certificates to be signed by 3rd party certificate authorities. New API GetCertificateSigningRequest API and support for providing certificates at run-time for tr-34 import/export"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.34.0.json b/.changes/2.34.0.json
new file mode 100644
index 000000000000..64e49ef5b198
--- /dev/null
+++ b/.changes/2.34.0.json
@@ -0,0 +1,66 @@
+{
+    "version": "2.34.0",
+    "date": "2025-09-19",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Config",
+            "contributor": "",
+            "description": "Add UNKNOWN state to RemediationExecutionState and add IN_PROGRESS/EXITED/UNKNOWN states to RemediationExecutionStepState."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaLive",
+            "contributor": "",
+            "description": "Add MinBitrate for QVBR mode under H264/H265/AV1 output codec. Add GopBReference, GopNumBFrames, SubGopLength fields under H265 output codec."
+        },
+        {
+            "type": "feature",
+            "category": "AWS License Manager User Subscriptions",
+            "contributor": "",
+            "description": "Added support for cross-account Active Directories."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Add a utils-lite package that wraps threadlocal meant for internal shared usage across multiple applications across multiple applications"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2 Migration Tool",
+            "contributor": "",
+            "description": "General availability release of the AWS SDK for Java v2 migration tool that automatically migrates applications from the AWS SDK for Java v1 to the AWS SDK for Java v2."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Bedrock Agent Core Control Plane Fronting Layer",
+            "contributor": "",
+            "description": "Add tagging and VPC support to AgentCore Runtime, Code Interpreter, and Browser resources. Add support for configuring request headers in Runtime. Fix AgentCore Runtime shape names."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Connect Service",
+            "contributor": "",
+            "description": "This release adds a persistent connection field to UserPhoneConfig that maintains agent's softphone media connection for faster call connections."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Kendra Intelligent Ranking",
+            "contributor": "",
+            "description": "Model whitespace change - no client difference"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Queue Service",
+            "contributor": "",
+            "description": "Update invalid character handling documentation for SQS SendMessage API"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.34.1.json b/.changes/2.34.1.json
new file mode 100644
index 000000000000..98e467dbb600
--- /dev/null
+++ b/.changes/2.34.1.json
@@ -0,0 +1,30 @@
+{
+    "version": "2.34.1",
+    "date": "2025-09-22",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Batch",
+            "contributor": "",
+            "description": "Starting in JAN 2026, AWS Batch will change the default AMI for new Amazon ECS compute environments from Amazon Linux 2 to Amazon Linux 2023. We recommend migrating AWS Batch Amazon ECS compute environments to Amazon Linux 2023 to maintain optimal performance and security."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "contributor": "",
+            "description": "Adds support for RepairConfig overrides and configurations in EKS Managed Node Groups."
+        },
+        {
+            "type": "feature",
+            "category": "EC2 Image Builder",
+            "contributor": "",
+            "description": "Version ARNs are no longer required for the EC2 Image Builder list-image-build-version, list-component-build-version, and list-workflow-build-version APIs. Calling these APIs without the ARN returns all build versions for the given resource type in the requesting account."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.34.2.json b/.changes/2.34.2.json
new file mode 100644
index 000000000000..856e6c943b1f
--- /dev/null
+++ b/.changes/2.34.2.json
@@ -0,0 +1,48 @@
+{
+    "version": "2.34.2",
+    "date": "2025-09-23",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Clean Rooms Service",
+            "contributor": "",
+            "description": "Added support for running incremental ID mapping for rule-based workflows."
+        },
+        {
+            "type": "feature",
+            "category": "AWS EntityResolution",
+            "contributor": "",
+            "description": "Support incremental id mapping workflow for AWS Entity Resolution"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SSO OIDC",
+            "contributor": "",
+            "description": "This release includes exception definition and documentation updates."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Single Sign-On Admin",
+            "contributor": "",
+            "description": "Add support for encryption at rest with Customer Managed KMS Key in AWS IAM Identity Center"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "Add Amazon EC2 R8gn instance types"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "contributor": "",
+            "description": "Added Dualstack support to GetDeployablePatchSnapshotForInstance"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.34.3.json b/.changes/2.34.3.json
new file mode 100644
index 000000000000..341a3b087f78
--- /dev/null
+++ b/.changes/2.34.3.json
@@ -0,0 +1,42 @@
+{
+    "version": "2.34.3",
+    "date": "2025-09-24",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2 Migration Tool",
+            "contributor": "MBoegers",
+            "description": "Fix OpenRewrite recipe MethodMatcher"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Key Management Service",
+            "contributor": "",
+            "description": "Documentation only updates for KMS."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon AppStream",
+            "contributor": "",
+            "description": "G6f instance support for AppStream 2.0"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch",
+            "contributor": "",
+            "description": "Fix default dualstack FIPS endpoints in AWS GovCloud(US) regions"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Accelerator (DAX)",
+            "contributor": "",
+            "description": "This release adds support for IPv6-only, DUAL_STACK DAX instances"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Neptune",
+            "contributor": "",
+            "description": "Doc-only update to address customer use."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.34.4.json b/.changes/2.34.4.json
new file mode 100644
index 000000000000..74ecac750ff9
--- /dev/null
+++ b/.changes/2.34.4.json
@@ -0,0 +1,30 @@
+{
+    "version": "2.34.4",
+    "date": "2025-09-25",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Glue",
+            "contributor": "",
+            "description": "Update GetConnection(s) API to return KmsKeyArn & Add 63 missing connection types"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Network Firewall",
+            "contributor": "",
+            "description": "Network Firewall now introduces Reject and Alert action support for stateful domain list rule groups, providing customers with more granular control over their network traffic."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lightsail",
+            "contributor": "",
+            "description": "Attribute HTTP binding update for Get/Delete operations"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.34.5.json b/.changes/2.34.5.json
new file mode 100644
index 000000000000..19aabeed1ffa
--- /dev/null
+++ b/.changes/2.34.5.json
@@ -0,0 +1,72 @@
+{
+    "version": "2.34.5",
+    "date": "2025-09-26",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon DynamoDB Enhanced Client",
+            "contributor": "",
+            "description": "Optimizations for DDB EnhancedDocument.toJson()"
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon Simple Queue Service",
+            "contributor": "thornhillcody",
+            "description": "Fix SqsAsyncBatchManager excessive batch flushing under heavy load. Fixes [#6374](https://github.com/aws/aws-sdk-java-v2/issues/6374)."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Billing",
+            "contributor": "",
+            "description": "Add ability to combine custom billing views to create new consolidated views."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "contributor": "",
+            "description": "Support for payer account dimension and billing view health status."
+        },
+        {
+            "type": "feature",
+            "category": "Agents for Amazon Bedrock Runtime",
+            "contributor": "",
+            "description": "This release enhances the information provided through Flow Traces. New information includes source/next node tracking, execution chains for complex nodes, dependency action (operation) details, and dependency traces."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Connect Service",
+            "contributor": "",
+            "description": "Adds supports for manual contact picking (WorkList) operations on Routing Profiles, Agent Management and SearchContacts APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Streams",
+            "contributor": "",
+            "description": "Added support for IPv6 compatible endpoints for DynamoDB Streams."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "This release includes documentation updates for Amazon EBS General Purpose SSD (gp3) volumes with larger size and higher IOPS and throughput."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Redshift",
+            "contributor": "",
+            "description": "Support tagging and tag propagation to IAM Identity Center for Redshift Idc Applications"
+        },
+        {
+            "type": "feature",
+            "category": "Data Automation for Amazon Bedrock",
+            "contributor": "",
+            "description": "Added support for configurable Speaker Labeling and Channel Labeling features for Audio modality."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.github/workflows/api-surface-area-review-verification.yml b/.github/workflows/api-surface-area-review-verification.yml
index 0d3bf63925e1..7489fee42d7c 100644
--- a/.github/workflows/api-surface-area-review-verification.yml
+++ b/.github/workflows/api-surface-area-review-verification.yml
@@ -21,7 +21,7 @@ jobs:
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-api-surface-area-change') }}
         run: |
           git fetch origin ${{ github.base_ref }} --depth 1
-          FILES=$( git diff remotes/origin/${{ github.base_ref }} --name-only | grep "\.java$" | grep -v -E "(^|/)(internal|test|codegen|v2-migration|it)/"  || true)
+          FILES=$( git diff remotes/origin/${{ github.base_ref }} --name-only | grep "\.java$" | grep -v -E "(^|/)(internal|test|codegen|codegen-lite|v2-migration|it|release-scripts|scripts)/"  || true)
           if [ -n "$FILES" ]; then
             echo "::error::Changes around protected/public APIs found:"
             echo "$FILES" | while read file; do
diff --git a/.github/workflows/new-module-verification.yml b/.github/workflows/new-module-verification.yml
index 26465313c9ad..74f13b3fd90f 100644
--- a/.github/workflows/new-module-verification.yml
+++ b/.github/workflows/new-module-verification.yml
@@ -129,7 +129,7 @@ jobs:
               fi
               
               # 2. Check if added to tests-coverage-reporting pom.xml
-              if ! grep -q "<dependency>.*$MODULE_NAME</dependency>" test/tests-coverage-reporting/pom.xml 2>/dev/null; then
+              if ! grep -q "<artifactId>$MODULE_NAME</artifactId>" test/tests-coverage-reporting/pom.xml 2>/dev/null; then
                 echo "::error::Module $MODULE_NAME is not added to tests-coverage-reporting pom.xml"
                 HAS_ERRORS=1
               else
@@ -137,7 +137,7 @@ jobs:
               fi
               
               # 3. Check if added to aws-sdk-java pom.xml
-              if ! grep -q "<dependency>.*$MODULE_NAME</dependency>" aws-sdk-java/pom.xml 2>/dev/null; then
+              if ! grep -q "<artifactId>$MODULE_NAME</artifactId>" aws-sdk-java/pom.xml 2>/dev/null; then
                 echo "::error::Module $MODULE_NAME is not added to aws-sdk-java pom.xml"
                 HAS_ERRORS=1
               else
@@ -145,7 +145,7 @@ jobs:
               fi
               
               # 4. Check if added to architecture-tests pom.xml
-              if ! grep -q "<dependency>.*$MODULE_NAME</dependency>" test/architecture-tests/pom.xml 2>/dev/null; then
+              if ! grep -q "<artifactId>$MODULE_NAME</artifactId>" test/architecture-tests/pom.xml 2>/dev/null; then
                 echo "::error::Module $MODULE_NAME is not added to architecture-tests pom.xml"
                 HAS_ERRORS=1
               else
@@ -176,6 +176,31 @@ jobs:
               else
                 echo "✅ Package name mapping is added in .brazil.json"
               fi
+              
+              # 8. Maven Central validation - Check for required tags
+              echo "Verifying Maven Central requirements..."
+              
+              if ! grep -q "<name>" "$POM_FILE" 2>/dev/null; then
+                echo "::error::Maven Central validation: <name> tag is missing in $POM_FILE"
+                HAS_ERRORS=1
+              else
+                echo "✅ Maven Central validation: <name> tag is present"
+              fi
+              
+              if ! grep -q "<description>" "$POM_FILE" 2>/dev/null; then
+                echo "::error::Maven Central validation: <description> tag is missing in $POM_FILE"
+                HAS_ERRORS=1
+              else
+                echo "✅ Maven Central validation: <description> tag is present"
+              fi
+              
+              if ! grep -q "<url>" "$POM_FILE" 2>/dev/null; then
+                echo "::error::Maven Central validation: <url> tag is missing in $POM_FILE"
+                HAS_ERRORS=1
+              else
+                echo "✅ Maven Central validation: <url> tag is present"
+              fi
+          
               echo "::endgroup::"
             fi
           done
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57c531d7a0a8..3ada4ee02745 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,215 +1,182 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
-# __2.33.7__ __2025-09-10__
-## __AWS SDK for Java v2__
+# __2.34.5__ __2025-09-26__
+## __AWS Billing__
   - ### Features
-    - Updated endpoint and partition metadata.
-
-  - ### Bugfixes
-    - Ensure that file modification exceptions in AsyncRequestBody#fromFile are propagated correctly.
-    - Revert recent AutoGeneratedTimestampRecordExtension change released in `2.33.4` that may break users with manually configured table schema. See [#6410](https://github.com/aws/aws-sdk-java-v2/issues/6410)
+    - Add ability to combine custom billing views to create new consolidated views.
 
-## __Network Flow Monitor__
+## __AWS Cost Explorer Service__
   - ### Features
-    - Added new enum value (AWS::Region) for type field under MonitorLocalResource and MonitorRemoteResource. Workload Insights and Monitor top contributors queries now support a new DestinationCategory (INTER_REGION).
+    - Support for payer account dimension and billing view health status.
 
-## __Payment Cryptography Control Plane__
+## __AWS SDK for Java v2__
   - ### Features
-    - AWS Payment Cryptography Service now supports Multi-Region key replication. Customers can choose to automatically distribute keys across AWS Regions.
+    - Updated endpoint and partition metadata.
 
-# __2.33.6__ __2025-09-09__
-## __AWS Elemental MediaPackage v2__
+## __Agents for Amazon Bedrock Runtime__
   - ### Features
-    - Added CUE tag SCTE output to MediaPackageV2 HLS and LL-HLS manifests.
+    - This release enhances the information provided through Flow Traces. New information includes source/next node tracking, execution chains for complex nodes, dependency action (operation) details, and dependency traces.
 
-## __AWS Organizations__
+## __Amazon Connect Service__
   - ### Features
-    - Documentation updates for AWS Organizations APIs.
+    - Adds supports for manual contact picking (WorkList) operations on Routing Profiles, Agent Management and SearchContacts APIs.
 
-## __AWS SDK for Java v2__
-  - ### Features
-    - Updated endpoint and partition metadata.
+## __Amazon DynamoDB Enhanced Client__
+  - ### Bugfixes
+    - Optimizations for DDB EnhancedDocument.toJson()
 
-## __Amazon CloudWatch__
+## __Amazon DynamoDB Streams__
   - ### Features
-    - Added a new API - DescribeAlarmContributors API, to retrieve alarm contributors in ALARM state. Added support in DescribeAlarmHistory API to query alarm contributor history
+    - Added support for IPv6 compatible endpoints for DynamoDB Streams.
 
-## __Amazon Connect Service__
+## __Amazon Elastic Compute Cloud__
   - ### Features
-    - SDK release for user defined predefined attributes.
+    - This release includes documentation updates for Amazon EBS General Purpose SSD (gp3) volumes with larger size and higher IOPS and throughput.
 
-## __Amazon DataZone__
+## __Amazon Redshift__
   - ### Features
-    - Adds support for custom blueprints
+    - Support tagging and tag propagation to IAM Identity Center for Redshift Idc Applications
+
+## __Amazon Simple Queue Service__
+  - ### Bugfixes
+    - Fix SqsAsyncBatchManager excessive batch flushing under heavy load. Fixes [#6374](https://github.com/aws/aws-sdk-java-v2/issues/6374).
+        - Contributed by: [@thornhillcody](https://github.com/thornhillcody)
 
-## __Amazon SageMaker Service__
+## __Data Automation for Amazon Bedrock__
   - ### Features
-    - Released IPv6 support with dual-stack domain options on SageMaker Studio and introduced support for p6-b200.48xlarge instance type on SageMaker Studio for JupyterLab and CodeEditor applications.
+    - Added support for configurable Speaker Labeling and Channel Labeling features for Audio modality.
 
-## __Auto Scaling__
+## __Contributors__
+Special thanks to the following contributors to this release: 
+
+[@thornhillcody](https://github.com/thornhillcody)
+# __2.34.4__ __2025-09-25__
+## __AWS Glue__
   - ### Features
-    - Added WaitForTransitioningInstances parameter to the CancelInstanceRefresh API, allowing the caller to cancel an instance refresh without waiting for on-going launches and terminations.
+    - Update GetConnection(s) API to return KmsKeyArn & Add 63 missing connection types
 
-# __2.33.5__ __2025-09-08__
-## __AWS IoT SiteWise__
+## __AWS Network Firewall__
   - ### Features
-    - Add ComputationModelVersion support in IoT SiteWise APIs
+    - Network Firewall now introduces Reject and Alert action support for stateful domain list rule groups, providing customers with more granular control over their network traffic.
 
 ## __AWS SDK for Java v2__
   - ### Features
     - Updated endpoint and partition metadata.
 
-  - ### Bugfixes
-    - X-Forwarded-For headers will no longer be signed during SigV4 authentication
-        - Contributed by: [@brandondahler](https://github.com/brandondahler)
-
-## __AWS SecurityHub__
-  - ### Features
-    - This release adds the RESOURCE_NOT_FOUND error code as a possible value in responses to the following operations: BatchGetStandardsControlAssociations, BatchUpdateStandardsControlAssociations, and BatchGetSecurityControls.
-
-## __Amazon Simple Storage Service__
+## __Amazon Lightsail__
   - ### Features
-    - This release includes backward compatibility work on the "Expires" parameter.
-
-## __Contributors__
-Special thanks to the following contributors to this release: 
+    - Attribute HTTP binding update for Get/Delete operations
 
-[@brandondahler](https://github.com/brandondahler)
-# __2.33.4__ __2025-09-05__
-## __AWS Parallel Computing Service__
+# __2.34.3__ __2025-09-24__
+## __AWS Key Management Service__
   - ### Features
-    - Documentation-only update to add AccountingStorageEnforce to SlurmCustomSetting.
+    - Documentation only updates for KMS.
 
-## __AWS SDK For Java v2__
+## __AWS SDK for Java v2 Migration Tool__
   - ### Bugfixes
-    - Set default value for credentialProvider archetype parameter.
+    - Fix OpenRewrite recipe MethodMatcher
+        - Contributed by: [@MBoegers](https://github.com/MBoegers)
 
-## __AWS SDK for Java v2__
+## __Amazon AppStream__
   - ### Features
-    - Update Netty to 4.1.126
-        - Contributed by: [@mrdziuban](https://github.com/mrdziuban)
+    - G6f instance support for AppStream 2.0
 
-## __Amazon DynamoDB Enhanced Client__
+## __Amazon CloudWatch__
   - ### Features
-    - Added support for @DynamoDbAutoGeneratedTimestampAttribute and @DynamoDbUpdateBehavior on attributes within nested objects. The @DynamoDbUpdateBehavior annotation will only take effect for nested attributes when using IgnoreNullsMode.SCALAR_ONLY.
+    - Fix default dualstack FIPS endpoints in AWS GovCloud(US) regions
 
-## __Amazon EC2 Container Service__
+## __Amazon DynamoDB Accelerator (DAX)__
   - ### Features
-    - This is a documentation only release that adds additional information for Amazon ECS Availability Zone rebalancing.
+    - This release adds support for IPv6-only, DUAL_STACK DAX instances
 
-## __Amazon SageMaker Service__
+## __Amazon Neptune__
   - ### Features
-    - Release IPv6 support with dualstack in SageMaker Notebooks, Tiered Storage Checkpointing Support in SageMaker HyperPod and P5.4xlarge instance type for SageMaker Hosting.
+    - Doc-only update to address customer use.
 
 ## __Contributors__
 Special thanks to the following contributors to this release: 
 
-[@mrdziuban](https://github.com/mrdziuban)
-# __2.33.3__ __2025-09-04__
+[@MBoegers](https://github.com/MBoegers)
+# __2.34.2__ __2025-09-23__
 ## __AWS Clean Rooms Service__
   - ### Features
-    - Add support for configurable compute sizes for PySpark jobs.
+    - Added support for running incremental ID mapping for rule-based workflows.
 
-## __AWS CloudFormation__
+## __AWS EntityResolution__
   - ### Features
-    - ListHookResults API now supports retrieving invocation results for all CloudFormation Hooks (previously limited to create change set and Cloud Control operations) with new optional parameters for filtering by Hook status and ARN.
+    - Support incremental id mapping workflow for AWS Entity Resolution
 
 ## __AWS SDK for Java v2__
   - ### Features
     - Updated endpoint and partition metadata.
 
-## __Amazon Elastic Compute Cloud__
-  - ### Features
-    - Add m8i, m8i-flex and i8ge instance types.
-
-## __Amazon Relational Database Service__
+## __AWS SSO OIDC__
   - ### Features
-    - Added new EndpointNetworkType and TargetConnectionNetworkType fields in Proxy APIs to support IPv6
+    - This release includes exception definition and documentation updates.
 
-## __Amazon Verified Permissions__
+## __AWS Single Sign-On Admin__
   - ### Features
-    - Amazon Verified Permissions / Features : Adds support for datetime and duration attribute values.
+    - Add support for encryption at rest with Customer Managed KMS Key in AWS IAM Identity Center
 
-## __OpenSearch Service Serverless__
+## __Amazon Elastic Compute Cloud__
   - ### Features
-    - Add support for Federal Information Processing Standards (FIPS) and Federal Risk and Authorization Management Program (FedRAMP) compliance
+    - Add Amazon EC2 R8gn instance types
 
-# __2.33.2__ __2025-09-03__
-## __AWS Clean Rooms ML__
+## __Amazon Simple Systems Manager (SSM)__
   - ### Features
-    - AWS Clean Rooms ML adds log sanitization for privacy-enhanced error summaries, supports new instance types for custom models providing better performance and lower costs, and deprecates P3-series instances.
+    - Added Dualstack support to GetDeployablePatchSnapshotForInstance
 
-## __AWS Clean Rooms Service__
+# __2.34.1__ __2025-09-22__
+## __AWS Batch__
   - ### Features
-    - Added support for adding new data provider members to an existing collaboration.
+    - Starting in JAN 2026, AWS Batch will change the default AMI for new Amazon ECS compute environments from Amazon Linux 2 to Amazon Linux 2023. We recommend migrating AWS Batch Amazon ECS compute environments to Amazon Linux 2023 to maintain optimal performance and security.
 
-## __Amazon CloudFront__
+## __AWS SDK for Java v2__
   - ### Features
-    - Adding an optional field IpAddressType in CustomOriginConfig
+    - Updated endpoint and partition metadata.
 
-## __Amazon Relational Database Service__
+## __Amazon Elastic Kubernetes Service__
   - ### Features
-    - This release adds support for MasterUserAuthenticationType parameter on CreateDBInstance, ModifyDBInstance, CreateDBCluster, and ModifyDBCluster operations.
+    - Adds support for RepairConfig overrides and configurations in EKS Managed Node Groups.
 
-## __Amazon Route 53__
+## __EC2 Image Builder__
   - ### Features
-    - Amazon Route 53 now supports the Asia Pacific (New Zealand) Region (ap-southeast-6) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region.
+    - Version ARNs are no longer required for the EC2 Image Builder list-image-build-version, list-component-build-version, and list-workflow-build-version APIs. Calling these APIs without the ARN returns all build versions for the given resource type in the requesting account.
 
-## __Amazon Route 53 Domains__
+# __2.34.0__ __2025-09-19__
+## __AWS Config__
   - ### Features
-    - Added new ExtraParams AU_ELIGIBILITY_TYPE, AU_POLICY_REASON, and AU_REGISTRANT_NAME
+    - Add UNKNOWN state to RemediationExecutionState and add IN_PROGRESS/EXITED/UNKNOWN states to RemediationExecutionStepState.
 
-## __Amazon Transcribe Streaming Service__
+## __AWS Elemental MediaLive__
   - ### Features
-    - This release adds support for automatic language identification in AWS Transcribe Call Analytics
+    - Add MinBitrate for QVBR mode under H264/H265/AV1 output codec. Add GopBReference, GopNumBFrames, SubGopLength fields under H265 output codec.
 
-## __AmazonMQ__
+## __AWS License Manager User Subscriptions__
   - ### Features
-    - Add CONFIG_MANAGED as a supported AuthenticationStrategy for Amazon MQ for RabbitMQ brokers. Make username and password optional on broker creation for CONFIG_MANAGED brokers.
+    - Added support for cross-account Active Directories.
 
-# __2.33.1__ __2025-09-02__
 ## __AWS SDK for Java v2__
   - ### Features
+    - Add a utils-lite package that wraps threadlocal meant for internal shared usage across multiple applications across multiple applications
     - Updated endpoint and partition metadata.
 
-## __AWS User Notifications__
-  - ### Features
-    - Added Org support for notifications: - `ListMemberAccounts` gets member accounts list, `AssociateOrganizationalUnit` links OU to notification configuration, `DisassociateOrganizationalUnit` removes OU from notification configuration, `ListOrganizationalUnits` shows OUs configured for notifications.
-
-## __Amazon Elastic Compute Cloud__
-  - ### Features
-    - MaximumEbsAttachments and AttachmentLimitType fields added to DescribeInstanceTypesResponse. G6f, Gr6f, R8i, R8i-flex and p5.4xlarge instance types added to InstanceTypes enum.
-
-## __Amazon Neptune__
+## __AWS SDK for Java v2 Migration Tool__
   - ### Features
-    - Removed the deprecated marker from publiclyAccessible parameter from DbInstance, CreateDbInstance and ModifyDbInstance and added relevant usage information for the parameter.
+    - General availability release of the AWS SDK for Java v2 migration tool that automatically migrates applications from the AWS SDK for Java v1 to the AWS SDK for Java v2.
 
-## __Amazon WorkMail__
+## __Amazon Bedrock Agent Core Control Plane Fronting Layer__
   - ### Features
-    - Make RoleArn an optional parameter for the PutEmailMonitoringConfiguration API, and add UnsupportedOperationException to RegisterToWorkMail.
+    - Add tagging and VPC support to AgentCore Runtime, Code Interpreter, and Browser resources. Add support for configuring request headers in Runtime. Fix AgentCore Runtime shape names.
 
-# __2.33.0__ __2025-08-29__
-## __AWS SDK for Java v2__
-  - ### Features
-    - Add `AsyncRequestBody#splitCloseable` API that returns a Publisher of `ClosableAsyncRequestBody`
-    - Introduce BufferedSplittableAsyncRequestBody that enables splitting into retryable sub-request bodies.
-    - Introduce CloseableAsyncRequestBody interface that extends both AsyncRequestBody and SdkAutoClosable interfaces
-    - Updated endpoint and partition metadata.
-
-  - ### Bugfixes
-    - Improve Sigv4 signing performance, particularly for RPC protocols
-
-  - ### Deprecations
-    - Deprecate `AsyncRequestBody#split` in favor of `AsyncRequestBody#splitCloseable` that takes the same input but returns `SdkPublisher<CloseableAsyncRequestBody>`
-
-## __AWS X-Ray__
+## __Amazon Connect Service__
   - ### Features
-    - AWS X-Ray Features: Support Sampling Rate Boost On Anomaly
+    - This release adds a persistent connection field to UserPhoneConfig that maintains agent's softphone media connection for faster call connections.
 
-## __Amazon Bedrock Runtime__
+## __Amazon Kendra Intelligent Ranking__
   - ### Features
-    - Fixed stop sequence limit for converse API.
+    - Model whitespace change - no client difference
 
-## __Amazon Elastic Compute Cloud__
+## __Amazon Simple Queue Service__
   - ### Features
-    - Release shows new route types such as filtered and advertisement.
+    - Update invalid character handling documentation for SQS SendMessage API
 
diff --git a/README.md b/README.md
index 98c2dfdddf02..6f8a8acc27a9 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Maven](https://img.shields.io/maven-central/v/software.amazon.awssdk/s3.svg?label=Maven)](https://search.maven.org/search?q=g:%22software.amazon.awssdk%22%20AND%20a:%22s3%22)
 [![codecov](https://codecov.io/gh/aws/aws-sdk-java-v2/branch/master/graph/badge.svg)](https://codecov.io/gh/aws/aws-sdk-java-v2)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-119-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-120-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 The **AWS SDK for Java 2.0** is a rewrite of 1.0 with some great new features. As with version 1.0,
@@ -51,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.33.7</version>
+      <version>2.34.5</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -85,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.33.7</version>
+  <version>2.34.5</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.33.7</version>
+  <version>2.34.5</version>
 </dependency>
 ```
 
@@ -102,7 +102,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.33.7</version>
+  <version>2.34.5</version>
 </dependency>
 ```
 
@@ -343,6 +343,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jencymaryjoseph"><img src="https://avatars.githubusercontent.com/u/35571282?v=4?s=100" width="100px;" alt="Jency Joseph"/><br /><sub><b>Jency Joseph</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=jencymaryjoseph" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/reifiedbeans"><img src="https://avatars.githubusercontent.com/u/9686215?v=4?s=100" width="100px;" alt="Drew Davis"/><br /><sub><b>Drew Davis</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=reifiedbeans" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://mboegie.dev"><img src="https://avatars.githubusercontent.com/u/7557397?v=4?s=100" width="100px;" alt="Merlin Bögershausen"/><br /><sub><b>Merlin Bögershausen</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=MBoegers" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 
diff --git a/archetypes/archetype-app-quickstart/pom.xml b/archetypes/archetype-app-quickstart/pom.xml
index 813033dd665e..4aceac045660 100644
--- a/archetypes/archetype-app-quickstart/pom.xml
+++ b/archetypes/archetype-app-quickstart/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml
index e448a9d98ac7..7389234d3ff6 100644
--- a/archetypes/archetype-lambda/pom.xml
+++ b/archetypes/archetype-lambda/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>
diff --git a/archetypes/archetype-tools/pom.xml b/archetypes/archetype-tools/pom.xml
index 1530f88963ac..181dd9a7eda1 100644
--- a/archetypes/archetype-tools/pom.xml
+++ b/archetypes/archetype-tools/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>archetype-tools</artifactId>
-
+    <name>AWS Java SDK :: Archetype Tools</name>
     <dependencies>
         <!-- Depends on the artifacts of all services to generate serviceMapping.vm -->
         <dependency>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index cacf6e48a05b..b6b8841a62c0 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>
diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
index 7a4da1ab351d..5892d4b59b79 100644
--- a/aws-sdk-java/pom.xml
+++ b/aws-sdk-java/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>
@@ -768,11 +768,6 @@ Amazon AutoScaling, etc).</description>
             <artifactId>signer</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>sms</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>snowball</artifactId>
@@ -2118,6 +2113,11 @@ Amazon AutoScaling, etc).</description>
             <artifactId>bcmdashboards</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>utils-lite</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
index d39a1c1b8683..52fdab4cf277 100644
--- a/bom-internal/pom.xml
+++ b/bom-internal/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>bom-internal</artifactId>
-
+    <name>AWS Java SDK :: Bill of Materials Internal</name>
     <dependencyManagement>
         <dependencies>
             <!-- Non-Test Dependencies -->
diff --git a/bom/pom.xml b/bom/pom.xml
index 3ec2c830da31..fe1fcacf8279 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>
@@ -212,6 +212,11 @@
                 <artifactId>utils</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>utils-lite</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>cloudwatch-metric-publisher</artifactId>
@@ -973,11 +978,6 @@
                 <artifactId>signer</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
-            <dependency>
-                <groupId>software.amazon.awssdk</groupId>
-                <artifactId>sms</artifactId>
-                <version>${awsjavasdk.version}</version>
-            </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>snowball</artifactId>
diff --git a/buildspecs/release-to-maven-central.yml b/buildspecs/release-to-maven-central.yml
new file mode 100644
index 000000000000..bf7c46fddd6a
--- /dev/null
+++ b/buildspecs/release-to-maven-central.yml
@@ -0,0 +1,57 @@
+version: 0.2
+
+phases:
+  install:
+    commands:
+      - pip install awscli --upgrade --user
+
+  pre_build:
+    commands:
+      - ROOT=`pwd`
+      - SETTINGS_XML_TEMPLATE=buildspecs/resources/maven-central-release-settings.xml
+      - SETTINGS_XML=release-settings-final.xml
+      - SDK_SIGNING_GPG_SECRING=secring.gpg
+      - SDK_SIGNING_GPG_SECRING_ARN="arn:aws:secretsmanager:us-east-1:103431983078:secret:sdk-signing-gpg-secret-ring-9d0YXc"
+      - SDK_SIGNING_GPG_KEYNAME_ARN="arn:aws:secretsmanager:us-east-1:103431983078:secret:sdk-signing-gpg-keyname-wFsOOg"
+      - SDK_SIGNING_GPG_PASSPHRASE_ARN="arn:aws:secretsmanager:us-east-1:103431983078:secret:sdk-signing-gpg-passphrase-A0H1Kq"
+      - SONATYPE_PASSWORD_ARN="arn:aws:secretsmanager:us-east-1:103431983078:secret:maven-central-publishing-password-yktnUc"
+      - SONATYPE_USERNAME_ARN="arn:aws:secretsmanager:us-east-1:103431983078:secret:maven-central-publishing-username-RDvOnW"
+      - MODULES_TO_SKIP="protocol-tests,protocol-tests-core,codegen-generated-classes-test,sdk-benchmarks,module-path-tests,tests-coverage-reporting,stability-tests,sdk-native-image-test,auth-tests,s3-benchmarks,http-client-benchmarks,region-testing,old-client-version-compatibility-test,crt-unavailable-tests,bundle-shading-tests,v2-migration-tests,architecture-tests,s3-tests"
+
+  build:
+    commands:
+      - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
+      - ARTIFACT_URL="https://repo1.maven.org/maven2/software/amazon/awssdk/aws-sdk-java/$RELEASE_VERSION/"
+      - |
+        if ! curl -f --head $ARTIFACT_URL; then
+          SONATYPE_USERNAME=`aws secretsmanager get-secret-value --secret-id $SONATYPE_USERNAME_ARN --query SecretString --output text`
+          SONATYPE_PASSWORD=`aws secretsmanager get-secret-value --secret-id $SONATYPE_PASSWORD_ARN --query SecretString --output text`
+          SDK_SIGNING_GPG_KEYNAME=`aws secretsmanager get-secret-value --secret-id $SDK_SIGNING_GPG_KEYNAME_ARN --query SecretString --output text`
+          SDK_SIGNING_GPG_PASSPHRASE=`aws secretsmanager get-secret-value --secret-id $SDK_SIGNING_GPG_PASSPHRASE_ARN --query SecretString --output text`
+          aws secretsmanager get-secret-value --secret-id  $SDK_SIGNING_GPG_SECRING_ARN --query SecretBinary --output text | base64 -d > $SDK_SIGNING_GPG_SECRING
+          gpg --passphrase $SDK_SIGNING_GPG_PASSPHRASE --batch --import $SDK_SIGNING_GPG_SECRING
+
+          cat $SETTINGS_XML_TEMPLATE | \
+            awk 'BEGIN { var=ENVIRON["SONATYPE_USERNAME"] } { gsub("\\$SONATYPE_USERNAME", var, $0); print }' | \
+            awk 'BEGIN { var=ENVIRON["SONATYPE_PASSWORD"] } { gsub("\\$SONATYPE_PASSWORD", var, $0); print }' | \
+            awk 'BEGIN { var=ENVIRON["SDK_SIGNING_GPG_PASSPHRASE"] } { gsub("\\$SDK_SIGNING_GPG_PASSPHRASE", var, $0); print }' | \
+            awk 'BEGIN { var=ENVIRON["SDK_SIGNING_GPG_KEYNAME"] } { gsub("\\$SDK_SIGNING_GPG_KEYNAME", var, $0); print }' > \
+            $SETTINGS_XML
+
+          # Convert comma-separated list to space-separated list with !: prefix for each module
+          MODULES_TO_SKIP_FORMATTED=$(echo $MODULES_TO_SKIP | sed 's/,/,!:/g' | sed 's/^/!:/')
+          
+          mvn clean deploy -B -s $SETTINGS_XML -Pcentral-portal-publishing -DperformRelease -DautoPublish=true -DdeploymentName="software.amazon.awssdk-$RELEASE_VERSION" -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -pl $MODULES_TO_SKIP_FORMATTED
+
+          # Report staging folder size to CloudWatch
+          if [ -d "target/central-staging" ]; then
+            STAGING_SIZE_MB=$(du -sm target/central-staging | cut -f1)
+            aws cloudwatch put-metric-data \
+              --namespace "AwsJavaSdkRelease" \
+              --metric-data "MetricName=StagingFolderSize,Value=$STAGING_SIZE_MB,Unit=Megabytes"
+          else
+            echo "Staging folder target/central-staging not found"
+          fi
+        else
+          echo "This version was already released."
+        fi
diff --git a/buildspecs/resources/maven-central-release-settings.xml b/buildspecs/resources/maven-central-release-settings.xml
new file mode 100644
index 000000000000..4100be1970b6
--- /dev/null
+++ b/buildspecs/resources/maven-central-release-settings.xml
@@ -0,0 +1,21 @@
+<settings>
+    <servers>
+        <server>
+            <id>central</id>
+            <username>$SONATYPE_USERNAME</username>
+            <password>$SONATYPE_PASSWORD</password>
+        </server>
+    </servers>
+    <profiles>
+        <profile>
+            <id>central-portal-publishing</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <gpg.keyname>$SDK_SIGNING_GPG_KEYNAME</gpg.keyname>
+                <gpg.passphrase>$SDK_SIGNING_GPG_PASSPHRASE</gpg.passphrase>
+            </properties>
+        </profile>
+    </profiles>
+</settings>
diff --git a/bundle-logging-bridge/pom.xml b/bundle-logging-bridge/pom.xml
index b162a2ba0b9c..726bcdf51144 100644
--- a/bundle-logging-bridge/pom.xml
+++ b/bundle-logging-bridge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bundle-logging-bridge</artifactId>
     <packaging>jar</packaging>
diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
index 6f8aa0e53937..e7097b5bc4b4 100644
--- a/bundle-sdk/pom.xml
+++ b/bundle-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bundle-sdk</artifactId>
     <packaging>jar</packaging>
@@ -238,7 +238,7 @@
     </build>
     
     <profiles>
-        <profile>
+            <profile>
             <id>publishing</id>
             <build>
                 <plugins>
@@ -268,6 +268,36 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>central-portal-publishing</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-shade-plugin</artifactId>
+                        <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>javadoc-jar</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <sourcepath>${basedir}/../core/profiles/src/main/java/software/amazon/awssdk/profiles;${basedir}/../core/sdk-core/src/main/java/software/amazon/awssdk/core</sourcepath>
+                            <failOnError>false</failOnError>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 7830df26f604..6c5e6ed8384d 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>
@@ -90,8 +90,47 @@
            </plugin>
 	</plugins>
     </build>
-
     <profiles>
+        <profile>
+            <id>central-portal-publishing</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-shade-plugin</artifactId>
+                        <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>javadoc-jar</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <sourcepath>${basedir}/../core/profiles/src/main/java/software/amazon/awssdk/profiles;${basedir}/../core/sdk-core/src/main/java/software/amazon/awssdk/core</sourcepath>
+                            <failOnError>false</failOnError>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <configuration>
+                            <ignoredUnusedDeclaredDependencies>
+                                <ignoredUnusedDeclaredDependency>software.amazon.awssdk:bundle-sdk</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>software.amazon.awssdk:bundle-logging-bridge</ignoredUnusedDeclaredDependency>
+                            </ignoredUnusedDeclaredDependencies>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>publishing</id>
             <build>
diff --git a/changelogs/2.33.x-CHANGELOG.md b/changelogs/2.33.x-CHANGELOG.md
new file mode 100644
index 000000000000..e68a8bf66d1d
--- /dev/null
+++ b/changelogs/2.33.x-CHANGELOG.md
@@ -0,0 +1,344 @@
+ #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.33.13__ __2025-09-18__
+## __AWS Budgets__
+  - ### Features
+    - Added BillingViewHealthStatus Exception which is thrown when a Budget is created or updated with a Billing View that is not in the HEALTHY status
+
+## __Amazon Bedrock__
+  - ### Features
+    - Release includes an increase to the maximum policy build document size, an update to DeleteAutomatedReasoningPolicyBuildWorkflow to add ResourceInUseException, and corrections to UpdateAutomatedReasoningPolicyTestCaseRequest.
+
+## __Amazon Chime SDK Messaging__
+  - ### Features
+    - Amazon Chime SDK Messaging GetMessagingSessionEndpoint API now returns dual-stack WebSocket endpoints supporting IPv4/IPv6.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Allowed AMIs adds support for four new parameters - marketplaceProductCodes, deprecationTimeCondition, creationDateCondition and imageNames
+
+# __2.33.12__ __2025-09-17__
+## __AWS Network Firewall__
+  - ### Features
+    - Network Firewall now prevents TLS handshakes with the target server until after the Server Name Indication (SNI) has been seen and verified. The monitoring dashboard now provides deeper insights into PrivateLink endpoint candidates and offers filters based on IP addresses and protocol.
+
+## __AWS Parallel Computing Service__
+  - ### Features
+    - Add support for Amazon EC2 Capacity Blocks for ML
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Add mac-m4.metal and mac-m4pro.metal instance types.
+
+# __2.33.11__ __2025-09-16__
+## __AWS Budgets__
+  - ### Features
+    - Add support for custom time periods in budget configuration
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+  - ### Bugfixes
+    - Preserve the initial content-length when calling mark in SdkLengthAwareInputStream.
+
+## __Amazon CloudWatch Logs__
+  - ### Features
+    - Cloudwatch Logs added support for 2 new API parameters in metric and subscription filter APIs to filter log events based on system field values and emit system field values as dimensions and send them to customer destination as additional metadata.
+
+## __Amazon Interactive Video Service RealTime__
+  - ### Features
+    - IVS now offers customers the ability to control the positioning of participants in both grid and PiP layouts based on custom attribute values in participant tokens.
+
+## __Amazon OpenSearch Ingestion__
+  - ### Features
+    - Adds support for cross-account ingestion for push-based sources. This includes resource policies for sharing pipelines across accounts and features for managing pipeline endpoints which enable accessing pipelines across different VPCs, including VPCs in other accounts.
+
+# __2.33.10__ __2025-09-15__
+## __AWS Cost Explorer Service__
+  - ### Features
+    - Added endpoint support for eusc-de-east-1 region.
+
+## __AWS Health Imaging__
+  - ### Features
+    - Added support for OpenID Connect (OIDC) custom authorizer
+
+## __AWS S3 Control__
+  - ### Features
+    - Introduce three new encryption filters: EncryptionType (SSE-S3, SSE-KMS, DSSE-KMS, SSE-C, NOT-SSE), KmsKeyArn (for SSE-KMS and DSSE-KMS), and BucketKeyEnabled (for SSE-KMS).
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Added additional validations for multipart download operations in the Java multipart S3 client
+
+## __CloudWatch Observability Admin Service__
+  - ### Features
+    - CloudWatch Observability Admin adds the ability to enable telemetry centralization in customers' Organizations. The release introduces new APIs to manage centralization rules, which define settings to replicate telemetry data to a central destination in the customers' Organization.
+
+# __2.33.9__ __2025-09-12__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Update Jackson and Jackson jr to 2.19.0
+
+## __Payment Cryptography Control Plane__
+  - ### Features
+    - Add support for certificates to be signed by 3rd party certificate authorities. New API GetCertificateSigningRequest API and support for providing certificates at run-time for tr-34 import/export
+
+# __2.33.8__ __2025-09-11__
+## __AWS Elemental MediaLive__
+  - ### Features
+    - AWS Elemental MediaLive adds a new feature in MediaPackage output group that enables MediaPackage V2 users to control HLS-related parameters directly in MediaLive. These parameter settings are then reflected in MediaPackage outputs, providing more streamlined control over HLS configurations.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __Amazon DataZone__
+  - ### Features
+    - adding IAM principal id to IAM user profile details
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - This release supports hook details for Amazon ECS lifecycle hooks.
+
+## __Amazon EMR Containers__
+  - ### Features
+    - Added nodeLabel support in container provider to aid hardware isolation support for virtual cluster and security configuration.
+
+## __Amazon Elastic VMware Service__
+  - ### Features
+    - CreateEnvironment API now supports parameters (isHcxPublic & hcxNetworkAclId) for HCX migration via public internet, adding flexibility for migration scenarios. New APIs have been added for associating (AssociateEipToVlan) & disassociating (DisassociateEipFromVlan) Elastic IP (EIP) addresses.
+
+## __Amazon GuardDuty__
+  - ### Features
+    - Updated Java SDK implementation of entity set status in GuardDuty API.
+
+## __Amazon Prometheus Service__
+  - ### Features
+    - Add Vended Logs APIs for Amazon Prometheus Managed Collector
+
+## __Amazon QuickSight__
+  - ### Features
+    - This release adds support for Account level custom permissions, additional Dashboard Options, and Null support for Q&A.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Adds support for end-to-end IAM authentication in RDS Proxy for MySQL, MariaDB, and PostgreSQL engines.
+
+# __2.33.7__ __2025-09-10__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+  - ### Bugfixes
+    - Ensure that file modification exceptions in AsyncRequestBody#fromFile are propagated correctly.
+    - Revert recent AutoGeneratedTimestampRecordExtension change released in `2.33.4` that may break users with manually configured table schema. See [#6410](https://github.com/aws/aws-sdk-java-v2/issues/6410)
+
+## __Network Flow Monitor__
+  - ### Features
+    - Added new enum value (AWS::Region) for type field under MonitorLocalResource and MonitorRemoteResource. Workload Insights and Monitor top contributors queries now support a new DestinationCategory (INTER_REGION).
+
+## __Payment Cryptography Control Plane__
+  - ### Features
+    - AWS Payment Cryptography Service now supports Multi-Region key replication. Customers can choose to automatically distribute keys across AWS Regions.
+
+# __2.33.6__ __2025-09-09__
+## __AWS Elemental MediaPackage v2__
+  - ### Features
+    - Added CUE tag SCTE output to MediaPackageV2 HLS and LL-HLS manifests.
+
+## __AWS Organizations__
+  - ### Features
+    - Documentation updates for AWS Organizations APIs.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __Amazon CloudWatch__
+  - ### Features
+    - Added a new API - DescribeAlarmContributors API, to retrieve alarm contributors in ALARM state. Added support in DescribeAlarmHistory API to query alarm contributor history
+
+## __Amazon Connect Service__
+  - ### Features
+    - SDK release for user defined predefined attributes.
+
+## __Amazon DataZone__
+  - ### Features
+    - Adds support for custom blueprints
+
+## __Amazon SageMaker Service__
+  - ### Features
+    - Released IPv6 support with dual-stack domain options on SageMaker Studio and introduced support for p6-b200.48xlarge instance type on SageMaker Studio for JupyterLab and CodeEditor applications.
+
+## __Auto Scaling__
+  - ### Features
+    - Added WaitForTransitioningInstances parameter to the CancelInstanceRefresh API, allowing the caller to cancel an instance refresh without waiting for on-going launches and terminations.
+
+# __2.33.5__ __2025-09-08__
+## __AWS IoT SiteWise__
+  - ### Features
+    - Add ComputationModelVersion support in IoT SiteWise APIs
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+  - ### Bugfixes
+    - X-Forwarded-For headers will no longer be signed during SigV4 authentication
+        - Contributed by: [@brandondahler](https://github.com/brandondahler)
+
+## __AWS SecurityHub__
+  - ### Features
+    - This release adds the RESOURCE_NOT_FOUND error code as a possible value in responses to the following operations: BatchGetStandardsControlAssociations, BatchUpdateStandardsControlAssociations, and BatchGetSecurityControls.
+
+## __Amazon Simple Storage Service__
+  - ### Features
+    - This release includes backward compatibility work on the "Expires" parameter.
+
+## __Contributors__
+Special thanks to the following contributors to this release: 
+
+[@brandondahler](https://github.com/brandondahler)
+# __2.33.4__ __2025-09-05__
+## __AWS Parallel Computing Service__
+  - ### Features
+    - Documentation-only update to add AccountingStorageEnforce to SlurmCustomSetting.
+
+## __AWS SDK For Java v2__
+  - ### Bugfixes
+    - Set default value for credentialProvider archetype parameter.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Update Netty to 4.1.126
+        - Contributed by: [@mrdziuban](https://github.com/mrdziuban)
+
+## __Amazon DynamoDB Enhanced Client__
+  - ### Features
+    - Added support for @DynamoDbAutoGeneratedTimestampAttribute and @DynamoDbUpdateBehavior on attributes within nested objects. The @DynamoDbUpdateBehavior annotation will only take effect for nested attributes when using IgnoreNullsMode.SCALAR_ONLY.
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - This is a documentation only release that adds additional information for Amazon ECS Availability Zone rebalancing.
+
+## __Amazon SageMaker Service__
+  - ### Features
+    - Release IPv6 support with dualstack in SageMaker Notebooks, Tiered Storage Checkpointing Support in SageMaker HyperPod and P5.4xlarge instance type for SageMaker Hosting.
+
+## __Contributors__
+Special thanks to the following contributors to this release: 
+
+[@mrdziuban](https://github.com/mrdziuban)
+# __2.33.3__ __2025-09-04__
+## __AWS Clean Rooms Service__
+  - ### Features
+    - Add support for configurable compute sizes for PySpark jobs.
+
+## __AWS CloudFormation__
+  - ### Features
+    - ListHookResults API now supports retrieving invocation results for all CloudFormation Hooks (previously limited to create change set and Cloud Control operations) with new optional parameters for filtering by Hook status and ARN.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Add m8i, m8i-flex and i8ge instance types.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Added new EndpointNetworkType and TargetConnectionNetworkType fields in Proxy APIs to support IPv6
+
+## __Amazon Verified Permissions__
+  - ### Features
+    - Amazon Verified Permissions / Features : Adds support for datetime and duration attribute values.
+
+## __OpenSearch Service Serverless__
+  - ### Features
+    - Add support for Federal Information Processing Standards (FIPS) and Federal Risk and Authorization Management Program (FedRAMP) compliance
+
+# __2.33.2__ __2025-09-03__
+## __AWS Clean Rooms ML__
+  - ### Features
+    - AWS Clean Rooms ML adds log sanitization for privacy-enhanced error summaries, supports new instance types for custom models providing better performance and lower costs, and deprecates P3-series instances.
+
+## __AWS Clean Rooms Service__
+  - ### Features
+    - Added support for adding new data provider members to an existing collaboration.
+
+## __Amazon CloudFront__
+  - ### Features
+    - Adding an optional field IpAddressType in CustomOriginConfig
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - This release adds support for MasterUserAuthenticationType parameter on CreateDBInstance, ModifyDBInstance, CreateDBCluster, and ModifyDBCluster operations.
+
+## __Amazon Route 53__
+  - ### Features
+    - Amazon Route 53 now supports the Asia Pacific (New Zealand) Region (ap-southeast-6) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region.
+
+## __Amazon Route 53 Domains__
+  - ### Features
+    - Added new ExtraParams AU_ELIGIBILITY_TYPE, AU_POLICY_REASON, and AU_REGISTRANT_NAME
+
+## __Amazon Transcribe Streaming Service__
+  - ### Features
+    - This release adds support for automatic language identification in AWS Transcribe Call Analytics
+
+## __AmazonMQ__
+  - ### Features
+    - Add CONFIG_MANAGED as a supported AuthenticationStrategy for Amazon MQ for RabbitMQ brokers. Make username and password optional on broker creation for CONFIG_MANAGED brokers.
+
+# __2.33.1__ __2025-09-02__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __AWS User Notifications__
+  - ### Features
+    - Added Org support for notifications: - `ListMemberAccounts` gets member accounts list, `AssociateOrganizationalUnit` links OU to notification configuration, `DisassociateOrganizationalUnit` removes OU from notification configuration, `ListOrganizationalUnits` shows OUs configured for notifications.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - MaximumEbsAttachments and AttachmentLimitType fields added to DescribeInstanceTypesResponse. G6f, Gr6f, R8i, R8i-flex and p5.4xlarge instance types added to InstanceTypes enum.
+
+## __Amazon Neptune__
+  - ### Features
+    - Removed the deprecated marker from publiclyAccessible parameter from DbInstance, CreateDbInstance and ModifyDbInstance and added relevant usage information for the parameter.
+
+## __Amazon WorkMail__
+  - ### Features
+    - Make RoleArn an optional parameter for the PutEmailMonitoringConfiguration API, and add UnsupportedOperationException to RegisterToWorkMail.
+
+# __2.33.0__ __2025-08-29__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Add `AsyncRequestBody#splitCloseable` API that returns a Publisher of `ClosableAsyncRequestBody`
+    - Introduce BufferedSplittableAsyncRequestBody that enables splitting into retryable sub-request bodies.
+    - Introduce CloseableAsyncRequestBody interface that extends both AsyncRequestBody and SdkAutoClosable interfaces
+    - Updated endpoint and partition metadata.
+
+  - ### Bugfixes
+    - Improve Sigv4 signing performance, particularly for RPC protocols
+
+  - ### Deprecations
+    - Deprecate `AsyncRequestBody#split` in favor of `AsyncRequestBody#splitCloseable` that takes the same input but returns `SdkPublisher<CloseableAsyncRequestBody>`
+
+## __AWS X-Ray__
+  - ### Features
+    - AWS X-Ray Features: Support Sampling Rate Boost On Anomaly
+
+## __Amazon Bedrock Runtime__
+  - ### Features
+    - Fixed stop sequence limit for converse API.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Release shows new route types such as filtered and advertisement.
+
diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml
index eb9f81eb5adf..e8a24704a6ac 100644
--- a/codegen-lite-maven-plugin/pom.xml
+++ b/codegen-lite-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>
diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
index e5647d9ddad3..58150e75c995 100644
--- a/codegen-lite/pom.xml
+++ b/codegen-lite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>
diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
index 79fa71615844..5df2ccecad01 100644
--- a/codegen-maven-plugin/pom.xml
+++ b/codegen-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>
diff --git a/codegen/pom.xml b/codegen/pom.xml
index 5cd86edcd17d..fcb6b207a4f4 100644
--- a/codegen/pom.xml
+++ b/codegen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>
diff --git a/codegen/src/main/resources/software/amazon/awssdk/codegen/rules/partitions.json.resource b/codegen/src/main/resources/software/amazon/awssdk/codegen/rules/partitions.json.resource
index c6582c9c6316..b346b0be9b92 100644
--- a/codegen/src/main/resources/software/amazon/awssdk/codegen/rules/partitions.json.resource
+++ b/codegen/src/main/resources/software/amazon/awssdk/codegen/rules/partitions.json.resource
@@ -162,7 +162,7 @@
       "dualStackDnsSuffix" : "api.aws.ic.gov",
       "implicitGlobalRegion" : "us-iso-east-1",
       "name" : "aws-iso",
-      "supportsDualStack" : false,
+      "supportsDualStack" : true,
       "supportsFIPS" : true
     },
     "regionRegex" : "^us\\-iso\\-\\w+\\-\\d+$",
@@ -184,7 +184,7 @@
       "dualStackDnsSuffix" : "api.aws.scloud",
       "implicitGlobalRegion" : "us-isob-east-1",
       "name" : "aws-iso-b",
-      "supportsDualStack" : false,
+      "supportsDualStack" : true,
       "supportsFIPS" : true
     },
     "regionRegex" : "^us\\-isob\\-\\w+\\-\\d+$",
@@ -203,7 +203,7 @@
       "dualStackDnsSuffix" : "api.cloud-aws.adc-e.uk",
       "implicitGlobalRegion" : "eu-isoe-west-1",
       "name" : "aws-iso-e",
-      "supportsDualStack" : false,
+      "supportsDualStack" : true,
       "supportsFIPS" : true
     },
     "regionRegex" : "^eu\\-isoe\\-\\w+\\-\\d+$",
@@ -222,7 +222,7 @@
       "dualStackDnsSuffix" : "api.aws.hci.ic.gov",
       "implicitGlobalRegion" : "us-isof-south-1",
       "name" : "aws-iso-f",
-      "supportsDualStack" : false,
+      "supportsDualStack" : true,
       "supportsFIPS" : true
     },
     "regionRegex" : "^us\\-isof\\-\\w+\\-\\d+$",
diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml
index cc8d169dfd89..459ab08ca048 100644
--- a/core/annotations/pom.xml
+++ b/core/annotations/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/arns/pom.xml b/core/arns/pom.xml
index 97afe921b538..217da850fb8c 100644
--- a/core/arns/pom.xml
+++ b/core/arns/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/auth-crt/pom.xml b/core/auth-crt/pom.xml
index 85e27e424023..f591aa5e3690 100644
--- a/core/auth-crt/pom.xml
+++ b/core/auth-crt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>auth-crt</artifactId>
diff --git a/core/auth/pom.xml b/core/auth/pom.xml
index 57e87fea7b68..1a2ba0253560 100644
--- a/core/auth/pom.xml
+++ b/core/auth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>auth</artifactId>
diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml
index a6f450dd947f..4effc4c147e7 100644
--- a/core/aws-core/pom.xml
+++ b/core/aws-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>aws-core</artifactId>
@@ -113,6 +113,11 @@
             <groupId>software.amazon.eventstream</groupId>
             <artifactId>eventstream</artifactId>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>utils-lite</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptor.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptor.java
index 95224228cfb4..0b24d55bd0e6 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptor.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptor.java
@@ -19,40 +19,82 @@
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.awscore.internal.interceptor.TracingSystemSetting;
 import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.utils.SystemSetting;
+import software.amazon.awssdk.utilslite.SdkInternalThreadLocal;
 
 /**
  * The {@code TraceIdExecutionInterceptor} copies the trace details to the {@link #TRACE_ID_HEADER} header, assuming we seem to
- * be running in a lambda environment.
+ * be running in a lambda environment.`
  */
 @SdkProtectedApi
 public class TraceIdExecutionInterceptor implements ExecutionInterceptor {
     private static final String TRACE_ID_HEADER = "X-Amzn-Trace-Id";
     private static final String LAMBDA_FUNCTION_NAME_ENVIRONMENT_VARIABLE = "AWS_LAMBDA_FUNCTION_NAME";
+    private static final String CONCURRENT_TRACE_ID_KEY = "AWS_LAMBDA_X_TRACE_ID";
+    private static final ExecutionAttribute<String> TRACE_ID = new ExecutionAttribute<>("TraceId");
+
+    @Override
+    public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes executionAttributes) {
+        if (lambdaFunctionNameEnvironmentVariable().isPresent()) {
+            String traceId = SdkInternalThreadLocal.get(CONCURRENT_TRACE_ID_KEY);
+            if (traceId != null) {
+                executionAttributes.putAttribute(TRACE_ID, traceId);
+            }
+        }
+    }
 
     @Override
     public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
         Optional<String> traceIdHeader = traceIdHeader(context);
         if (!traceIdHeader.isPresent()) {
             Optional<String> lambdafunctionName = lambdaFunctionNameEnvironmentVariable();
-            Optional<String> traceId = traceId();
+            Optional<String> traceId = traceId(executionAttributes);
 
             if (lambdafunctionName.isPresent() && traceId.isPresent()) {
                 return context.httpRequest().copy(r -> r.putHeader(TRACE_ID_HEADER, traceId.get()));
             }
         }
-
         return context.httpRequest();
     }
 
+    @Override
+    public void afterExecution(Context.AfterExecution context, ExecutionAttributes executionAttributes) {
+        if (lambdaFunctionNameEnvironmentVariable().isPresent()) {
+            saveTraceId(executionAttributes);
+        }
+    }
+
+    @Override
+    public void onExecutionFailure(Context.FailedExecution context, ExecutionAttributes executionAttributes) {
+        if (lambdaFunctionNameEnvironmentVariable().isPresent()) {
+            saveTraceId(executionAttributes);
+        }
+    }
+
+    /**
+     * Stores the trace ID in thread-local storage to ensure trace propagation across
+     * thread boundaries during retries, or future chaining.
+     */
+    private static void saveTraceId(ExecutionAttributes executionAttributes) {
+        String traceId = executionAttributes.getAttribute(TRACE_ID);
+        if (traceId != null) {
+            SdkInternalThreadLocal.put(CONCURRENT_TRACE_ID_KEY, executionAttributes.getAttribute(TRACE_ID));
+        }
+    }
+
     private Optional<String> traceIdHeader(Context.ModifyHttpRequest context) {
         return context.httpRequest().firstMatchingHeader(TRACE_ID_HEADER);
     }
 
-    private Optional<String> traceId() {
+    private Optional<String> traceId(ExecutionAttributes executionAttributes) {
+        Optional<String> traceId = Optional.ofNullable(executionAttributes.getAttribute(TRACE_ID));
+        if (traceId.isPresent()) {
+            return traceId;
+        }
         return TracingSystemSetting._X_AMZN_TRACE_ID.getStringValue();
     }
 
@@ -61,4 +103,4 @@ private Optional<String> lambdaFunctionNameEnvironmentVariable() {
         return SystemSetting.getStringValueFromEnvironmentVariable(LAMBDA_FUNCTION_NAME_ENVIRONMENT_VARIABLE);
         // CHECKSTYLE:ON
     }
-}
+}
\ No newline at end of file
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptorTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptorTest.java
index b3f965a490fc..3c18d064cd0d 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptorTest.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptorTest.java
@@ -28,6 +28,7 @@
 import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
+import software.amazon.awssdk.utilslite.SdkInternalThreadLocal;
 
 public class TraceIdExecutionInterceptorTest {
     @Test
@@ -111,6 +112,78 @@ public void headerNotAddedIfNoTraceIdEnvVar() {
         });
     }
 
+    @Test
+    public void modifyHttpRequest_whenMultiConcurrencyModeWithInternalThreadLocal_shouldAddTraceIdHeader() {
+        EnvironmentVariableHelper.run(env -> {
+            resetRelevantEnvVars(env);
+            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
+
+            try {
+                TraceIdExecutionInterceptor interceptor = new TraceIdExecutionInterceptor();
+                ExecutionAttributes executionAttributes = new ExecutionAttributes();
+
+                interceptor.beforeExecution(null, executionAttributes);
+                Context.ModifyHttpRequest context = context();
+
+                SdkHttpRequest request = interceptor.modifyHttpRequest(context, executionAttributes);
+                assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+            } finally {
+                SdkInternalThreadLocal.remove("AWS_LAMBDA_X_TRACE_ID");
+            }
+        });
+    }
+
+    @Test
+    public void modifyHttpRequest_whenMultiConcurrencyModeWithBothInternalThreadLocalAndSystemProperty_shouldUseInternalThreadLocalValue() {
+        EnvironmentVariableHelper.run(env -> {
+            resetRelevantEnvVars(env);
+            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
+
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
+            Properties props = System.getProperties();
+            props.setProperty("com.amazonaws.xray.traceHeader", "sys-prop-345");
+
+            try {
+                TraceIdExecutionInterceptor interceptor = new TraceIdExecutionInterceptor();
+                ExecutionAttributes executionAttributes = new ExecutionAttributes();
+
+                interceptor.beforeExecution(null, executionAttributes);
+
+                Context.ModifyHttpRequest context = context();
+                SdkHttpRequest request = interceptor.modifyHttpRequest(context, executionAttributes);
+
+                assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+            } finally {
+                SdkInternalThreadLocal.remove("AWS_LAMBDA_X_TRACE_ID");
+                props.remove("com.amazonaws.xray.traceHeader");
+            }
+        });
+    }
+
+    @Test
+    public void modifyHttpRequest_whenNotInLambdaEnvironmentWithInternalThreadLocal_shouldNotAddHeader() {
+        EnvironmentVariableHelper.run(env -> {
+            resetRelevantEnvVars(env);
+
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "should-be-ignored");
+
+            try {
+                TraceIdExecutionInterceptor interceptor = new TraceIdExecutionInterceptor();
+                ExecutionAttributes executionAttributes = new ExecutionAttributes();
+
+                interceptor.beforeExecution(null, executionAttributes);
+
+                Context.ModifyHttpRequest context = context();
+                SdkHttpRequest request = interceptor.modifyHttpRequest(context, executionAttributes);
+
+                assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).isEmpty();
+            } finally {
+                SdkInternalThreadLocal.remove("AWS_LAMBDA_X_TRACE_ID");
+            }
+        });
+    }
+
     private Context.ModifyHttpRequest context() {
         return context(SdkHttpRequest.builder()
                                      .uri(URI.create("https://localhost"))
diff --git a/core/checksums-spi/pom.xml b/core/checksums-spi/pom.xml
index a39c6666eac2..7d1e6685abbb 100644
--- a/core/checksums-spi/pom.xml
+++ b/core/checksums-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>checksums-spi</artifactId>
diff --git a/core/checksums/pom.xml b/core/checksums/pom.xml
index 05f85c0dba1e..07787e7be304 100644
--- a/core/checksums/pom.xml
+++ b/core/checksums/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>checksums</artifactId>
diff --git a/core/crt-core/pom.xml b/core/crt-core/pom.xml
index 62e1e87859be..37f18983befa 100644
--- a/core/crt-core/pom.xml
+++ b/core/crt-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>crt-core</artifactId>
diff --git a/core/endpoints-spi/pom.xml b/core/endpoints-spi/pom.xml
index 36479e1b9fbd..f3401c04f43f 100644
--- a/core/endpoints-spi/pom.xml
+++ b/core/endpoints-spi/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/http-auth-aws-crt/pom.xml b/core/http-auth-aws-crt/pom.xml
index d76d7eeee28f..5e972c904e8c 100644
--- a/core/http-auth-aws-crt/pom.xml
+++ b/core/http-auth-aws-crt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth-aws-crt</artifactId>
diff --git a/core/http-auth-aws-eventstream/pom.xml b/core/http-auth-aws-eventstream/pom.xml
index d78fc8e39568..3ae6368f86cc 100644
--- a/core/http-auth-aws-eventstream/pom.xml
+++ b/core/http-auth-aws-eventstream/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth-aws-eventstream</artifactId>
diff --git a/core/http-auth-aws/pom.xml b/core/http-auth-aws/pom.xml
index 65b644f32916..498dfa94f07f 100644
--- a/core/http-auth-aws/pom.xml
+++ b/core/http-auth-aws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth-aws</artifactId>
diff --git a/core/http-auth-spi/pom.xml b/core/http-auth-spi/pom.xml
index 30e43ecd54dc..8df4e812614d 100644
--- a/core/http-auth-spi/pom.xml
+++ b/core/http-auth-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth-spi</artifactId>
diff --git a/core/http-auth/pom.xml b/core/http-auth/pom.xml
index 6c34326f3860..a85339167e8f 100644
--- a/core/http-auth/pom.xml
+++ b/core/http-auth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth</artifactId>
diff --git a/core/identity-spi/pom.xml b/core/identity-spi/pom.xml
index fddca7cea6f9..3fe01b74338e 100644
--- a/core/identity-spi/pom.xml
+++ b/core/identity-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>identity-spi</artifactId>
diff --git a/core/imds/pom.xml b/core/imds/pom.xml
index 2bf4b78a6de2..8746edf76c8e 100644
--- a/core/imds/pom.xml
+++ b/core/imds/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>imds</artifactId>
diff --git a/core/json-utils/pom.xml b/core/json-utils/pom.xml
index 9b35825bb07f..c3a4106071a3 100644
--- a/core/json-utils/pom.xml
+++ b/core/json-utils/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml
index cc0c6594738d..9414d9e16730 100644
--- a/core/metrics-spi/pom.xml
+++ b/core/metrics-spi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/pom.xml b/core/pom.xml
index ffb60a6782e5..5ae08baa40ac 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>core</artifactId>
diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml
index cc077d9826bf..6c5b9920bdff 100644
--- a/core/profiles/pom.xml
+++ b/core/profiles/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>profiles</artifactId>
diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml
index f48dbeff7964..515e6db1f07b 100644
--- a/core/protocols/aws-cbor-protocol/pom.xml
+++ b/core/protocols/aws-cbor-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml
index 0a264ebd8e9d..06f67fbce6df 100644
--- a/core/protocols/aws-json-protocol/pom.xml
+++ b/core/protocols/aws-json-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml
index 7c9914ffd08e..985e8ae24888 100644
--- a/core/protocols/aws-query-protocol/pom.xml
+++ b/core/protocols/aws-query-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml
index 8de2c605b353..f098dcb079bd 100644
--- a/core/protocols/aws-xml-protocol/pom.xml
+++ b/core/protocols/aws-xml-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/pom.xml b/core/protocols/pom.xml
index 02d252a80287..f497c3f17262 100644
--- a/core/protocols/pom.xml
+++ b/core/protocols/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml
index 3f04f19564c3..7afd1bf502af 100644
--- a/core/protocols/protocol-core/pom.xml
+++ b/core/protocols/protocol-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/smithy-rpcv2-protocol/pom.xml b/core/protocols/smithy-rpcv2-protocol/pom.xml
index 1d1dd49eae55..ed760067a5aa 100644
--- a/core/protocols/smithy-rpcv2-protocol/pom.xml
+++ b/core/protocols/smithy-rpcv2-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-	<version>2.33.8-SNAPSHOT</version>
+	<version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/regions/pom.xml b/core/regions/pom.xml
index 1ac2fa8dcb38..a952c85f0b93 100644
--- a/core/regions/pom.xml
+++ b/core/regions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>regions</artifactId>
diff --git a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json
index 2a9475abcdfd..aae829424e19 100644
--- a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json
+++ b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json
@@ -3024,6 +3024,7 @@
         "endpoints" : {
           "af-south-1" : { },
           "ap-east-1" : { },
+          "ap-east-2" : { },
           "ap-northeast-1" : {
             "variants" : [ {
               "tags" : [ "dualstack" ]
@@ -3034,11 +3035,13 @@
               "tags" : [ "dualstack" ]
             } ]
           },
+          "ap-northeast-3" : { },
           "ap-south-1" : {
             "variants" : [ {
               "tags" : [ "dualstack" ]
             } ]
           },
+          "ap-south-2" : { },
           "ap-southeast-1" : {
             "variants" : [ {
               "tags" : [ "dualstack" ]
@@ -3049,9 +3052,12 @@
               "tags" : [ "dualstack" ]
             } ]
           },
+          "ap-southeast-3" : { },
+          "ap-southeast-4" : { },
           "ap-southeast-5" : { },
           "ap-southeast-7" : { },
           "ca-central-1" : { },
+          "ca-west-1" : { },
           "eu-central-1" : {
             "variants" : [ {
               "tags" : [ "dualstack" ]
@@ -3064,6 +3070,7 @@
             } ]
           },
           "eu-south-1" : { },
+          "eu-south-2" : { },
           "eu-west-1" : {
             "variants" : [ {
               "tags" : [ "dualstack" ]
@@ -3079,7 +3086,10 @@
               "tags" : [ "dualstack" ]
             } ]
           },
+          "il-central-1" : { },
           "me-central-1" : { },
+          "me-south-1" : { },
+          "mx-central-1" : { },
           "sa-east-1" : {
             "variants" : [ {
               "tags" : [ "dualstack" ]
@@ -3109,6 +3119,7 @@
           "us-east-2-fips" : {
             "deprecated" : true
           },
+          "us-west-1" : { },
           "us-west-2" : {
             "variants" : [ {
               "tags" : [ "dualstack" ]
@@ -3788,6 +3799,7 @@
       },
       "bedrock" : {
         "endpoints" : {
+          "ap-east-2" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-northeast-3" : { },
@@ -3797,6 +3809,8 @@
           "ap-southeast-2" : { },
           "ap-southeast-3" : { },
           "ap-southeast-4" : { },
+          "ap-southeast-5" : { },
+          "ap-southeast-7" : { },
           "bedrock-ap-northeast-1" : {
             "credentialScope" : {
               "region" : "ap-northeast-1"
@@ -4094,6 +4108,8 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "il-central-1" : { },
+          "me-central-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -7514,6 +7530,7 @@
           } ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-east-2" : { },
           "ap-northeast-1" : {
             "hostname" : "datazone.ap-northeast-1.api.aws"
@@ -7562,6 +7579,7 @@
           "eu-central-1" : {
             "hostname" : "datazone.eu-central-1.api.aws"
           },
+          "eu-central-2" : { },
           "eu-north-1" : {
             "hostname" : "datazone.eu-north-1.api.aws"
           },
@@ -9539,6 +9557,7 @@
               "tags" : [ "fips" ]
             } ]
           },
+          "ap-southeast-6" : { },
           "ap-southeast-7" : {
             "variants" : [ {
               "hostname" : "elasticfilesystem-fips.ap-southeast-7.amazonaws.com",
@@ -11204,6 +11223,7 @@
               "tags" : [ "fips" ]
             } ]
           },
+          "ap-east-2" : { },
           "ap-northeast-1" : {
             "variants" : [ {
               "hostname" : "fms-fips.ap-northeast-1.amazonaws.com",
@@ -14044,6 +14064,7 @@
       },
       "kafkaconnect" : {
         "endpoints" : {
+          "ap-east-2" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -14051,12 +14072,16 @@
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "ap-southeast-5" : { },
+          "ap-southeast-7" : { },
           "ca-central-1" : { },
+          "ca-west-1" : { },
           "eu-central-1" : { },
           "eu-north-1" : { },
+          "eu-south-2" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "mx-central-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -17877,6 +17902,7 @@
             },
             "hostname" : "oidc.ap-southeast-5.amazonaws.com"
           },
+          "ap-southeast-7" : { },
           "ca-central-1" : {
             "credentialScope" : {
               "region" : "ca-central-1"
@@ -17955,6 +17981,7 @@
             },
             "hostname" : "oidc.me-south-1.amazonaws.com"
           },
+          "mx-central-1" : { },
           "sa-east-1" : {
             "credentialScope" : {
               "region" : "sa-east-1"
@@ -18161,6 +18188,7 @@
           "il-central-1" : { },
           "me-central-1" : { },
           "me-south-1" : { },
+          "mx-central-1" : { },
           "sa-east-1" : { },
           "us-east-1" : {
             "variants" : [ {
@@ -20226,7 +20254,9 @@
       },
       "redshift-serverless" : {
         "endpoints" : {
+          "af-south-1" : { },
           "ap-east-1" : { },
+          "ap-east-2" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -20244,6 +20274,7 @@
           "eu-central-1" : { },
           "eu-central-2" : { },
           "eu-north-1" : { },
+          "eu-south-1" : { },
           "eu-south-2" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
@@ -22974,6 +23005,7 @@
               "tags" : [ "dualstack" ]
             } ]
           },
+          "ap-southeast-6" : { },
           "ap-southeast-7" : {
             "variants" : [ {
               "hostname" : "securityhub.ap-southeast-7.api.aws",
@@ -24129,23 +24161,6 @@
           "us-west-2" : { }
         }
       },
-      "sms" : {
-        "endpoints" : {
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "deprecated" : true,
-            "hostname" : "sms-fips.us-west-2.amazonaws.com"
-          },
-          "us-west-2" : {
-            "variants" : [ {
-              "hostname" : "sms-fips.us-west-2.amazonaws.com",
-              "tags" : [ "fips" ]
-            } ]
-          }
-        }
-      },
       "sms-voice" : {
         "endpoints" : {
           "af-south-1" : {
@@ -27375,6 +27390,7 @@
         "endpoints" : {
           "af-south-1" : { },
           "ap-east-1" : { },
+          "ap-east-2" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-northeast-3" : { },
@@ -30775,11 +30791,6 @@
           }
         }
       },
-      "sms" : {
-        "endpoints" : {
-          "cn-north-1" : { }
-        }
-      },
       "snowball" : {
         "endpoints" : {
           "cn-north-1" : {
@@ -30989,6 +31000,12 @@
           "cn-northwest-1" : { }
         }
       },
+      "verifiedpermissions" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
       "waf-regional" : {
         "endpoints" : {
           "cn-north-1" : {
@@ -31653,6 +31670,12 @@
           }
         }
       },
+      "aps" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
       "arc-zonal-shift" : {
         "endpoints" : {
           "us-gov-east-1" : { },
@@ -35863,23 +35886,6 @@
           }
         }
       },
-      "sms" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "deprecated" : true,
-            "hostname" : "sms-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "variants" : [ {
-              "hostname" : "sms-fips.us-gov-west-1.amazonaws.com",
-              "tags" : [ "fips" ]
-            } ]
-          }
-        }
-      },
       "sms-voice" : {
         "endpoints" : {
           "fips-us-gov-east-1" : {
@@ -37348,6 +37354,11 @@
           "us-iso-east-1" : { }
         }
       },
+      "kinesisvideo" : {
+        "endpoints" : {
+          "us-iso-east-1" : { }
+        }
+      },
       "kms" : {
         "endpoints" : {
           "ProdFips" : {
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java
index 075ae34f4569..7d7c64aeef0a 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java
@@ -36,7 +36,7 @@ public class PartitionServiceMetadataTest {
             "iot", "kinesis", "kinesisanalytics", "kms", "lambda", "lightsail", "logs", "machinelearning",
             "marketplacecommerceanalytics", "metering.marketplace", "mobileanalytics", "monitoring",
             "pinpoint", "polly", "rds", "redshift", "rekognition", "route53domains", "s3",
-            "sdb", "servicecatalog", "sms", "snowball", "sns", "sqs", "ssm", "states", "storagegateway",
+            "sdb", "servicecatalog", "snowball", "sns", "sqs", "ssm", "states", "storagegateway",
             "streams.dynamodb", "sts", "support", "swf", "waf-regional", "workspaces", "xray");
 
     private static final List<String> AWS_CN_PARTITION_GLOBAL_SERVICES = Arrays.asList("iam");
diff --git a/core/retries-spi/pom.xml b/core/retries-spi/pom.xml
index 4a80ded773c9..08eac526410a 100644
--- a/core/retries-spi/pom.xml
+++ b/core/retries-spi/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/retries/pom.xml b/core/retries/pom.xml
index a90594acd8da..43ebddc18d63 100644
--- a/core/retries/pom.xml
+++ b/core/retries/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml
index 8332475b5e5d..7b496732574b 100644
--- a/core/sdk-core/pom.xml
+++ b/core/sdk-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/SdkLengthAwareInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/SdkLengthAwareInputStream.java
index 5f4c019bd25c..f4ecdd2d7d23 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/SdkLengthAwareInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/SdkLengthAwareInputStream.java
@@ -32,13 +32,15 @@
 @SdkInternalApi
 public class SdkLengthAwareInputStream extends FilterInputStream {
     private static final Logger LOG = Logger.loggerFor(SdkLengthAwareInputStream.class);
-    private long length;
+    private final long length;
     private long remaining;
+    private long markedRemaining;
 
     public SdkLengthAwareInputStream(InputStream in, long length) {
         super(in);
         this.length = Validate.isNotNegative(length, "length");
         this.remaining = this.length;
+        this.markedRemaining = this.remaining;
     }
 
     @Override
@@ -104,15 +106,14 @@ public int available() throws IOException {
     @Override
     public void mark(int readlimit) {
         super.mark(readlimit);
-        // mark() causes reset() to change the stream's position back to the current position. Therefore, when reset() is called,
-        // the new length of the stream will be equal to the current value of 'remaining'.
-        length = remaining;
+        // Store the current remaining bytes to restore on reset()
+        markedRemaining = remaining;
     }
 
     @Override
     public void reset() throws IOException {
         super.reset();
-        remaining = length;
+        remaining = markedRemaining;
     }
 
     public long remaining() {
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/SdkLengthAwareInputStreamTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/SdkLengthAwareInputStreamTest.java
index 3219041e6f56..8f76213e54fc 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/SdkLengthAwareInputStreamTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/SdkLengthAwareInputStreamTest.java
@@ -249,6 +249,27 @@ void readByte_readExactLength_doesNotThrow() throws IOException {
         assertThat(total).isEqualTo(delegateLength);
     }
 
+    @Test
+    void readBytePartialThenMark_doesNotResetContentLength() throws IOException {
+        int delegateLength = 16;
+        int expectedContentLength = delegateLength + 1;
+        ByteArrayInputStream delegate = new ByteArrayInputStream(new byte[delegateLength]);
+
+        SdkLengthAwareInputStream is = new SdkLengthAwareInputStream(delegate, expectedContentLength);
+        is.read(); // read one byte
+        is.mark(1024);
+        // read another byte and reset, the length should not be reset based on the byte that was already read
+        is.read();
+        is.reset();
+        assertThatThrownBy(() -> {
+            int read;
+            while ((read = is.read()) != -1) {
+            }
+        })
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("The request content has fewer bytes than the specified content-length: " + expectedContentLength);
+    }
+
     @Test
     void readByte_delegateLongerThanRequired_truncated() throws IOException {
         int delegateLength = 32;
diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml
index 71d796684100..3dcebe9c776e 100644
--- a/http-client-spi/pom.xml
+++ b/http-client-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>http-client-spi</artifactId>
     <name>AWS Java SDK :: HTTP Client Interface</name>
diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml
index c924d78b5199..6031865d164f 100644
--- a/http-clients/apache-client/pom.xml
+++ b/http-clients/apache-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-client</artifactId>
diff --git a/http-clients/apache5-client/pom.xml b/http-clients/apache5-client/pom.xml
index a8d6de22a96e..21df3e4c71b8 100644
--- a/http-clients/apache5-client/pom.xml
+++ b/http-clients/apache5-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache5-client</artifactId>
diff --git a/http-clients/aws-crt-client/pom.xml b/http-clients/aws-crt-client/pom.xml
index cf5af97c751d..b8bb7e04b04e 100644
--- a/http-clients/aws-crt-client/pom.xml
+++ b/http-clients/aws-crt-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml
index ff9a79120cce..29bedd005f30 100644
--- a/http-clients/netty-nio-client/pom.xml
+++ b/http-clients/netty-nio-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/http-clients/pom.xml b/http-clients/pom.xml
index c17741ff6369..40d36efd735e 100644
--- a/http-clients/pom.xml
+++ b/http-clients/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml
index bbd814dc8b95..162afeaaf606 100644
--- a/http-clients/url-connection-client/pom.xml
+++ b/http-clients/url-connection-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/metric-publishers/cloudwatch-metric-publisher/pom.xml b/metric-publishers/cloudwatch-metric-publisher/pom.xml
index 5c745d4fbe7b..fa41b0129f1e 100644
--- a/metric-publishers/cloudwatch-metric-publisher/pom.xml
+++ b/metric-publishers/cloudwatch-metric-publisher/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>metric-publishers</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudwatch-metric-publisher</artifactId>
diff --git a/metric-publishers/emf-metric-logging-publisher/pom.xml b/metric-publishers/emf-metric-logging-publisher/pom.xml
index 22ca77daa3eb..f47907435e81 100644
--- a/metric-publishers/emf-metric-logging-publisher/pom.xml
+++ b/metric-publishers/emf-metric-logging-publisher/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>metric-publishers</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>emf-metric-logging-publisher</artifactId>
diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml
index 02d0c6532135..8c84d442983f 100644
--- a/metric-publishers/pom.xml
+++ b/metric-publishers/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>metric-publishers</artifactId>
diff --git a/pom.xml b/pom.xml
index 71f8bf895558..f17c3edd3537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>software.amazon.awssdk</groupId>
     <artifactId>aws-sdk-java-pom</artifactId>
-    <version>2.33.8-SNAPSHOT</version>
+    <version>2.34.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>AWS Java SDK :: Parent</name>
     <description>The Amazon Web Services SDK for Java provides Java APIs
@@ -67,6 +67,7 @@
         <module>metric-publishers</module>
         <module>release-scripts</module>
         <module>utils</module>
+        <module>utils-lite</module>
         <module>codegen-lite</module>
         <module>codegen-lite-maven-plugin</module>
         <module>archetypes</module>
@@ -102,8 +103,8 @@
     </scm>
     <properties>
         <awsjavasdk.version>${project.version}</awsjavasdk.version>
-        <awsjavasdk.previous.version>2.33.7</awsjavasdk.previous.version>
-        <awsjavasdk.previous-previous.version>2.33.6</awsjavasdk.previous-previous.version>
+        <awsjavasdk.previous.version>2.34.5</awsjavasdk.previous.version>
+        <awsjavasdk.previous-previous.version>2.34.4</awsjavasdk.previous-previous.version>
         <jackson.version>2.15.2</jackson.version>
         <jackson.databind.version>2.15.2</jackson.databind.version>
         <jacksonjr.version>2.17.3</jacksonjr.version>
@@ -162,6 +163,7 @@
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <checkstyle.version>8.42</checkstyle.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+        <central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
@@ -239,7 +241,6 @@
                             <exclude>software/amazon/awssdk/services/kinesis/KinesisAsyncClient.java</exclude>
                             <exclude>software/amazon/awssdk/services/kinesis/DefaultKinesisAsyncClient.java</exclude>
                             <exclude>software/amazon/awssdk/services/kinesis/DefaultKinesisBaseClientBuilder.java</exclude>
-                            <exclude>software/amazon/awssdk/services/sms/model/InternalError.java</exclude>
                             <exclude>software/amazon/awssdk/services/kinesis/transform/SubscribeToShardResponseUnmarshaller.java</exclude>
                         </excludes>
                     </configuration>
@@ -665,6 +666,7 @@
                             <includeModule>cloudwatch-metric-publisher</includeModule>
                             <includeModule>emf-metric-logging-publisher</includeModule>
                             <includeModule>utils</includeModule>
+                            <includeModule>utils-lite</includeModule>
                             <includeModule>imds</includeModule>
                             <includeModule>retries</includeModule>
                             <includeModule>retries-spi</includeModule>
@@ -746,7 +748,46 @@
                 <javadoc.skip>true</javadoc.skip>
             </properties>
         </profile>
-
+        <profile>
+            <!-- This is the new maven publishing profile. It's similar to the "publishing" profile except
+            for the fact that it uses the maven central publishing plugin instead of the nexus publishing plugin.
+            Once OSSRH is disabled we can rename this "publishing", and remove the existing publishing profile -->
+            <id>central-portal-publishing</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${maven-gpg-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <gpgArguments>
+                                <arg>--batch</arg>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>${central-publishing-maven-plugin.version}</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>central</publishingServerId>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>publishing</id>
             <build>
@@ -1433,10 +1474,6 @@
                                     <title>Budgets</title>
                                     <packages>software.amazon.awssdk.services.budgets*</packages>
                                 </group>
-                                <group>
-                                    <title>Server Migration</title>
-                                    <packages>software.amazon.awssdk.services.sms*</packages>
-                                </group>
                                 <group>
                                     <title>Rekognition</title>
                                     <packages>software.amazon.awssdk.services.rekognition*</packages>
diff --git a/release-scripts/pom.xml b/release-scripts/pom.xml
index 82807ca39760..32177b3b3d7c 100644
--- a/release-scripts/pom.xml
+++ b/release-scripts/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>release-scripts</artifactId>
diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml
index ebc32d4ee26d..9ae78aad5f7f 100644
--- a/services-custom/dynamodb-enhanced/pom.xml
+++ b/services-custom/dynamodb-enhanced/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services-custom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>dynamodb-enhanced</artifactId>
     <name>AWS Java SDK :: DynamoDB :: Enhanced Client</name>
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/JsonStringFormatHelper.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/JsonStringFormatHelper.java
index 327653a9eb04..2381f1943d4d 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/JsonStringFormatHelper.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/document/JsonStringFormatHelper.java
@@ -46,44 +46,72 @@ public static String stringValue(JsonNode jsonNode) {
     }
 
     /**
-     * Escapes characters for a give given string
+     * Escapes characters for a given string
      *
      * @param input Input string
      * @return String with escaped characters.
      */
     public static String addEscapeCharacters(String input) {
-        StringBuilder output = new StringBuilder();
-        for (int i = 0; i < input.length(); i++) {
+        StringBuilder output = null;
+        int len = input.length();
+
+        for (int i = 0; i < len; i++) {
             char ch = input.charAt(i);
-            switch (ch) {
-                case '\\':
-                    output.append("\\\\"); // escape backslash with a backslash
-                    break;
-                case '\n':
-                    output.append("\\n"); // newline character
-                    break;
-                case '\r':
-                    output.append("\\r"); // carriage return character
-                    break;
-                case '\t':
-                    output.append("\\t"); // tab character
-                    break;
-                case '\f':
-                    output.append("\\f"); // form feed
-                    break;
-                case '\"':
-                    output.append("\\\""); // double-quote character
-                    break;
-                default:
-                    if (Character.isISOControl(ch)) {
-                        output.append(String.format("\\u%04X", (int) ch));
-                    } else {
-                        output.append(ch);
-                    }
-                    break;
+            if (needsEscaping(ch)) {
+                if (output == null) {
+                    output = initializeStringBuilder(input, i);
+                }
+                appendEscapeChar(output, ch);
+            } else if (output != null) {
+                output.append(ch);
             }
         }
-        return output.toString();
+
+        return output == null ? input : output.toString();
+    }
+
+    private static boolean needsEscaping(char ch) {
+        return Character.isISOControl(ch) || ch == '"' || ch == '\\';
+    }
+
+    /**
+     * Initialize StringBuilder with the unescaped portion of the input.
+     */
+    private static StringBuilder initializeStringBuilder(String input, int position) {
+        // Arbitrary buffer of 16
+        StringBuilder builder = new StringBuilder(input.length() + 16);
+        builder.append(input, 0, position);
+        return builder;
+    }
+
+    private static void appendEscapeChar(StringBuilder output, char ch) {
+        switch (ch) {
+            case '\\':
+                output.append("\\\\"); // escape backslash with a backslash
+                break;
+            case '\n':
+                output.append("\\n"); // newline character
+                break;
+            case '\r':
+                output.append("\\r"); // carriage return character
+                break;
+            case '\t':
+                output.append("\\t"); // tab character
+                break;
+            case '\f':
+                output.append("\\f"); // form feed
+                break;
+            case '\"':
+                output.append("\\\""); // double-quote character
+                break;
+            default:
+                if (Character.isISOControl(ch)) {
+                    output.append(String.format("\\u%04X", (int) ch));
+                } else {
+                    output.append(ch);
+                }
+                break;
+        }
     }
 
     private static String mapToString(JsonNode jsonNode) {
diff --git a/services-custom/iam-policy-builder/pom.xml b/services-custom/iam-policy-builder/pom.xml
index 13fc4722f0fc..e3886023485b 100644
--- a/services-custom/iam-policy-builder/pom.xml
+++ b/services-custom/iam-policy-builder/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>iam-policy-builder</artifactId>
diff --git a/services-custom/pom.xml b/services-custom/pom.xml
index e4973908dd7f..60d7f93bc7a5 100644
--- a/services-custom/pom.xml
+++ b/services-custom/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>services-custom</artifactId>
     <name>AWS Java SDK :: Custom Services</name>
diff --git a/services-custom/s3-event-notifications/pom.xml b/services-custom/s3-event-notifications/pom.xml
index 379a47073034..33d3d3253186 100644
--- a/services-custom/s3-event-notifications/pom.xml
+++ b/services-custom/s3-event-notifications/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>s3-event-notifications</artifactId>
diff --git a/services-custom/s3-transfer-manager/pom.xml b/services-custom/s3-transfer-manager/pom.xml
index 46bf94202f43..080ec9f7456a 100644
--- a/services-custom/s3-transfer-manager/pom.xml
+++ b/services-custom/s3-transfer-manager/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>s3-transfer-manager</artifactId>
diff --git a/services/accessanalyzer/pom.xml b/services/accessanalyzer/pom.xml
index b9087cd2ad7f..ef6d086ffe9f 100644
--- a/services/accessanalyzer/pom.xml
+++ b/services/accessanalyzer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>accessanalyzer</artifactId>
     <name>AWS Java SDK :: Services :: AccessAnalyzer</name>
diff --git a/services/account/pom.xml b/services/account/pom.xml
index 991aee9b4d2b..0b3cfea4f23b 100644
--- a/services/account/pom.xml
+++ b/services/account/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>account</artifactId>
     <name>AWS Java SDK :: Services :: Account</name>
diff --git a/services/acm/pom.xml b/services/acm/pom.xml
index 0be38bab6884..caea338a8dba 100644
--- a/services/acm/pom.xml
+++ b/services/acm/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>acm</artifactId>
     <name>AWS Java SDK :: Services :: AWS Certificate Manager</name>
diff --git a/services/acmpca/pom.xml b/services/acmpca/pom.xml
index 535a1417dfae..5bd8ba1e2a38 100644
--- a/services/acmpca/pom.xml
+++ b/services/acmpca/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>acmpca</artifactId>
     <name>AWS Java SDK :: Services :: ACM PCA</name>
diff --git a/services/aiops/pom.xml b/services/aiops/pom.xml
index 50ee87cc8715..ef407891fe8f 100644
--- a/services/aiops/pom.xml
+++ b/services/aiops/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>aiops</artifactId>
     <name>AWS Java SDK :: Services :: AI Ops</name>
diff --git a/services/amp/pom.xml b/services/amp/pom.xml
index 4d82328be6ba..c55e8dc55d3a 100644
--- a/services/amp/pom.xml
+++ b/services/amp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>amp</artifactId>
     <name>AWS Java SDK :: Services :: Amp</name>
diff --git a/services/amp/src/main/resources/codegen-resources/service-2.json b/services/amp/src/main/resources/codegen-resources/service-2.json
index 5451744f3654..8e3d736eda94 100644
--- a/services/amp/src/main/resources/codegen-resources/service-2.json
+++ b/services/amp/src/main/resources/codegen-resources/service-2.json
@@ -245,6 +245,24 @@
       "documentation":"<p>The <code>DeleteScraper</code> operation deletes one scraper, and stops any metrics collection that the scraper performs.</p>",
       "idempotent":true
     },
+    "DeleteScraperLoggingConfiguration":{
+      "name":"DeleteScraperLoggingConfiguration",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/scrapers/{scraperId}/logging-configuration",
+        "responseCode":202
+      },
+      "input":{"shape":"DeleteScraperLoggingConfigurationRequest"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes the logging configuration for a Amazon Managed Service for Prometheus scraper.</p>",
+      "idempotent":true
+    },
     "DeleteWorkspace":{
       "name":"DeleteWorkspace",
       "http":{
@@ -370,6 +388,23 @@
       ],
       "documentation":"<p>The <code>DescribeScraper</code> operation displays information about an existing scraper.</p>"
     },
+    "DescribeScraperLoggingConfiguration":{
+      "name":"DescribeScraperLoggingConfiguration",
+      "http":{
+        "method":"GET",
+        "requestUri":"/scrapers/{scraperId}/logging-configuration",
+        "responseCode":200
+      },
+      "input":{"shape":"DescribeScraperLoggingConfigurationRequest"},
+      "output":{"shape":"DescribeScraperLoggingConfigurationResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Describes the logging configuration for a Amazon Managed Service for Prometheus scraper.</p>"
+    },
     "DescribeWorkspace":{
       "name":"DescribeWorkspace",
       "http":{
@@ -650,6 +685,25 @@
       "documentation":"<p>Updates an existing scraper.</p> <p>You can't use this function to update the source from which the scraper is collecting metrics. To change the source, delete the scraper and create a new one.</p>",
       "idempotent":true
     },
+    "UpdateScraperLoggingConfiguration":{
+      "name":"UpdateScraperLoggingConfiguration",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/scrapers/{scraperId}/logging-configuration",
+        "responseCode":202
+      },
+      "input":{"shape":"UpdateScraperLoggingConfigurationRequest"},
+      "output":{"shape":"UpdateScraperLoggingConfigurationResponse"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates the logging configuration for a Amazon Managed Service for Prometheus scraper.</p>",
+      "idempotent":true
+    },
     "UpdateWorkspaceAlias":{
       "name":"UpdateWorkspaceAlias",
       "http":{
@@ -796,6 +850,16 @@
       "documentation":"<p>The ARN of an EKS cluster.</p>",
       "pattern":"arn:aws[-a-z]*:eks:[-a-z0-9]+:[0-9]{12}:cluster/.+"
     },
+    "ComponentConfig":{
+      "type":"structure",
+      "members":{
+        "options":{
+          "shape":"StringMap",
+          "documentation":"<p>Configuration options for the scraper component.</p>"
+        }
+      },
+      "documentation":"<p>Configuration settings for a scraper component.</p>"
+    },
     "ConflictException":{
       "type":"structure",
       "required":[
@@ -1225,6 +1289,25 @@
       },
       "documentation":"<p>Represents the input of a <code>DeleteRuleGroupsNamespace</code> operation.</p>"
     },
+    "DeleteScraperLoggingConfigurationRequest":{
+      "type":"structure",
+      "required":["scraperId"],
+      "members":{
+        "scraperId":{
+          "shape":"ScraperId",
+          "documentation":"<p>The ID of the scraper whose logging configuration will be deleted.</p>",
+          "location":"uri",
+          "locationName":"scraperId"
+        },
+        "clientToken":{
+          "shape":"IdempotencyToken",
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the request is processed exactly once.</p>",
+          "idempotencyToken":true,
+          "location":"querystring",
+          "locationName":"clientToken"
+        }
+      }
+    },
     "DeleteScraperRequest":{
       "type":"structure",
       "required":["scraperId"],
@@ -1420,6 +1503,50 @@
       },
       "documentation":"<p>Represents the output of a <code>DescribeRuleGroupsNamespace</code> operation.</p>"
     },
+    "DescribeScraperLoggingConfigurationRequest":{
+      "type":"structure",
+      "required":["scraperId"],
+      "members":{
+        "scraperId":{
+          "shape":"ScraperId",
+          "documentation":"<p>The ID of the scraper whose logging configuration will be described.</p>",
+          "location":"uri",
+          "locationName":"scraperId"
+        }
+      }
+    },
+    "DescribeScraperLoggingConfigurationResponse":{
+      "type":"structure",
+      "required":[
+        "status",
+        "scraperId",
+        "loggingDestination",
+        "scraperComponents",
+        "modifiedAt"
+      ],
+      "members":{
+        "status":{
+          "shape":"ScraperLoggingConfigurationStatus",
+          "documentation":"<p>The status of the scraper logging configuration.</p>"
+        },
+        "scraperId":{
+          "shape":"ScraperId",
+          "documentation":"<p>The ID of the scraper.</p>"
+        },
+        "loggingDestination":{
+          "shape":"ScraperLoggingDestination",
+          "documentation":"<p>The destination where scraper logs are sent.</p>"
+        },
+        "scraperComponents":{
+          "shape":"ScraperComponents",
+          "documentation":"<p>The list of scraper components configured for logging.</p>"
+        },
+        "modifiedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time when the logging configuration was last modified.</p>"
+        }
+      }
+    },
     "DescribeScraperRequest":{
       "type":"structure",
       "required":["scraperId"],
@@ -1544,8 +1671,7 @@
     },
     "GetDefaultScraperConfigurationRequest":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "documentation":"<p>Represents the input of a <code>GetDefaultScraperConfiguration</code> operation.</p>"
     },
     "GetDefaultScraperConfigurationResponse":{
@@ -2221,7 +2347,7 @@
     "RuleGroupsNamespaceName":{
       "type":"string",
       "documentation":"<p>The name of the namespace that the rule group belong to.</p>",
-      "max":64,
+      "max":128,
       "min":1,
       "pattern":".*[0-9A-Za-z][-.0-9A-Z_a-z]*.*"
     },
@@ -2316,6 +2442,34 @@
       "type":"string",
       "documentation":"<p>An ARN identifying a scrape configuration.</p>"
     },
+    "ScraperComponent":{
+      "type":"structure",
+      "required":["type"],
+      "members":{
+        "type":{
+          "shape":"ScraperComponentType",
+          "documentation":"<p>The type of the scraper component.</p>"
+        },
+        "config":{
+          "shape":"ComponentConfig",
+          "documentation":"<p>The configuration settings for the scraper component.</p>"
+        }
+      },
+      "documentation":"<p>A component of a Amazon Managed Service for Prometheus scraper that can be configured for logging.</p>"
+    },
+    "ScraperComponentType":{
+      "type":"string",
+      "enum":[
+        "SERVICE_DISCOVERY",
+        "COLLECTOR",
+        "EXPORTER"
+      ]
+    },
+    "ScraperComponents":{
+      "type":"list",
+      "member":{"shape":"ScraperComponent"},
+      "min":1
+    },
     "ScraperDescription":{
       "type":"structure",
       "required":[
@@ -2406,6 +2560,43 @@
       "min":1,
       "pattern":"[0-9A-Za-z][-.0-9A-Z_a-z]*"
     },
+    "ScraperLoggingConfigurationStatus":{
+      "type":"structure",
+      "required":["statusCode"],
+      "members":{
+        "statusCode":{
+          "shape":"ScraperLoggingConfigurationStatusCode",
+          "documentation":"<p>The status code of the scraper logging configuration.</p>"
+        },
+        "statusReason":{
+          "shape":"String",
+          "documentation":"<p>The reason for the current status of the scraper logging configuration.</p>"
+        }
+      },
+      "documentation":"<p>The status of a scraper logging configuration.</p>"
+    },
+    "ScraperLoggingConfigurationStatusCode":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "ACTIVE",
+        "UPDATING",
+        "DELETING",
+        "CREATION_FAILED",
+        "UPDATE_FAILED"
+      ]
+    },
+    "ScraperLoggingDestination":{
+      "type":"structure",
+      "members":{
+        "cloudWatchLogs":{
+          "shape":"CloudWatchLogDestination",
+          "documentation":"<p>The CloudWatch Logs configuration for the scraper logging destination.</p>"
+        }
+      },
+      "documentation":"<p>The destination where scraper logs are sent.</p>",
+      "union":true
+    },
     "ScraperStatus":{
       "type":"structure",
       "required":["statusCode"],
@@ -2569,6 +2760,11 @@
       "min":1
     },
     "String":{"type":"string"},
+    "StringMap":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"String"}
+    },
     "SubnetId":{
       "type":"string",
       "documentation":"<p>ID of a VPC subnet.</p>",
@@ -2628,8 +2824,7 @@
     },
     "TagResourceResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "TagValue":{
       "type":"string",
@@ -2692,8 +2887,7 @@
     },
     "UntagResourceResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "UpdateLoggingConfigurationRequest":{
       "type":"structure",
@@ -2765,6 +2959,39 @@
         }
       }
     },
+    "UpdateScraperLoggingConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "scraperId",
+        "loggingDestination"
+      ],
+      "members":{
+        "scraperId":{
+          "shape":"ScraperId",
+          "documentation":"<p>The ID of the scraper whose logging configuration will be updated.</p>",
+          "location":"uri",
+          "locationName":"scraperId"
+        },
+        "loggingDestination":{
+          "shape":"ScraperLoggingDestination",
+          "documentation":"<p>The destination where scraper logs will be sent.</p>"
+        },
+        "scraperComponents":{
+          "shape":"ScraperComponents",
+          "documentation":"<p>The list of scraper components to configure for logging.</p>"
+        }
+      }
+    },
+    "UpdateScraperLoggingConfigurationResponse":{
+      "type":"structure",
+      "required":["status"],
+      "members":{
+        "status":{
+          "shape":"ScraperLoggingConfigurationStatus",
+          "documentation":"<p>The status of the updated scraper logging configuration.</p>"
+        }
+      }
+    },
     "UpdateScraperRequest":{
       "type":"structure",
       "required":["scraperId"],
diff --git a/services/amplify/pom.xml b/services/amplify/pom.xml
index c3c46c8a1b0c..5efe7741c96b 100644
--- a/services/amplify/pom.xml
+++ b/services/amplify/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>amplify</artifactId>
     <name>AWS Java SDK :: Services :: Amplify</name>
diff --git a/services/amplifybackend/pom.xml b/services/amplifybackend/pom.xml
index e027fcfe6555..aa5db4bcb5d8 100644
--- a/services/amplifybackend/pom.xml
+++ b/services/amplifybackend/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>amplifybackend</artifactId>
     <name>AWS Java SDK :: Services :: Amplify Backend</name>
diff --git a/services/amplifyuibuilder/pom.xml b/services/amplifyuibuilder/pom.xml
index 7f8e06f7fc28..8144cd61619e 100644
--- a/services/amplifyuibuilder/pom.xml
+++ b/services/amplifyuibuilder/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>amplifyuibuilder</artifactId>
     <name>AWS Java SDK :: Services :: Amplify UI Builder</name>
diff --git a/services/apigateway/pom.xml b/services/apigateway/pom.xml
index bb90af6dbd9a..51fcf1e19130 100644
--- a/services/apigateway/pom.xml
+++ b/services/apigateway/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>apigateway</artifactId>
     <name>AWS Java SDK :: Services :: Amazon API Gateway</name>
diff --git a/services/apigatewaymanagementapi/pom.xml b/services/apigatewaymanagementapi/pom.xml
index ffdde211f92f..855890362d82 100644
--- a/services/apigatewaymanagementapi/pom.xml
+++ b/services/apigatewaymanagementapi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>apigatewaymanagementapi</artifactId>
     <name>AWS Java SDK :: Services :: ApiGatewayManagementApi</name>
diff --git a/services/apigatewayv2/pom.xml b/services/apigatewayv2/pom.xml
index 4e8c546510c4..f0a9464e7c6d 100644
--- a/services/apigatewayv2/pom.xml
+++ b/services/apigatewayv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>apigatewayv2</artifactId>
     <name>AWS Java SDK :: Services :: ApiGatewayV2</name>
diff --git a/services/appconfig/pom.xml b/services/appconfig/pom.xml
index 682b7a79fa09..2376147a90bc 100644
--- a/services/appconfig/pom.xml
+++ b/services/appconfig/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>appconfig</artifactId>
     <name>AWS Java SDK :: Services :: AppConfig</name>
diff --git a/services/appconfigdata/pom.xml b/services/appconfigdata/pom.xml
index d44e6aa516d2..90a2b0845e98 100644
--- a/services/appconfigdata/pom.xml
+++ b/services/appconfigdata/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>appconfigdata</artifactId>
     <name>AWS Java SDK :: Services :: App Config Data</name>
diff --git a/services/appfabric/pom.xml b/services/appfabric/pom.xml
index 4f2910291cbe..6d425a80858d 100644
--- a/services/appfabric/pom.xml
+++ b/services/appfabric/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>appfabric</artifactId>
     <name>AWS Java SDK :: Services :: App Fabric</name>
diff --git a/services/appflow/pom.xml b/services/appflow/pom.xml
index d8b3bd661460..b8e544141749 100644
--- a/services/appflow/pom.xml
+++ b/services/appflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>appflow</artifactId>
     <name>AWS Java SDK :: Services :: Appflow</name>
diff --git a/services/appintegrations/pom.xml b/services/appintegrations/pom.xml
index fc141df90a80..8ede97ac9f7a 100644
--- a/services/appintegrations/pom.xml
+++ b/services/appintegrations/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>appintegrations</artifactId>
     <name>AWS Java SDK :: Services :: App Integrations</name>
diff --git a/services/applicationautoscaling/pom.xml b/services/applicationautoscaling/pom.xml
index 4ce069b3e8ef..e4ab383297a6 100644
--- a/services/applicationautoscaling/pom.xml
+++ b/services/applicationautoscaling/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>applicationautoscaling</artifactId>
     <name>AWS Java SDK :: Services :: AWS Application Auto Scaling</name>
diff --git a/services/applicationcostprofiler/pom.xml b/services/applicationcostprofiler/pom.xml
index 970205a91139..01ff4bdc3eb9 100644
--- a/services/applicationcostprofiler/pom.xml
+++ b/services/applicationcostprofiler/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>applicationcostprofiler</artifactId>
     <name>AWS Java SDK :: Services :: Application Cost Profiler</name>
diff --git a/services/applicationdiscovery/pom.xml b/services/applicationdiscovery/pom.xml
index 8e4c6ea99c7c..cc46be37e346 100644
--- a/services/applicationdiscovery/pom.xml
+++ b/services/applicationdiscovery/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>applicationdiscovery</artifactId>
     <name>AWS Java SDK :: Services :: AWS Application Discovery Service</name>
diff --git a/services/applicationinsights/pom.xml b/services/applicationinsights/pom.xml
index 73ce603095f6..b36ed014dfab 100644
--- a/services/applicationinsights/pom.xml
+++ b/services/applicationinsights/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>applicationinsights</artifactId>
     <name>AWS Java SDK :: Services :: Application Insights</name>
diff --git a/services/applicationsignals/pom.xml b/services/applicationsignals/pom.xml
index 3624b6bd619e..013ade6d8f46 100644
--- a/services/applicationsignals/pom.xml
+++ b/services/applicationsignals/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>applicationsignals</artifactId>
     <name>AWS Java SDK :: Services :: Application Signals</name>
diff --git a/services/appmesh/pom.xml b/services/appmesh/pom.xml
index 424173820030..621e8e7d4acc 100644
--- a/services/appmesh/pom.xml
+++ b/services/appmesh/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>appmesh</artifactId>
     <name>AWS Java SDK :: Services :: App Mesh</name>
diff --git a/services/apprunner/pom.xml b/services/apprunner/pom.xml
index 14b3b92dae4b..da6c9d3ee6ac 100644
--- a/services/apprunner/pom.xml
+++ b/services/apprunner/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>apprunner</artifactId>
     <name>AWS Java SDK :: Services :: App Runner</name>
diff --git a/services/appstream/pom.xml b/services/appstream/pom.xml
index cec092226805..82281d366244 100644
--- a/services/appstream/pom.xml
+++ b/services/appstream/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>appstream</artifactId>
     <name>AWS Java SDK :: Services :: Amazon AppStream</name>
diff --git a/services/appstream/src/main/resources/codegen-resources/service-2.json b/services/appstream/src/main/resources/codegen-resources/service-2.json
index 1889acd2fe26..f71fe1e390e6 100644
--- a/services/appstream/src/main/resources/codegen-resources/service-2.json
+++ b/services/appstream/src/main/resources/codegen-resources/service-2.json
@@ -2236,7 +2236,7 @@
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p>The instance type to use when launching fleet instances. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.standard.xlarge</p> </li> <li> <p>stream.standard.2xlarge</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics.g5.xlarge</p> </li> <li> <p>stream.graphics.g5.2xlarge</p> </li> <li> <p>stream.graphics.g5.4xlarge</p> </li> <li> <p>stream.graphics.g5.8xlarge</p> </li> <li> <p>stream.graphics.g5.12xlarge</p> </li> <li> <p>stream.graphics.g5.16xlarge</p> </li> <li> <p>stream.graphics.g5.24xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> <li> <p>stream.graphics.g6.xlarge</p> </li> <li> <p>stream.graphics.g6.2xlarge</p> </li> <li> <p>stream.graphics.g6.4xlarge</p> </li> <li> <p>stream.graphics.g6.8xlarge</p> </li> <li> <p>stream.graphics.g6.16xlarge</p> </li> <li> <p>stream.graphics.g6.12xlarge</p> </li> <li> <p>stream.graphics.g6.24xlarge</p> </li> <li> <p>stream.graphics.gr6.4xlarge</p> </li> <li> <p>stream.graphics.gr6.8xlarge</p> </li> </ul> <p>The following instance types are available for Elastic fleets:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.standard.xlarge</p> </li> <li> <p>stream.standard.2xlarge</p> </li> </ul>"
+          "documentation":"<p>The instance type to use when launching fleet instances. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.standard.xlarge</p> </li> <li> <p>stream.standard.2xlarge</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics.g5.xlarge</p> </li> <li> <p>stream.graphics.g5.2xlarge</p> </li> <li> <p>stream.graphics.g5.4xlarge</p> </li> <li> <p>stream.graphics.g5.8xlarge</p> </li> <li> <p>stream.graphics.g5.12xlarge</p> </li> <li> <p>stream.graphics.g5.16xlarge</p> </li> <li> <p>stream.graphics.g5.24xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> <li> <p>stream.graphics.g6.xlarge</p> </li> <li> <p>stream.graphics.g6.2xlarge</p> </li> <li> <p>stream.graphics.g6.4xlarge</p> </li> <li> <p>stream.graphics.g6.8xlarge</p> </li> <li> <p>stream.graphics.g6.16xlarge</p> </li> <li> <p>stream.graphics.g6.12xlarge</p> </li> <li> <p>stream.graphics.g6.24xlarge</p> </li> <li> <p>stream.graphics.gr6.4xlarge</p> </li> <li> <p>stream.graphics.gr6.8xlarge</p> </li> <li> <p>stream.graphics.g6f.large</p> </li> <li> <p>stream.graphics.g6f.xlarge</p> </li> <li> <p>stream.graphics.g6f.2xlarge</p> </li> <li> <p>stream.graphics.g6f.4xlarge</p> </li> <li> <p>stream.graphics.gr6f.4xlarge</p> </li> </ul> <p>The following instance types are available for Elastic fleets:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.standard.xlarge</p> </li> <li> <p>stream.standard.2xlarge</p> </li> </ul>"
         },
         "FleetType":{
           "shape":"FleetType",
@@ -2342,7 +2342,7 @@
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p>The instance type to use when launching the image builder. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> <li> <p>stream.graphics.g5.xlarge</p> </li> <li> <p>stream.graphics.g5.2xlarge</p> </li> <li> <p>stream.graphics.g5.4xlarge</p> </li> <li> <p>stream.graphics.g5.8xlarge</p> </li> <li> <p>stream.graphics.g5.16xlarge</p> </li> <li> <p>stream.graphics.g5.12xlarge</p> </li> <li> <p>stream.graphics.g5.24xlarge</p> </li> <li> <p>stream.graphics.g6.xlarge</p> </li> <li> <p>stream.graphics.g6.2xlarge</p> </li> <li> <p>stream.graphics.g6.4xlarge</p> </li> <li> <p>stream.graphics.g6.8xlarge</p> </li> <li> <p>stream.graphics.g6.16xlarge</p> </li> <li> <p>stream.graphics.g6.12xlarge</p> </li> <li> <p>stream.graphics.g6.24xlarge</p> </li> <li> <p>stream.graphics.gr6.4xlarge</p> </li> <li> <p>stream.graphics.gr6.8xlarge</p> </li> </ul>"
+          "documentation":"<p>The instance type to use when launching the image builder. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> <li> <p>stream.graphics.g5.xlarge</p> </li> <li> <p>stream.graphics.g5.2xlarge</p> </li> <li> <p>stream.graphics.g5.4xlarge</p> </li> <li> <p>stream.graphics.g5.8xlarge</p> </li> <li> <p>stream.graphics.g5.16xlarge</p> </li> <li> <p>stream.graphics.g5.12xlarge</p> </li> <li> <p>stream.graphics.g5.24xlarge</p> </li> <li> <p>stream.graphics.g6.xlarge</p> </li> <li> <p>stream.graphics.g6.2xlarge</p> </li> <li> <p>stream.graphics.g6.4xlarge</p> </li> <li> <p>stream.graphics.g6.8xlarge</p> </li> <li> <p>stream.graphics.g6.16xlarge</p> </li> <li> <p>stream.graphics.g6.12xlarge</p> </li> <li> <p>stream.graphics.g6.24xlarge</p> </li> <li> <p>stream.graphics.gr6.4xlarge</p> </li> <li> <p>stream.graphics.gr6.8xlarge</p> </li> <li> <p>stream.graphics.g6f.large</p> </li> <li> <p>stream.graphics.g6f.xlarge</p> </li> <li> <p>stream.graphics.g6f.2xlarge</p> </li> <li> <p>stream.graphics.g6f.4xlarge</p> </li> <li> <p>stream.graphics.gr6f.4xlarge</p> </li> </ul>"
         },
         "Description":{
           "shape":"Description",
@@ -3818,7 +3818,7 @@
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p>The instance type to use when launching fleet instances. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> <li> <p>stream.graphics.g5.xlarge</p> </li> <li> <p>stream.graphics.g5.2xlarge</p> </li> <li> <p>stream.graphics.g5.4xlarge</p> </li> <li> <p>stream.graphics.g5.8xlarge</p> </li> <li> <p>stream.graphics.g5.16xlarge</p> </li> <li> <p>stream.graphics.g5.12xlarge</p> </li> <li> <p>stream.graphics.g5.24xlarge</p> </li> <li> <p>stream.graphics.g6.xlarge</p> </li> <li> <p>stream.graphics.g6.2xlarge</p> </li> <li> <p>stream.graphics.g6.4xlarge</p> </li> <li> <p>stream.graphics.g6.8xlarge</p> </li> <li> <p>stream.graphics.g6.16xlarge</p> </li> <li> <p>stream.graphics.g6.12xlarge</p> </li> <li> <p>stream.graphics.g6.24xlarge</p> </li> <li> <p>stream.graphics.gr6.4xlarge</p> </li> <li> <p>stream.graphics.gr6.8xlarge</p> </li> </ul>"
+          "documentation":"<p>The instance type to use when launching fleet instances. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> <li> <p>stream.graphics.g5.xlarge</p> </li> <li> <p>stream.graphics.g5.2xlarge</p> </li> <li> <p>stream.graphics.g5.4xlarge</p> </li> <li> <p>stream.graphics.g5.8xlarge</p> </li> <li> <p>stream.graphics.g5.16xlarge</p> </li> <li> <p>stream.graphics.g5.12xlarge</p> </li> <li> <p>stream.graphics.g5.24xlarge</p> </li> <li> <p>stream.graphics.g6.xlarge</p> </li> <li> <p>stream.graphics.g6.2xlarge</p> </li> <li> <p>stream.graphics.g6.4xlarge</p> </li> <li> <p>stream.graphics.g6.8xlarge</p> </li> <li> <p>stream.graphics.g6.16xlarge</p> </li> <li> <p>stream.graphics.g6.12xlarge</p> </li> <li> <p>stream.graphics.g6.24xlarge</p> </li> <li> <p>stream.graphics.gr6.4xlarge</p> </li> <li> <p>stream.graphics.gr6.8xlarge</p> </li> <li> <p>stream.graphics.g6f.large</p> </li> <li> <p>stream.graphics.g6f.xlarge</p> </li> <li> <p>stream.graphics.g6f.2xlarge</p> </li> <li> <p>stream.graphics.g6f.4xlarge</p> </li> <li> <p>stream.graphics.gr6f.4xlarge</p> </li> </ul>"
         },
         "FleetType":{
           "shape":"FleetType",
@@ -4109,7 +4109,7 @@
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p>The instance type for the image builder. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> <li> <p>stream.graphics.g5.xlarge</p> </li> <li> <p>stream.graphics.g5.2xlarge</p> </li> <li> <p>stream.graphics.g5.4xlarge</p> </li> <li> <p>stream.graphics.g5.8xlarge</p> </li> <li> <p>stream.graphics.g5.16xlarge</p> </li> <li> <p>stream.graphics.g5.12xlarge</p> </li> <li> <p>stream.graphics.g5.24xlarge</p> </li> <li> <p>stream.graphics.g6.xlarge</p> </li> <li> <p>stream.graphics.g6.2xlarge</p> </li> <li> <p>stream.graphics.g6.4xlarge</p> </li> <li> <p>stream.graphics.g6.8xlarge</p> </li> <li> <p>stream.graphics.g6.16xlarge</p> </li> <li> <p>stream.graphics.g6.12xlarge</p> </li> <li> <p>stream.graphics.g6.24xlarge</p> </li> <li> <p>stream.graphics.gr6.4xlarge</p> </li> <li> <p>stream.graphics.gr6.8xlarge</p> </li> </ul>"
+          "documentation":"<p>The instance type for the image builder. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> <li> <p>stream.graphics.g5.xlarge</p> </li> <li> <p>stream.graphics.g5.2xlarge</p> </li> <li> <p>stream.graphics.g5.4xlarge</p> </li> <li> <p>stream.graphics.g5.8xlarge</p> </li> <li> <p>stream.graphics.g5.16xlarge</p> </li> <li> <p>stream.graphics.g5.12xlarge</p> </li> <li> <p>stream.graphics.g5.24xlarge</p> </li> <li> <p>stream.graphics.g6.xlarge</p> </li> <li> <p>stream.graphics.g6.2xlarge</p> </li> <li> <p>stream.graphics.g6.4xlarge</p> </li> <li> <p>stream.graphics.g6.8xlarge</p> </li> <li> <p>stream.graphics.g6.16xlarge</p> </li> <li> <p>stream.graphics.g6.12xlarge</p> </li> <li> <p>stream.graphics.g6.24xlarge</p> </li> <li> <p>stream.graphics.gr6.4xlarge</p> </li> <li> <p>stream.graphics.gr6.8xlarge</p> </li> <li> <p>stream.graphics.g6f.large</p> </li> <li> <p>stream.graphics.g6f.xlarge</p> </li> <li> <p>stream.graphics.g6f.2xlarge</p> </li> <li> <p>stream.graphics.g6f.4xlarge</p> </li> <li> <p>stream.graphics.gr6f.4xlarge</p> </li> </ul>"
         },
         "Platform":{
           "shape":"PlatformType",
@@ -5426,7 +5426,7 @@
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p>The instance type to use when launching fleet instances. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.standard.xlarge</p> </li> <li> <p>stream.standard.2xlarge</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> </ul> <p>The following instance types are available for Elastic fleets:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.standard.xlarge</p> </li> <li> <p>stream.standard.2xlarge</p> </li> </ul>"
+          "documentation":"<p>The instance type to use when launching fleet instances. The following instance types are available:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.standard.xlarge</p> </li> <li> <p>stream.standard.2xlarge</p> </li> <li> <p>stream.compute.large</p> </li> <li> <p>stream.compute.xlarge</p> </li> <li> <p>stream.compute.2xlarge</p> </li> <li> <p>stream.compute.4xlarge</p> </li> <li> <p>stream.compute.8xlarge</p> </li> <li> <p>stream.memory.large</p> </li> <li> <p>stream.memory.xlarge</p> </li> <li> <p>stream.memory.2xlarge</p> </li> <li> <p>stream.memory.4xlarge</p> </li> <li> <p>stream.memory.8xlarge</p> </li> <li> <p>stream.memory.z1d.large</p> </li> <li> <p>stream.memory.z1d.xlarge</p> </li> <li> <p>stream.memory.z1d.2xlarge</p> </li> <li> <p>stream.memory.z1d.3xlarge</p> </li> <li> <p>stream.memory.z1d.6xlarge</p> </li> <li> <p>stream.memory.z1d.12xlarge</p> </li> <li> <p>stream.graphics-design.large</p> </li> <li> <p>stream.graphics-design.xlarge</p> </li> <li> <p>stream.graphics-design.2xlarge</p> </li> <li> <p>stream.graphics-design.4xlarge</p> </li> <li> <p>stream.graphics-desktop.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.xlarge</p> </li> <li> <p>stream.graphics.g4dn.2xlarge</p> </li> <li> <p>stream.graphics.g4dn.4xlarge</p> </li> <li> <p>stream.graphics.g4dn.8xlarge</p> </li> <li> <p>stream.graphics.g4dn.12xlarge</p> </li> <li> <p>stream.graphics.g4dn.16xlarge</p> </li> <li> <p>stream.graphics-pro.4xlarge</p> </li> <li> <p>stream.graphics-pro.8xlarge</p> </li> <li> <p>stream.graphics-pro.16xlarge</p> </li> <li> <p>stream.graphics.g5.xlarge</p> </li> <li> <p>stream.graphics.g5.2xlarge</p> </li> <li> <p>stream.graphics.g5.4xlarge</p> </li> <li> <p>stream.graphics.g5.8xlarge</p> </li> <li> <p>stream.graphics.g5.16xlarge</p> </li> <li> <p>stream.graphics.g5.12xlarge</p> </li> <li> <p>stream.graphics.g5.24xlarge</p> </li> <li> <p>stream.graphics.g6.xlarge</p> </li> <li> <p>stream.graphics.g6.2xlarge</p> </li> <li> <p>stream.graphics.g6.4xlarge</p> </li> <li> <p>stream.graphics.g6.8xlarge</p> </li> <li> <p>stream.graphics.g6.16xlarge</p> </li> <li> <p>stream.graphics.g6.12xlarge</p> </li> <li> <p>stream.graphics.g6.24xlarge</p> </li> <li> <p>stream.graphics.gr6.4xlarge</p> </li> <li> <p>stream.graphics.gr6.8xlarge</p> </li> <li> <p>stream.graphics.g6f.large</p> </li> <li> <p>stream.graphics.g6f.xlarge</p> </li> <li> <p>stream.graphics.g6f.2xlarge</p> </li> <li> <p>stream.graphics.g6f.4xlarge</p> </li> <li> <p>stream.graphics.gr6f.4xlarge</p> </li> </ul> <p>The following instance types are available for Elastic fleets:</p> <ul> <li> <p>stream.standard.small</p> </li> <li> <p>stream.standard.medium</p> </li> <li> <p>stream.standard.large</p> </li> <li> <p>stream.standard.xlarge</p> </li> <li> <p>stream.standard.2xlarge</p> </li> </ul>"
         },
         "ComputeCapacity":{
           "shape":"ComputeCapacity",
diff --git a/services/appsync/pom.xml b/services/appsync/pom.xml
index 0071a69c7731..a0afec12838e 100644
--- a/services/appsync/pom.xml
+++ b/services/appsync/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>appsync</artifactId>
diff --git a/services/apptest/pom.xml b/services/apptest/pom.xml
index 491cf07d1031..39a0e4a427b5 100644
--- a/services/apptest/pom.xml
+++ b/services/apptest/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>apptest</artifactId>
     <name>AWS Java SDK :: Services :: App Test</name>
diff --git a/services/arcregionswitch/pom.xml b/services/arcregionswitch/pom.xml
index a2a4ba6aaf3d..8b63810e4c96 100644
--- a/services/arcregionswitch/pom.xml
+++ b/services/arcregionswitch/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>arcregionswitch</artifactId>
     <name>AWS Java SDK :: Services :: ARC Region Switch</name>
diff --git a/services/arczonalshift/pom.xml b/services/arczonalshift/pom.xml
index c22a3c54e3ea..e1e61c08e72a 100644
--- a/services/arczonalshift/pom.xml
+++ b/services/arczonalshift/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>arczonalshift</artifactId>
     <name>AWS Java SDK :: Services :: ARC Zonal Shift</name>
diff --git a/services/artifact/pom.xml b/services/artifact/pom.xml
index 066176bd9506..bff2ab368abc 100644
--- a/services/artifact/pom.xml
+++ b/services/artifact/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>artifact</artifactId>
     <name>AWS Java SDK :: Services :: Artifact</name>
diff --git a/services/athena/pom.xml b/services/athena/pom.xml
index 81f31c9ab8e6..65f04f2d222a 100644
--- a/services/athena/pom.xml
+++ b/services/athena/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>athena</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Athena</name>
diff --git a/services/auditmanager/pom.xml b/services/auditmanager/pom.xml
index 2b61e87f0437..d68d0c5608c5 100644
--- a/services/auditmanager/pom.xml
+++ b/services/auditmanager/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>auditmanager</artifactId>
     <name>AWS Java SDK :: Services :: Audit Manager</name>
diff --git a/services/autoscaling/pom.xml b/services/autoscaling/pom.xml
index 53f8aa9dd370..7613a9a08e79 100644
--- a/services/autoscaling/pom.xml
+++ b/services/autoscaling/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>autoscaling</artifactId>
     <name>AWS Java SDK :: Services :: Auto Scaling</name>
diff --git a/services/autoscalingplans/pom.xml b/services/autoscalingplans/pom.xml
index 1463e8c3f318..73f2e17d0f68 100644
--- a/services/autoscalingplans/pom.xml
+++ b/services/autoscalingplans/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>autoscalingplans</artifactId>
     <name>AWS Java SDK :: Services :: Auto Scaling Plans</name>
diff --git a/services/b2bi/pom.xml b/services/b2bi/pom.xml
index a722d9f26d89..d39231354630 100644
--- a/services/b2bi/pom.xml
+++ b/services/b2bi/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>b2bi</artifactId>
     <name>AWS Java SDK :: Services :: B2 Bi</name>
diff --git a/services/backup/pom.xml b/services/backup/pom.xml
index 52a66b976e27..18b086173d1b 100644
--- a/services/backup/pom.xml
+++ b/services/backup/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>backup</artifactId>
     <name>AWS Java SDK :: Services :: Backup</name>
diff --git a/services/backupgateway/pom.xml b/services/backupgateway/pom.xml
index 09b7005956cb..dad6eadf5448 100644
--- a/services/backupgateway/pom.xml
+++ b/services/backupgateway/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>backupgateway</artifactId>
     <name>AWS Java SDK :: Services :: Backup Gateway</name>
diff --git a/services/backupsearch/pom.xml b/services/backupsearch/pom.xml
index 1feb478cd39a..bc8db170c7d6 100644
--- a/services/backupsearch/pom.xml
+++ b/services/backupsearch/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>backupsearch</artifactId>
     <name>AWS Java SDK :: Services :: Backup Search</name>
diff --git a/services/batch/pom.xml b/services/batch/pom.xml
index 40b4d5b71619..c6633d8c65b3 100644
--- a/services/batch/pom.xml
+++ b/services/batch/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>batch</artifactId>
     <name>AWS Java SDK :: Services :: AWS Batch</name>
diff --git a/services/batch/src/main/resources/codegen-resources/service-2.json b/services/batch/src/main/resources/codegen-resources/service-2.json
index 6508563513d3..2e2e240d9dc5 100644
--- a/services/batch/src/main/resources/codegen-resources/service-2.json
+++ b/services/batch/src/main/resources/codegen-resources/service-2.json
@@ -40,7 +40,7 @@
         {"shape":"ClientException"},
         {"shape":"ServerException"}
       ],
-      "documentation":"<p>Creates an Batch compute environment. You can create <code>MANAGED</code> or <code>UNMANAGED</code> compute environments. <code>MANAGED</code> compute environments can use Amazon EC2 or Fargate resources. <code>UNMANAGED</code> compute environments can only use EC2 resources.</p> <p>In a managed compute environment, Batch manages the capacity and instance types of the compute resources within the environment. This is based on the compute resource specification that you define or the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html\">launch template</a> that you specify when you create the compute environment. Either, you can choose to use EC2 On-Demand Instances and EC2 Spot Instances. Or, you can use Fargate and Fargate Spot capacity in your managed compute environment. You can optionally set a maximum price so that Spot Instances only launch when the Spot Instance price is less than a specified percentage of the On-Demand price.</p> <note> <p>Multi-node parallel jobs aren't supported on Spot Instances.</p> </note> <p>In an unmanaged compute environment, you can manage your own EC2 compute resources and have flexibility with how you configure your compute resources. For example, you can use custom AMIs. However, you must verify that each of your AMIs meet the Amazon ECS container instance AMI specification. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container_instance_AMIs.html\">container instance AMIs</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. After you created your unmanaged compute environment, you can use the <a>DescribeComputeEnvironments</a> operation to find the Amazon ECS cluster that's associated with it. Then, launch your container instances into that Amazon ECS cluster. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_container_instance.html\">Launching an Amazon ECS container instance</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <note> <p>To create a compute environment that uses EKS resources, the caller must have permissions to call <code>eks:DescribeCluster</code>.</p> </note> <note> <p>Batch doesn't automatically upgrade the AMIs in a compute environment after it's created. For example, it also doesn't update the AMIs in your compute environment when a newer version of the Amazon ECS optimized AMI is available. You're responsible for the management of the guest operating system. This includes any updates and security patches. You're also responsible for any additional application software or utilities that you install on the compute resources. There are two ways to use a new AMI for your Batch jobs. The original method is to complete these steps:</p> <ol> <li> <p>Create a new compute environment with the new AMI.</p> </li> <li> <p>Add the compute environment to an existing job queue.</p> </li> <li> <p>Remove the earlier compute environment from your job queue.</p> </li> <li> <p>Delete the earlier compute environment.</p> </li> </ol> <p>In April 2022, Batch added enhanced support for updating compute environments. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html\">Updating compute environments</a>. To use the enhanced updating of compute environments to update AMIs, follow these rules:</p> <ul> <li> <p>Either don't set the service role (<code>serviceRole</code>) parameter or set it to the <b>AWSBatchServiceRole</b> service-linked role.</p> </li> <li> <p>Set the allocation strategy (<code>allocationStrategy</code>) parameter to <code>BEST_FIT_PROGRESSIVE</code>, <code>SPOT_CAPACITY_OPTIMIZED</code>, or <code>SPOT_PRICE_CAPACITY_OPTIMIZED</code>.</p> </li> <li> <p>Set the update to latest image version (<code>updateToLatestImageVersion</code>) parameter to <code>true</code>. The <code>updateToLatestImageVersion</code> parameter is used when you update a compute environment. This parameter is ignored when you create a compute environment.</p> </li> <li> <p>Don't specify an AMI ID in <code>imageId</code>, <code>imageIdOverride</code> (in <a href=\"https://docs.aws.amazon.com/batch/latest/APIReference/API_Ec2Configuration.html\"> <code>ec2Configuration</code> </a>), or in the launch template (<code>launchTemplate</code>). In that case, Batch selects the latest Amazon ECS optimized AMI that's supported by Batch at the time the infrastructure update is initiated. Alternatively, you can specify the AMI ID in the <code>imageId</code> or <code>imageIdOverride</code> parameters, or the launch template identified by the <code>LaunchTemplate</code> properties. Changing any of these properties starts an infrastructure update. If the AMI ID is specified in the launch template, it can't be replaced by specifying an AMI ID in either the <code>imageId</code> or <code>imageIdOverride</code> parameters. It can only be replaced by specifying a different launch template, or if the launch template version is set to <code>$Default</code> or <code>$Latest</code>, by setting either a new default version for the launch template (if <code>$Default</code>) or by adding a new version to the launch template (if <code>$Latest</code>).</p> </li> </ul> <p>If these rules are followed, any update that starts an infrastructure update causes the AMI ID to be re-selected. If the <code>version</code> setting in the launch template (<code>launchTemplate</code>) is set to <code>$Latest</code> or <code>$Default</code>, the latest or default version of the launch template is evaluated up at the time of the infrastructure update, even if the <code>launchTemplate</code> wasn't updated.</p> </note>"
+      "documentation":"<p>Creates an Batch compute environment. You can create <code>MANAGED</code> or <code>UNMANAGED</code> compute environments. <code>MANAGED</code> compute environments can use Amazon EC2 or Fargate resources. <code>UNMANAGED</code> compute environments can only use EC2 resources.</p> <p>In a managed compute environment, Batch manages the capacity and instance types of the compute resources within the environment. This is based on the compute resource specification that you define or the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html\">launch template</a> that you specify when you create the compute environment. Either, you can choose to use EC2 On-Demand Instances and EC2 Spot Instances. Or, you can use Fargate and Fargate Spot capacity in your managed compute environment. You can optionally set a maximum price so that Spot Instances only launch when the Spot Instance price is less than a specified percentage of the On-Demand price.</p> <p>In an unmanaged compute environment, you can manage your own EC2 compute resources and have flexibility with how you configure your compute resources. For example, you can use custom AMIs. However, you must verify that each of your AMIs meet the Amazon ECS container instance AMI specification. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container_instance_AMIs.html\">container instance AMIs</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. After you created your unmanaged compute environment, you can use the <a>DescribeComputeEnvironments</a> operation to find the Amazon ECS cluster that's associated with it. Then, launch your container instances into that Amazon ECS cluster. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_container_instance.html\">Launching an Amazon ECS container instance</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <note> <p>Batch doesn't automatically upgrade the AMIs in a compute environment after it's created. For more information on how to update a compute environment's AMI, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/updating-compute-environments.html\">Updating compute environments</a> in the <i>Batch User Guide</i>.</p> </note>"
     },
     "CreateConsumableResource":{
       "name":"CreateConsumableResource",
@@ -943,7 +943,7 @@
       "members":{
         "type":{
           "shape":"CRType",
-          "documentation":"<p>The type of compute environment: <code>EC2</code>, <code>SPOT</code>, <code>FARGATE</code>, or <code>FARGATE_SPOT</code>. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/compute_environments.html\">Compute environments</a> in the <i>Batch User Guide</i>.</p> <p> If you choose <code>SPOT</code>, you must also specify an Amazon EC2 Spot Fleet role with the <code>spotIamFleetRole</code> parameter. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/spot_fleet_IAM_role.html\">Amazon EC2 spot fleet role</a> in the <i>Batch User Guide</i>.</p>"
+          "documentation":"<p>The type of compute environment: <code>EC2</code>, <code>SPOT</code>, <code>FARGATE</code>, or <code>FARGATE_SPOT</code>. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/compute_environments.html\">Compute environments</a> in the <i>Batch User Guide</i>.</p> <p> If you choose <code>SPOT</code>, you must also specify an Amazon EC2 Spot Fleet role with the <code>spotIamFleetRole</code> parameter. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/spot_fleet_IAM_role.html\">Amazon EC2 spot fleet role</a> in the <i>Batch User Guide</i>.</p> <note> <p>Multi-node parallel jobs aren't supported on Spot Instances.</p> </note>"
         },
         "allocationStrategy":{
           "shape":"CRAllocationStrategy",
@@ -1467,7 +1467,7 @@
         },
         "eksConfiguration":{
           "shape":"EksConfiguration",
-          "documentation":"<p>The details for the Amazon EKS cluster that supports the compute environment.</p>"
+          "documentation":"<p>The details for the Amazon EKS cluster that supports the compute environment.</p> <note> <p>To create a compute environment that uses EKS resources, the caller must have permissions to call <code>eks:DescribeCluster</code>.</p> </note>"
         },
         "context":{
           "shape":"String",
@@ -2178,7 +2178,7 @@
       "members":{
         "imageType":{
           "shape":"ImageType",
-          "documentation":"<p>The image type to match with the instance type to select an AMI. The supported values are different for <code>ECS</code> and <code>EKS</code> resources.</p> <dl> <dt>ECS</dt> <dd> <p>If the <code>imageIdOverride</code> parameter isn't specified, then a recent <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami\">Amazon ECS-optimized Amazon Linux 2 AMI</a> (<code>ECS_AL2</code>) is used. If a new image type is specified in an update, but neither an <code>imageId</code> nor a <code>imageIdOverride</code> parameter is specified, then the latest Amazon ECS optimized AMI for that image type that's supported by Batch is used.</p> <dl> <dt>ECS_AL2</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami\">Amazon Linux 2</a>: Default for all non-GPU instance families.</p> </dd> <dt>ECS_AL2_NVIDIA</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#gpuami\">Amazon Linux 2 (GPU)</a>: Default for all GPU instance families (for example <code>P4</code> and <code>G4</code>) and can be used for all non Amazon Web Services Graviton-based instance types.</p> </dd> <dt>ECS_AL2023</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon Linux 2023</a>: Batch supports Amazon Linux 2023.</p> <note> <p>Amazon Linux 2023 does not support <code>A1</code> instances.</p> </note> </dd> <dt>ECS_AL2023_NVIDIA</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#gpuami\">Amazon Linux 2023 (GPU)</a>: For all GPU instance families and can be used for all non Amazon Web Services Graviton-based instance types.</p> <note> <p>ECS_AL2023_NVIDIA doesn't support <code>p3</code> and <code>g3</code> instance types.</p> </note> </dd> <dt>ECS_AL1</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#alami\">Amazon Linux</a>. Amazon Linux has reached the end-of-life of standard support. For more information, see <a href=\"http://aws.amazon.com/amazon-linux-ami/\">Amazon Linux AMI</a>.</p> </dd> </dl> </dd> <dt>EKS</dt> <dd> <p>If the <code>imageIdOverride</code> parameter isn't specified, then a recent <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon EKS-optimized Amazon Linux AMI</a> (<code>EKS_AL2</code>) is used. If a new image type is specified in an update, but neither an <code>imageId</code> nor a <code>imageIdOverride</code> parameter is specified, then the latest Amazon EKS optimized AMI for that image type that Batch supports is used.</p> <important> <p>Starting end of October 2025 Amazon EKS optimized Amazon Linux 2023 AMIs will be the default on Batch for EKS versions prior to 1.33. Starting from Kubernetes version 1.33, EKS optimized Amazon Linux 2023 AMIs will be the default when it becomes supported on Batch.</p> <p>Amazon Web Services will end support for Amazon EKS AL2-optimized and AL2-accelerated AMIs, starting 11/26/25. You can continue using Batch-provided Amazon EKS optimized Amazon Linux 2 AMIs on your Amazon EKS compute environments beyond the 11/26/25 end-of-support date, these compute environments will no longer receive any new software updates, security patches, or bug fixes from Amazon Web Services. For more information on upgrading from AL2 to AL2023, see <a href=\"\">How to upgrade from EKS AL2 to EKS AL2023</a> in the <i>Batch User Guide</i>.</p> </important> <dl> <dt>EKS_AL2</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon Linux 2</a>: Default for all non-GPU instance families.</p> </dd> <dt>EKS_AL2_NVIDIA</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon Linux 2 (accelerated)</a>: Default for all GPU instance families (for example, <code>P4</code> and <code>G4</code>) and can be used for all non Amazon Web Services Graviton-based instance types.</p> </dd> <dt>EKS_AL2023</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon Linux 2023</a>: Batch supports Amazon Linux 2023.</p> <note> <p>Amazon Linux 2023 does not support <code>A1</code> instances.</p> </note> </dd> <dt>EKS_AL2023_NVIDIA</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon Linux 2023 (accelerated)</a>: GPU instance families and can be used for all non Amazon Web Services Graviton-based instance types.</p> </dd> </dl> </dd> </dl>"
+          "documentation":"<p>The image type to match with the instance type to select an AMI. The supported values are different for <code>ECS</code> and <code>EKS</code> resources.</p> <dl> <dt>ECS</dt> <dd> <p>If the <code>imageIdOverride</code> parameter isn't specified, then a recent <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami\">Amazon ECS-optimized Amazon Linux 2 AMI</a> (<code>ECS_AL2</code>) is used. If a new image type is specified in an update, but neither an <code>imageId</code> nor a <code>imageIdOverride</code> parameter is specified, then the latest Amazon ECS optimized AMI for that image type that's supported by Batch is used.</p> <important> <p>Amazon Web Services will end support for Amazon ECS optimized AL2-optimized and AL2-accelerated AMIs. Starting in January 2026, Batch will change the default AMI for new Amazon ECS compute environments from Amazon Linux 2 to Amazon Linux 2023. We recommend migrating Batch Amazon ECS compute environments to Amazon Linux 2023 to maintain optimal performance and security. For more information on upgrading from AL2 to AL2023, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/ecs-migration-2023.html\">How to migrate from ECS AL2 to ECS AL2023</a> in the <i>Batch User Guide</i>.</p> </important> <dl> <dt>ECS_AL2</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami\">Amazon Linux 2</a>: Default for all non-GPU instance families.</p> </dd> <dt>ECS_AL2_NVIDIA</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#gpuami\">Amazon Linux 2 (GPU)</a>: Default for all GPU instance families (for example <code>P4</code> and <code>G4</code>) and can be used for all non Amazon Web Services Graviton-based instance types.</p> </dd> <dt>ECS_AL2023</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon Linux 2023</a>: Batch supports Amazon Linux 2023.</p> <note> <p>Amazon Linux 2023 does not support <code>A1</code> instances.</p> </note> </dd> <dt>ECS_AL2023_NVIDIA</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#gpuami\">Amazon Linux 2023 (GPU)</a>: For all GPU instance families and can be used for all non Amazon Web Services Graviton-based instance types.</p> <note> <p>ECS_AL2023_NVIDIA doesn't support <code>p3</code> and <code>g3</code> instance types.</p> </note> </dd> </dl> </dd> <dt>EKS</dt> <dd> <p>If the <code>imageIdOverride</code> parameter isn't specified, then a recent <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon EKS-optimized Amazon Linux AMI</a> (<code>EKS_AL2</code>) is used. If a new image type is specified in an update, but neither an <code>imageId</code> nor a <code>imageIdOverride</code> parameter is specified, then the latest Amazon EKS optimized AMI for that image type that Batch supports is used.</p> <important> <p>Starting end of October 2025 Amazon EKS optimized Amazon Linux 2023 AMIs will be the default on Batch for EKS versions prior to 1.33. Starting from Kubernetes version 1.33, EKS optimized Amazon Linux 2023 AMIs will be the default when it becomes supported on Batch.</p> <p>Amazon Web Services will end support for Amazon EKS AL2-optimized and AL2-accelerated AMIs, starting 11/26/25. You can continue using Batch-provided Amazon EKS optimized Amazon Linux 2 AMIs on your Amazon EKS compute environments beyond the 11/26/25 end-of-support date, these compute environments will no longer receive any new software updates, security patches, or bug fixes from Amazon Web Services. For more information on upgrading from AL2 to AL2023, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/eks-migration-2023.html\">How to upgrade from EKS AL2 to EKS AL2023</a> in the <i>Batch User Guide</i>.</p> </important> <dl> <dt>EKS_AL2</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon Linux 2</a>: Default for all non-GPU instance families.</p> </dd> <dt>EKS_AL2_NVIDIA</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon Linux 2 (accelerated)</a>: Default for all GPU instance families (for example, <code>P4</code> and <code>G4</code>) and can be used for all non Amazon Web Services Graviton-based instance types.</p> </dd> <dt>EKS_AL2023</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon Linux 2023</a>: Batch supports Amazon Linux 2023.</p> <note> <p>Amazon Linux 2023 does not support <code>A1</code> instances.</p> </note> </dd> <dt>EKS_AL2023_NVIDIA</dt> <dd> <p> <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html\">Amazon Linux 2023 (accelerated)</a>: GPU instance families and can be used for all non Amazon Web Services Graviton-based instance types.</p> </dd> </dl> </dd> </dl>"
         },
         "imageIdOverride":{
           "shape":"ImageIdOverride",
@@ -2255,7 +2255,7 @@
         },
         "ipcMode":{
           "shape":"String",
-          "documentation":"<p>The IPC resource namespace to use for the containers in the task.</p>"
+          "documentation":"<p>The IPC resource namespace to use for the containers in the task. The valid values are <code>host</code>, <code>task</code>, or <code>none</code>. For more information see <code>ipcMode</code> in <a href=\"https://docs.aws.amazon.com/batch/latest/APIReference/API_EcsTaskProperties.html\">EcsTaskProperties</a>.</p>"
         },
         "taskRoleArn":{
           "shape":"String",
@@ -2263,7 +2263,7 @@
         },
         "pidMode":{
           "shape":"String",
-          "documentation":"<p>The process namespace to use for the containers in the task.</p>"
+          "documentation":"<p>The process namespace to use for the containers in the task. The valid values are <code>host</code>, or <code>task</code>. For more information see <code>pidMode</code> in <a href=\"https://docs.aws.amazon.com/batch/latest/APIReference/API_EcsTaskProperties.html\">EcsTaskProperties</a>.</p>"
         },
         "networkConfiguration":{
           "shape":"NetworkConfiguration",
@@ -4017,7 +4017,7 @@
       "members":{
         "logDriver":{
           "shape":"LogDriver",
-          "documentation":"<p>The log driver to use for the container. The valid values that are listed for this parameter are log drivers that the Amazon ECS container agent can communicate with by default.</p> <p>The supported log drivers are <code>awslogs</code>, <code>fluentd</code>, <code>gelf</code>, <code>json-file</code>, <code>journald</code>, <code>logentries</code>, <code>syslog</code>, and <code>splunk</code>.</p> <note> <p>Jobs that are running on Fargate resources are restricted to the <code>awslogs</code> and <code>splunk</code> log drivers.</p> </note> <dl> <dt>awsfirelens</dt> <dd> <p>Specifies the firelens logging driver. For more information on configuring Firelens, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_firelens.html\">Send Amazon ECS logs to an Amazon Web Services service or Amazon Web Services Partner</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </dd> <dt>awslogs</dt> <dd> <p>Specifies the Amazon CloudWatch Logs logging driver. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/using_awslogs.html\">Using the awslogs log driver</a> in the <i>Batch User Guide</i> and <a href=\"https://docs.docker.com/config/containers/logging/awslogs/\">Amazon CloudWatch Logs logging driver</a> in the Docker documentation.</p> </dd> <dt>fluentd</dt> <dd> <p>Specifies the Fluentd logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/fluentd/\">Fluentd logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>gelf</dt> <dd> <p>Specifies the Graylog Extended Format (GELF) logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/gelf/\">Graylog Extended Format logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>journald</dt> <dd> <p>Specifies the journald logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/journald/\">Journald logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>json-file</dt> <dd> <p>Specifies the JSON file logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/json-file/\">JSON File logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>splunk</dt> <dd> <p>Specifies the Splunk logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/splunk/\">Splunk logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>syslog</dt> <dd> <p>Specifies the syslog logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/syslog/\">Syslog logging driver</a> in the <i>Docker documentation</i>.</p> </dd> </dl> <note> <p>If you have a custom driver that's not listed earlier that you want to work with the Amazon ECS container agent, you can fork the Amazon ECS container agent project that's <a href=\"https://github.com/aws/amazon-ecs-agent\">available on GitHub</a> and customize it to work with that driver. We encourage you to submit pull requests for changes that you want to have included. However, Amazon Web Services doesn't currently support running modified copies of this software.</p> </note> <p>This parameter requires version 1.18 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: <code>sudo docker version | grep \"Server API version\"</code> </p>"
+          "documentation":"<p>The log driver to use for the container. The valid values that are listed for this parameter are log drivers that the Amazon ECS container agent can communicate with by default.</p> <p>The supported log drivers are <code>awsfirelens</code>, <code>awslogs</code>, <code>fluentd</code>, <code>gelf</code>, <code>json-file</code>, <code>journald</code>, <code>logentries</code>, <code>syslog</code>, and <code>splunk</code>.</p> <note> <p>Jobs that are running on Fargate resources are restricted to the <code>awslogs</code> and <code>splunk</code> log drivers.</p> </note> <dl> <dt>awsfirelens</dt> <dd> <p>Specifies the firelens logging driver. For more information on configuring Firelens, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_firelens.html\">Send Amazon ECS logs to an Amazon Web Services service or Amazon Web Services Partner</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </dd> <dt>awslogs</dt> <dd> <p>Specifies the Amazon CloudWatch Logs logging driver. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/using_awslogs.html\">Using the awslogs log driver</a> in the <i>Batch User Guide</i> and <a href=\"https://docs.docker.com/config/containers/logging/awslogs/\">Amazon CloudWatch Logs logging driver</a> in the Docker documentation.</p> </dd> <dt>fluentd</dt> <dd> <p>Specifies the Fluentd logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/fluentd/\">Fluentd logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>gelf</dt> <dd> <p>Specifies the Graylog Extended Format (GELF) logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/gelf/\">Graylog Extended Format logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>journald</dt> <dd> <p>Specifies the journald logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/journald/\">Journald logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>json-file</dt> <dd> <p>Specifies the JSON file logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/json-file/\">JSON File logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>splunk</dt> <dd> <p>Specifies the Splunk logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/splunk/\">Splunk logging driver</a> in the <i>Docker documentation</i>.</p> </dd> <dt>syslog</dt> <dd> <p>Specifies the syslog logging driver. For more information including usage and options, see <a href=\"https://docs.docker.com/config/containers/logging/syslog/\">Syslog logging driver</a> in the <i>Docker documentation</i>.</p> </dd> </dl> <note> <p>If you have a custom driver that's not listed earlier that you want to work with the Amazon ECS container agent, you can fork the Amazon ECS container agent project that's <a href=\"https://github.com/aws/amazon-ecs-agent\">available on GitHub</a> and customize it to work with that driver. We encourage you to submit pull requests for changes that you want to have included. However, Amazon Web Services doesn't currently support running modified copies of this software.</p> </note> <p>This parameter requires version 1.18 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: <code>sudo docker version | grep \"Server API version\"</code> </p>"
         },
         "options":{
           "shape":"LogConfigurationOptionsMap",
@@ -4932,7 +4932,7 @@
         },
         "shareIdentifier":{
           "shape":"String",
-          "documentation":"<p>The share identifier for the service job. Don't specify this parameter if the job queue doesn't have a fair- share scheduling policy. If the job queue has a fair-share scheduling policy, then this parameter must be specified.</p>"
+          "documentation":"<p>The share identifier for the service job. Don't specify this parameter if the job queue doesn't have a fair-share scheduling policy. If the job queue has a fair-share scheduling policy, then this parameter must be specified.</p>"
         },
         "timeoutConfig":{
           "shape":"ServiceJobTimeout",
diff --git a/services/bcmdashboards/pom.xml b/services/bcmdashboards/pom.xml
index f9780eba8e84..1d255e7a5641 100644
--- a/services/bcmdashboards/pom.xml
+++ b/services/bcmdashboards/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bcmdashboards</artifactId>
     <name>AWS Java SDK :: Services :: BCM Dashboards</name>
diff --git a/services/bcmdataexports/pom.xml b/services/bcmdataexports/pom.xml
index a643a0a5ba61..c61f73c4b8d8 100644
--- a/services/bcmdataexports/pom.xml
+++ b/services/bcmdataexports/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bcmdataexports</artifactId>
     <name>AWS Java SDK :: Services :: BCM Data Exports</name>
diff --git a/services/bcmpricingcalculator/pom.xml b/services/bcmpricingcalculator/pom.xml
index 264f8d96b4cd..444e64094e52 100644
--- a/services/bcmpricingcalculator/pom.xml
+++ b/services/bcmpricingcalculator/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bcmpricingcalculator</artifactId>
     <name>AWS Java SDK :: Services :: BCM Pricing Calculator</name>
diff --git a/services/bcmrecommendedactions/pom.xml b/services/bcmrecommendedactions/pom.xml
index ce9d4d500f33..a7b0724b1918 100644
--- a/services/bcmrecommendedactions/pom.xml
+++ b/services/bcmrecommendedactions/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bcmrecommendedactions</artifactId>
     <name>AWS Java SDK :: Services :: BCM Recommended Actions</name>
diff --git a/services/bedrock/pom.xml b/services/bedrock/pom.xml
index b61db5be44b4..03f843db059d 100644
--- a/services/bedrock/pom.xml
+++ b/services/bedrock/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bedrock</artifactId>
     <name>AWS Java SDK :: Services :: Bedrock</name>
diff --git a/services/bedrock/src/main/resources/codegen-resources/service-2.json b/services/bedrock/src/main/resources/codegen-resources/service-2.json
index ce12416ca8d1..1fa8f49d5158 100644
--- a/services/bedrock/src/main/resources/codegen-resources/service-2.json
+++ b/services/bedrock/src/main/resources/codegen-resources/service-2.json
@@ -445,6 +445,7 @@
         {"shape":"ValidationException"},
         {"shape":"ConflictException"},
         {"shape":"InternalServerException"},
+        {"shape":"ResourceInUseException"},
         {"shape":"ThrottlingException"}
       ],
       "documentation":"<p>Deletes an Automated Reasoning policy build workflow and its associated artifacts. This permanently removes the workflow history and any generated assets.</p>",
@@ -2477,6 +2478,12 @@
       "min":1,
       "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:automated-reasoning-policy/[a-z0-9]{12}(:([1-9][0-9]{0,11}))?"
     },
+    "AutomatedReasoningPolicyBuildDocumentBlob":{
+      "type":"blob",
+      "max":5000000,
+      "min":1,
+      "sensitive":true
+    },
     "AutomatedReasoningPolicyBuildDocumentContentType":{
       "type":"string",
       "enum":[
@@ -2641,7 +2648,7 @@
       ],
       "members":{
         "document":{
-          "shape":"AutomatedReasoningPolicyBuildWorkflowDocumentDocumentBlob",
+          "shape":"AutomatedReasoningPolicyBuildDocumentBlob",
           "documentation":"<p>The actual content of the source document that will be analyzed to extract policy rules and concepts.</p>"
         },
         "documentContentType":{
@@ -2659,11 +2666,6 @@
       },
       "documentation":"<p>Represents a source document used in the policy build workflow, containing the content and metadata needed for policy generation.</p>"
     },
-    "AutomatedReasoningPolicyBuildWorkflowDocumentDocumentBlob":{
-      "type":"blob",
-      "max":4500000,
-      "min":1
-    },
     "AutomatedReasoningPolicyBuildWorkflowDocumentList":{
       "type":"list",
       "member":{"shape":"AutomatedReasoningPolicyBuildWorkflowDocument"},
@@ -12525,10 +12527,6 @@
           "shape":"AutomatedReasoningCheckTranslationConfidence",
           "documentation":"<p>The updated minimum confidence level for logic validation. If null is provided, the threshold will be removed.</p>"
         },
-        "kmsKeyArn":{
-          "shape":"KmsKeyArn",
-          "documentation":"<p>The KMS key ARN for encrypting the test at rest. If not provided, the key will not be updated. Use <code>DISCARD</code> to remove the key.</p>"
-        },
         "clientRequestToken":{
           "shape":"IdempotencyToken",
           "documentation":"<p>A unique, case-sensitive identifier to ensure that the operation completes no more than one time. If this token matches a previous request, Amazon Bedrock ignores the request, but does not return an error.</p>",
diff --git a/services/bedrockagent/pom.xml b/services/bedrockagent/pom.xml
index c05586d0c4ac..917e9c094980 100644
--- a/services/bedrockagent/pom.xml
+++ b/services/bedrockagent/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bedrockagent</artifactId>
     <name>AWS Java SDK :: Services :: Bedrock Agent</name>
diff --git a/services/bedrockagentcore/pom.xml b/services/bedrockagentcore/pom.xml
index 72620cc0ffd0..2ff815de54d5 100644
--- a/services/bedrockagentcore/pom.xml
+++ b/services/bedrockagentcore/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bedrockagentcore</artifactId>
     <name>AWS Java SDK :: Services :: Bedrock Agent Core</name>
diff --git a/services/bedrockagentcorecontrol/pom.xml b/services/bedrockagentcorecontrol/pom.xml
index 40739d0a61ab..de3808f17ec9 100644
--- a/services/bedrockagentcorecontrol/pom.xml
+++ b/services/bedrockagentcorecontrol/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bedrockagentcorecontrol</artifactId>
     <name>AWS Java SDK :: Services :: Bedrock Agent Core Control</name>
diff --git a/services/bedrockagentcorecontrol/src/main/resources/codegen-resources/service-2.json b/services/bedrockagentcorecontrol/src/main/resources/codegen-resources/service-2.json
index ff4694b2e8da..2fb01753526d 100644
--- a/services/bedrockagentcorecontrol/src/main/resources/codegen-resources/service-2.json
+++ b/services/bedrockagentcorecontrol/src/main/resources/codegen-resources/service-2.json
@@ -30,7 +30,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Creates an Amazon Secure Agent.</p>",
+      "documentation":"<p>Creates an Amazon Bedrock AgentCore Runtime.</p>",
       "idempotent":true
     },
     "CreateAgentRuntimeEndpoint":{
@@ -51,7 +51,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Creates an Amazon Secure AgentEndpoint.</p>",
+      "documentation":"<p>Creates an AgentCore Runtime endpoint.</p>",
       "idempotent":true
     },
     "CreateApiKeyCredentialProvider":{
@@ -157,7 +157,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Creates a target for a gateway. A target defines an endpoint that the gateway can connect to.</p> <p>To create a target, you must specify the gateway identifier and target configuration.</p>",
+      "documentation":"<p>Creates a target for a gateway. A target defines an endpoint that the gateway can connect to.</p>",
       "idempotent":true
     },
     "CreateMemory":{
@@ -178,7 +178,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottledException"}
       ],
-      "documentation":"<p>Creates a new memory.</p>",
+      "documentation":"<p>Creates a new Amazon Bedrock AgentCore Memory resource.</p>",
       "idempotent":true
     },
     "CreateOauth2CredentialProvider":{
@@ -242,7 +242,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Deletes an Amazon Secure Agent.</p>",
+      "documentation":"<p>Deletes an Amazon Bedrock AgentCore Runtime.</p>",
       "idempotent":true
     },
     "DeleteAgentRuntimeEndpoint":{
@@ -261,7 +261,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Deletes an Amazon Secure AgentEndpoint.</p>",
+      "documentation":"<p>Deletes an AAgentCore Runtime endpoint.</p>",
       "idempotent":true
     },
     "DeleteApiKeyCredentialProvider":{
@@ -343,7 +343,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Deletes a Gateway.</p>",
+      "documentation":"<p>Deletes a gateway.</p>",
       "idempotent":true
     },
     "DeleteGatewayTarget":{
@@ -363,7 +363,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Deletes a Gateway Target.</p>",
+      "documentation":"<p>Deletes a gateway target.</p>",
       "idempotent":true
     },
     "DeleteMemory":{
@@ -382,7 +382,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottledException"}
       ],
-      "documentation":"<p>Deletes a memory.</p>",
+      "documentation":"<p>Deletes an Amazon Bedrock AgentCore Memory resource.</p>",
       "idempotent":true
     },
     "DeleteOauth2CredentialProvider":{
@@ -441,7 +441,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Gets an Amazon Secure Agent.</p>"
+      "documentation":"<p>Gets an Amazon Bedrock AgentCore Runtime.</p>",
+      "readonly":true
     },
     "GetAgentRuntimeEndpoint":{
       "name":"GetAgentRuntimeEndpoint",
@@ -459,7 +460,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Gets information about an Amazon Secure AgentEndpoint.</p>"
+      "documentation":"<p>Gets information about an Amazon Secure AgentEndpoint.</p>",
+      "readonly":true
     },
     "GetApiKeyCredentialProvider":{
       "name":"GetApiKeyCredentialProvider",
@@ -479,7 +481,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Retrieves information about an API key credential provider.</p>"
+      "documentation":"<p>Retrieves information about an API key credential provider.</p>",
+      "readonly":true
     },
     "GetBrowser":{
       "name":"GetBrowser",
@@ -497,7 +500,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Gets information about a custom browser.</p>"
+      "documentation":"<p>Gets information about a custom browser.</p>",
+      "readonly":true
     },
     "GetCodeInterpreter":{
       "name":"GetCodeInterpreter",
@@ -515,7 +519,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Gets information about a custom code interpreter.</p>"
+      "documentation":"<p>Gets information about a custom code interpreter.</p>",
+      "readonly":true
     },
     "GetGateway":{
       "name":"GetGateway",
@@ -533,7 +538,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Retrieves information about a specific Gateway.</p>"
+      "documentation":"<p>Retrieves information about a specific Gateway.</p>",
+      "readonly":true
     },
     "GetGatewayTarget":{
       "name":"GetGatewayTarget",
@@ -551,7 +557,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Retrieves information about a specific Gateway Target.</p>"
+      "documentation":"<p>Retrieves information about a specific gateway target.</p>",
+      "readonly":true
     },
     "GetMemory":{
       "name":"GetMemory",
@@ -569,7 +576,8 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottledException"}
       ],
-      "documentation":"<p>Retrieve an existing memory.</p>"
+      "documentation":"<p>Retrieve an existing Amazon Bedrock AgentCore Memory resource.</p>",
+      "readonly":true
     },
     "GetOauth2CredentialProvider":{
       "name":"GetOauth2CredentialProvider",
@@ -589,7 +597,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Retrieves information about an OAuth2 credential provider.</p>"
+      "documentation":"<p>Retrieves information about an OAuth2 credential provider.</p>",
+      "readonly":true
     },
     "GetTokenVault":{
       "name":"GetTokenVault",
@@ -608,7 +617,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Retrieves information about a token vault.</p>"
+      "documentation":"<p>Retrieves information about a token vault.</p>",
+      "readonly":true
     },
     "GetWorkloadIdentity":{
       "name":"GetWorkloadIdentity",
@@ -627,7 +637,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Retrieves information about a workload identity.</p>"
+      "documentation":"<p>Retrieves information about a workload identity.</p>",
+      "readonly":true
     },
     "ListAgentRuntimeEndpoints":{
       "name":"ListAgentRuntimeEndpoints",
@@ -644,7 +655,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all endpoints for a specific Amazon Secure Agent.</p>"
+      "documentation":"<p>Lists all endpoints for a specific Amazon Secure Agent.</p>",
+      "readonly":true
     },
     "ListAgentRuntimeVersions":{
       "name":"ListAgentRuntimeVersions",
@@ -662,7 +674,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all versions of a specific Amazon Secure Agent.</p>"
+      "documentation":"<p>Lists all versions of a specific Amazon Secure Agent.</p>",
+      "readonly":true
     },
     "ListAgentRuntimes":{
       "name":"ListAgentRuntimes",
@@ -679,7 +692,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all Amazon Secure Agents in your account.</p>"
+      "documentation":"<p>Lists all Amazon Secure Agents in your account.</p>",
+      "readonly":true
     },
     "ListApiKeyCredentialProviders":{
       "name":"ListApiKeyCredentialProviders",
@@ -698,7 +712,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all API key credential providers in your account.</p>"
+      "documentation":"<p>Lists all API key credential providers in your account.</p>",
+      "readonly":true
     },
     "ListBrowsers":{
       "name":"ListBrowsers",
@@ -715,7 +730,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all custom browsers in your account.</p>"
+      "documentation":"<p>Lists all custom browsers in your account.</p>",
+      "readonly":true
     },
     "ListCodeInterpreters":{
       "name":"ListCodeInterpreters",
@@ -732,7 +748,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all custom code interpreters in your account.</p>"
+      "documentation":"<p>Lists all custom code interpreters in your account.</p>",
+      "readonly":true
     },
     "ListGatewayTargets":{
       "name":"ListGatewayTargets",
@@ -749,7 +766,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all targets for a specific Gateway.</p>"
+      "documentation":"<p>Lists all targets for a specific gateway.</p>",
+      "readonly":true
     },
     "ListGateways":{
       "name":"ListGateways",
@@ -766,7 +784,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all Gateways in the account.</p>"
+      "documentation":"<p>Lists all gateways in the account.</p>",
+      "readonly":true
     },
     "ListMemories":{
       "name":"ListMemories",
@@ -784,7 +803,8 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottledException"}
       ],
-      "documentation":"<p>Lists the memory present.</p>"
+      "documentation":"<p>Lists the available Amazon Bedrock AgentCore Memory resources in the current Amazon Web Services Region.</p>",
+      "readonly":true
     },
     "ListOauth2CredentialProviders":{
       "name":"ListOauth2CredentialProviders",
@@ -803,7 +823,27 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all OAuth2 credential providers in your account.</p>"
+      "documentation":"<p>Lists all OAuth2 credential providers in your account.</p>",
+      "readonly":true
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the tags associated with the specified resource.</p>",
+      "readonly":true
     },
     "ListWorkloadIdentities":{
       "name":"ListWorkloadIdentities",
@@ -822,7 +862,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all workload identities in your account.</p>"
+      "documentation":"<p>Lists all workload identities in your account.</p>",
+      "readonly":true
     },
     "SetTokenVaultCMK":{
       "name":"SetTokenVaultCMK",
@@ -844,6 +885,44 @@
       ],
       "documentation":"<p>Sets the customer master key (CMK) for a token vault.</p>"
     },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":204
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Associates the specified tags to a resource with the specified resourceArn. If existing tags on a resource are not specified in the request parameters, they are not changed. When a resource is deleted, the tags associated with that resource are also deleted.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":204
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Removes the specified tags from the specified resource.</p>",
+      "idempotent":true
+    },
     "UpdateAgentRuntime":{
       "name":"UpdateAgentRuntime",
       "http":{
@@ -883,7 +962,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Updates an existing Amazon Secure AgentEndpoint.</p>",
+      "documentation":"<p>Updates an existing Amazon Bedrock AgentCore Runtime endpoint.</p>",
       "idempotent":true
     },
     "UpdateApiKeyCredentialProvider":{
@@ -928,7 +1007,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Updates an existing Gateway.</p>",
+      "documentation":"<p>Updates an existing gateway.</p>",
       "idempotent":true
     },
     "UpdateGatewayTarget":{
@@ -949,7 +1028,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Updates an existing Gateway Target.</p>",
+      "documentation":"<p>Updates an existing gateway target.</p>",
       "idempotent":true
     },
     "UpdateMemory":{
@@ -970,7 +1049,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottledException"}
       ],
-      "documentation":"<p>Update memory.</p>",
+      "documentation":"<p>Update an Amazon Bedrock AgentCore Memory resource memory.</p>",
       "idempotent":true
     },
     "UpdateOauth2CredentialProvider":{
@@ -1030,7 +1109,12 @@
       },
       "exception":true
     },
-    "Agent":{
+    "AgentEndpointDescription":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "AgentRuntime":{
       "type":"structure",
       "required":[
         "agentRuntimeArn",
@@ -1067,13 +1151,17 @@
           "documentation":"<p>The timestamp when the agent runtime was last updated.</p>"
         },
         "status":{
-          "shape":"AgentStatus",
+          "shape":"AgentRuntimeStatus",
           "documentation":"<p>The current status of the agent runtime.</p>"
         }
       },
       "documentation":"<p>Contains information about an agent runtime. An agent runtime is the execution environment for a Amazon Bedrock Agent.</p>"
     },
-    "AgentArtifact":{
+    "AgentRuntimeArn":{
+      "type":"string",
+      "pattern":"arn:(-[^:]+)?:bedrock-agentcore:[a-z0-9-]+:[0-9]{12}:agent/[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}:([0-9]{0,4}[1-9][0-9]{0,4})"
+    },
+    "AgentRuntimeArtifact":{
       "type":"structure",
       "members":{
         "containerConfiguration":{
@@ -1084,7 +1172,7 @@
       "documentation":"<p>The artifact of the agent.</p>",
       "union":true
     },
-    "AgentEndpoint":{
+    "AgentRuntimeEndpoint":{
       "type":"structure",
       "required":[
         "name",
@@ -1117,7 +1205,7 @@
           "documentation":"<p>The Amazon Resource Name (ARN) of the agent runtime associated with the endpoint.</p>"
         },
         "status":{
-          "shape":"AgentEndpointStatus",
+          "shape":"AgentRuntimeEndpointStatus",
           "documentation":"<p>The current status of the agent runtime endpoint.</p>"
         },
         "id":{
@@ -1139,12 +1227,15 @@
       },
       "documentation":"<p>Contains information about an agent runtime endpoint. An endpoint provides a way to connect to and interact with an agent runtime.</p>"
     },
-    "AgentEndpointDescription":{
+    "AgentRuntimeEndpointArn":{
       "type":"string",
-      "max":256,
-      "min":1
+      "pattern":"arn:(-[^:]+)?:bedrock-agentcore:[a-z0-9-]+:[0-9]{12}:agentEndpoint/[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}"
+    },
+    "AgentRuntimeEndpointId":{
+      "type":"string",
+      "pattern":"[a-zA-Z][a-zA-Z0-9_]{0,99}-[a-zA-Z0-9]{10}"
     },
-    "AgentEndpointStatus":{
+    "AgentRuntimeEndpointStatus":{
       "type":"string",
       "enum":[
         "CREATING",
@@ -1155,21 +1246,9 @@
         "DELETING"
       ]
     },
-    "AgentEndpoints":{
+    "AgentRuntimeEndpoints":{
       "type":"list",
-      "member":{"shape":"AgentEndpoint"}
-    },
-    "AgentRuntimeArn":{
-      "type":"string",
-      "pattern":"arn:(-[^:]+)?:bedrock-agentcore:[a-z0-9-]+:[0-9]{12}:agent/[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}:([0-9]{0,4}[1-9][0-9]{0,4})"
-    },
-    "AgentRuntimeEndpointArn":{
-      "type":"string",
-      "pattern":"arn:(-[^:]+)?:bedrock-agentcore:[a-z0-9-]+:[0-9]{12}:agentEndpoint/[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}"
-    },
-    "AgentRuntimeEndpointId":{
-      "type":"string",
-      "pattern":"[a-zA-Z][a-zA-Z0-9_]{0,99}-[a-zA-Z0-9]{10}"
+      "member":{"shape":"AgentRuntimeEndpoint"}
     },
     "AgentRuntimeId":{
       "type":"string",
@@ -1179,13 +1258,7 @@
       "type":"string",
       "pattern":"[a-zA-Z][a-zA-Z0-9_]{0,47}"
     },
-    "AgentRuntimeVersion":{
-      "type":"string",
-      "max":5,
-      "min":1,
-      "pattern":"([1-9][0-9]{0,4})"
-    },
-    "AgentStatus":{
+    "AgentRuntimeStatus":{
       "type":"string",
       "enum":[
         "CREATING",
@@ -1196,9 +1269,15 @@
         "DELETING"
       ]
     },
-    "Agents":{
+    "AgentRuntimeVersion":{
+      "type":"string",
+      "max":5,
+      "min":1,
+      "pattern":"([1-9][0-9]{0,4})"
+    },
+    "AgentRuntimes":{
       "type":"list",
-      "member":{"shape":"Agent"}
+      "member":{"shape":"AgentRuntime"}
     },
     "AllowedAudience":{"type":"string"},
     "AllowedAudienceList":{
@@ -1353,13 +1432,17 @@
         "networkMode":{
           "shape":"BrowserNetworkMode",
           "documentation":"<p>The network mode for the browser. This field specifies how the browser connects to the network.</p>"
-        }
+        },
+        "vpcConfig":{"shape":"VpcConfig"}
       },
       "documentation":"<p>The network configuration for a browser. This structure defines how the browser connects to the network.</p>"
     },
     "BrowserNetworkMode":{
       "type":"string",
-      "enum":["PUBLIC"]
+      "enum":[
+        "PUBLIC",
+        "VPC"
+      ]
     },
     "BrowserStatus":{
       "type":"string",
@@ -1448,7 +1531,8 @@
         "networkMode":{
           "shape":"CodeInterpreterNetworkMode",
           "documentation":"<p>The network mode for the code interpreter. This field specifies how the code interpreter connects to the network.</p>"
-        }
+        },
+        "vpcConfig":{"shape":"VpcConfig"}
       },
       "documentation":"<p>The network configuration for a code interpreter. This structure defines how the code interpreter connects to the network.</p>"
     },
@@ -1456,7 +1540,8 @@
       "type":"string",
       "enum":[
         "PUBLIC",
-        "SANDBOX"
+        "SANDBOX",
+        "VPC"
       ]
     },
     "CodeInterpreterStatus":{
@@ -1570,26 +1655,30 @@
       "members":{
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime to create an endpoint for.</p>",
+          "documentation":"<p>The unique identifier of the AgentCore Runtime to create an endpoint for.</p>",
           "location":"uri",
           "locationName":"agentRuntimeId"
         },
         "name":{
           "shape":"EndpointName",
-          "documentation":"<p>The name of the agent runtime endpoint.</p>"
+          "documentation":"<p>The name of the AgentCore Runtime endpoint.</p>"
         },
         "agentRuntimeVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The version of the agent runtime to use for the endpoint.</p>"
+          "documentation":"<p>The version of the AgentCore Runtime to use for the endpoint.</p>"
         },
         "description":{
           "shape":"AgentEndpointDescription",
-          "documentation":"<p>The description of the agent runtime endpoint.</p>"
+          "documentation":"<p>The description of the AgentCore Runtime endpoint.</p>"
         },
         "clientToken":{
           "shape":"ClientToken",
           "documentation":"<p>A unique, case-sensitive identifier to ensure idempotency of the request.</p>",
           "idempotencyToken":true
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>A map of tag keys and values to assign to the agent runtime endpoint. Tags enable you to categorize your resources in different ways, for example, by purpose, owner, or environment.</p>"
         }
       }
     },
@@ -1605,23 +1694,23 @@
       "members":{
         "targetVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The target version of the agent runtime for the endpoint.</p>"
+          "documentation":"<p>The target version of the AgentCore Runtime for the endpoint.</p>"
         },
         "agentRuntimeEndpointArn":{
           "shape":"AgentRuntimeEndpointArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the agent runtime endpoint.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AgentCore Runtime endpoint.</p>"
         },
         "agentRuntimeArn":{
           "shape":"AgentRuntimeArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the agent runtime.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AgentCore Runtime.</p>"
         },
         "status":{
-          "shape":"AgentEndpointStatus",
-          "documentation":"<p>The current status of the agent runtime endpoint.</p>"
+          "shape":"AgentRuntimeEndpointStatus",
+          "documentation":"<p>The current status of the AgentCore Runtime endpoint.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime endpoint was created.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime endpoint was created.</p>"
         }
       }
     },
@@ -1636,23 +1725,23 @@
       "members":{
         "agentRuntimeName":{
           "shape":"AgentRuntimeName",
-          "documentation":"<p>The name of the secure agent.</p>"
+          "documentation":"<p>The name of the AgentCore Runtime.</p>"
         },
         "description":{
           "shape":"Description",
-          "documentation":"<p>The description of the agent runtime.</p>"
+          "documentation":"<p>The description of the AgentCore Runtime.</p>"
         },
         "agentRuntimeArtifact":{
-          "shape":"AgentArtifact",
-          "documentation":"<p>The artifact of the agent.</p>"
+          "shape":"AgentRuntimeArtifact",
+          "documentation":"<p>The artifact of the AgentCore Runtime.</p>"
         },
         "roleArn":{
           "shape":"RoleArn",
-          "documentation":"<p>The IAM role ARN that provides permissions for the agent runtime.</p>"
+          "documentation":"<p>The IAM role ARN that provides permissions for the AgentCore Runtime.</p>"
         },
         "networkConfiguration":{
           "shape":"NetworkConfiguration",
-          "documentation":"<p>The network configuration for the agent runtime.</p>"
+          "documentation":"<p>The network configuration for the AgentCore Runtime.</p>"
         },
         "protocolConfiguration":{"shape":"ProtocolConfiguration"},
         "clientToken":{
@@ -1662,11 +1751,19 @@
         },
         "environmentVariables":{
           "shape":"EnvironmentVariablesMap",
-          "documentation":"<p>Environment variables to set in the agent runtime environment.</p>"
+          "documentation":"<p>Environment variables to set in the AgentCore Runtime environment.</p>"
         },
         "authorizerConfiguration":{
           "shape":"AuthorizerConfiguration",
-          "documentation":"<p>The authorizer configuration for the agent runtime.</p>"
+          "documentation":"<p>The authorizer configuration for the AgentCore Runtime.</p>"
+        },
+        "requestHeaderConfiguration":{
+          "shape":"RequestHeaderConfiguration",
+          "documentation":"<p>Configuration for HTTP request headers that will be passed through to the runtime.</p>"
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>A map of tag keys and values to assign to the agent runtime. Tags enable you to categorize your resources in different ways, for example, by purpose, owner, or environment.</p>"
         }
       }
     },
@@ -1682,27 +1779,27 @@
       "members":{
         "agentRuntimeArn":{
           "shape":"AgentRuntimeArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the agent runtime.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AgentCore Runtime.</p>"
         },
         "workloadIdentityDetails":{
           "shape":"WorkloadIdentityDetails",
-          "documentation":"<p>The workload identity details for the agent runtime.</p>"
+          "documentation":"<p>The workload identity details for the AgentCore Runtime.</p>"
         },
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime.</p>"
+          "documentation":"<p>The unique identifier of the AgentCore Runtime.</p>"
         },
         "agentRuntimeVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The version of the agent runtime.</p>"
+          "documentation":"<p>The version of the AgentCore Runtime.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime was created.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime was created.</p>"
         },
         "status":{
-          "shape":"AgentStatus",
-          "documentation":"<p>The current status of the agent runtime.</p>"
+          "shape":"AgentRuntimeStatus",
+          "documentation":"<p>The current status of the AgentCore Runtime.</p>"
         }
       }
     },
@@ -1776,6 +1873,10 @@
           "shape":"ClientToken",
           "documentation":"<p>A unique, case-sensitive identifier to ensure that the operation completes no more than one time. If this token matches a previous request, Amazon Bedrock ignores the request but does not return an error.</p>",
           "idempotencyToken":true
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>A map of tag keys and values to assign to the browser. Tags enable you to categorize your resources in different ways, for example, by purpose, owner, or environment.</p>"
         }
       }
     },
@@ -1833,6 +1934,10 @@
           "shape":"ClientToken",
           "documentation":"<p>A unique, case-sensitive identifier to ensure that the operation completes no more than one time. If this token matches a previous request, Amazon Bedrock ignores the request but does not return an error.</p>",
           "idempotencyToken":true
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>A map of tag keys and values to assign to the code interpreter. Tags enable you to categorize your resources in different ways, for example, by purpose, owner, or environment.</p>"
         }
       }
     },
@@ -1883,7 +1988,7 @@
         },
         "clientToken":{
           "shape":"ClientToken",
-          "documentation":"<p>A unique, case-sensitive identifier to ensure that the operation completes no more than one time. If this token matches a previous request, Amazon Bedrock ignores the request but does not return an error.</p>",
+          "documentation":"<p>A unique, case-sensitive identifier to ensure that the API request completes no more than one time. If this token matches a previous request, the service ignores the request, but does not return an error. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring idempotency</a>.</p>",
           "idempotencyToken":true
         },
         "roleArn":{
@@ -1892,11 +1997,11 @@
         },
         "protocolType":{
           "shape":"GatewayProtocolType",
-          "documentation":"<p>The protocol type for the gateway. Currently supports MCP (Model Context Protocol).</p>"
+          "documentation":"<p>The protocol type for the gateway.</p>"
         },
         "protocolConfiguration":{
           "shape":"GatewayProtocolConfiguration",
-          "documentation":"<p>The configuration settings for the protocol specified in the protocolType parameter.</p>"
+          "documentation":"<p>The configuration settings for the protocol specified in the <code>protocolType</code> parameter.</p>"
         },
         "authorizerType":{
           "shape":"AuthorizerType",
@@ -1904,7 +2009,7 @@
         },
         "authorizerConfiguration":{
           "shape":"AuthorizerConfiguration",
-          "documentation":"<p>The authorizer configuration for the Gateway.</p>"
+          "documentation":"<p>The authorizer configuration for the gateway.</p>"
         },
         "kmsKeyArn":{
           "shape":"KmsKeyArn",
@@ -1912,7 +2017,7 @@
         },
         "exceptionLevel":{
           "shape":"ExceptionLevel",
-          "documentation":"<p>The verbosity of exception messages. Use DEBUG mode to see granular exception messages from a Gateway. If this parameter is not set, exception messages are by default sanitized for presentation to end users.</p>"
+          "documentation":"<p>The level of detail in error messages returned when invoking the gateway.</p> <ul> <li> <p>If the value is <code>DEBUG</code>, granular exception messages are returned to help a user debug the gateway.</p> </li> <li> <p>If the value is omitted, a generic error message is returned to the end user.</p> </li> </ul>"
         }
       }
     },
@@ -1983,7 +2088,7 @@
         },
         "authorizerConfiguration":{
           "shape":"AuthorizerConfiguration",
-          "documentation":"<p>The authorizer configuration for the created Gateway.</p>"
+          "documentation":"<p>The authorizer configuration for the created gateway.</p>"
         },
         "kmsKeyArn":{
           "shape":"KmsKeyArn",
@@ -1991,11 +2096,11 @@
         },
         "workloadIdentityDetails":{
           "shape":"WorkloadIdentityDetails",
-          "documentation":"<p>The workload identity details for the created Gateway.</p>"
+          "documentation":"<p>The workload identity details for the created gateway.</p>"
         },
         "exceptionLevel":{
           "shape":"ExceptionLevel",
-          "documentation":"<p>The verbosity of exception messages. Use DEBUG mode to see granular exception messages from a Gateway. If this parameter is not set, exception messages are by default sanitized for presentation to end users.</p>"
+          "documentation":"<p>The level of detail in error messages returned when invoking the gateway.</p> <ul> <li> <p>If the value is <code>DEBUG</code>, granular exception messages are returned to help a user debug the gateway.</p> </li> <li> <p>If the value is omitted, a generic error message is returned to the end user.</p> </li> </ul>"
         }
       }
     },
@@ -2010,7 +2115,7 @@
       "members":{
         "gatewayIdentifier":{
           "shape":"GatewayIdentifier",
-          "documentation":"<p>The identifier of the gateway to create a target for. This can be either the gateway ID or the gateway ARN.</p>",
+          "documentation":"<p>The identifier of the gateway to create a target for.</p>",
           "location":"uri",
           "locationName":"gatewayIdentifier"
         },
@@ -2024,7 +2129,7 @@
         },
         "clientToken":{
           "shape":"ClientToken",
-          "documentation":"<p>A unique, case-sensitive identifier to ensure that the operation completes no more than one time. If this token matches a previous request, Amazon Bedrock ignores the request but does not return an error.</p>",
+          "documentation":"<p>A unique, case-sensitive identifier to ensure that the API request completes no more than one time. If this token matches a previous request, the service ignores the request, but does not return an error. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring idempotency</a>.</p>",
           "idempotencyToken":true
         },
         "targetConfiguration":{
@@ -2483,13 +2588,13 @@
       "members":{
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime associated with the endpoint.</p>",
+          "documentation":"<p>The unique identifier of the AgentCore Runtime associated with the endpoint.</p>",
           "location":"uri",
           "locationName":"agentRuntimeId"
         },
         "endpointName":{
           "shape":"EndpointName",
-          "documentation":"<p>The name of the agent runtime endpoint to delete.</p>",
+          "documentation":"<p>The name of the AgentCore Runtime endpoint to delete.</p>",
           "location":"uri",
           "locationName":"endpointName"
         },
@@ -2507,8 +2612,8 @@
       "required":["status"],
       "members":{
         "status":{
-          "shape":"AgentEndpointStatus",
-          "documentation":"<p>The current status of the agent runtime endpoint deletion.</p>"
+          "shape":"AgentRuntimeEndpointStatus",
+          "documentation":"<p>The current status of the AgentCore Runtime endpoint deletion.</p>"
         }
       }
     },
@@ -2518,7 +2623,7 @@
       "members":{
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime to delete.</p>",
+          "documentation":"<p>The unique identifier of the AgentCore Runtime to delete.</p>",
           "location":"uri",
           "locationName":"agentRuntimeId"
         }
@@ -2529,8 +2634,8 @@
       "required":["status"],
       "members":{
         "status":{
-          "shape":"AgentStatus",
-          "documentation":"<p>The current status of the agent runtime deletion.</p>"
+          "shape":"AgentRuntimeStatus",
+          "documentation":"<p>The current status of the AgentCore Runtime deletion.</p>"
         }
       }
     },
@@ -2636,7 +2741,7 @@
       "members":{
         "gatewayIdentifier":{
           "shape":"GatewayIdentifier",
-          "documentation":"<p>The identifier of the gateway to delete. This can be either the gateway ID or the gateway ARN.</p>",
+          "documentation":"<p>The identifier of the gateway to delete.</p>",
           "location":"uri",
           "locationName":"gatewayIdentifier"
         }
@@ -2651,15 +2756,15 @@
       "members":{
         "gatewayId":{
           "shape":"GatewayId",
-          "documentation":"<p>The unique identifier of the deleted Gateway.</p>"
+          "documentation":"<p>The unique identifier of the deleted gateway.</p>"
         },
         "status":{
           "shape":"GatewayStatus",
-          "documentation":"<p>The current status of the Gateway deletion.</p>"
+          "documentation":"<p>The current status of the gateway deletion.</p>"
         },
         "statusReasons":{
           "shape":"StatusReasons",
-          "documentation":"<p>The reasons for the current status of the Gateway deletion.</p>"
+          "documentation":"<p>The reasons for the current status of the gateway deletion.</p>"
         }
       }
     },
@@ -2672,13 +2777,13 @@
       "members":{
         "gatewayIdentifier":{
           "shape":"GatewayIdentifier",
-          "documentation":"<p>The unique identifier of the Gateway associated with the target.</p>",
+          "documentation":"<p>The unique identifier of the gateway associated with the target.</p>",
           "location":"uri",
           "locationName":"gatewayIdentifier"
         },
         "targetId":{
           "shape":"TargetId",
-          "documentation":"<p>The unique identifier of the Gateway Target to delete.</p>",
+          "documentation":"<p>The unique identifier of the gateway target to delete.</p>",
           "location":"uri",
           "locationName":"targetId"
         }
@@ -2694,19 +2799,19 @@
       "members":{
         "gatewayArn":{
           "shape":"GatewayArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Gateway.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the gateway.</p>"
         },
         "targetId":{
           "shape":"TargetId",
-          "documentation":"<p>The unique identifier of the deleted Gateway Target.</p>"
+          "documentation":"<p>The unique identifier of the deleted gateway target.</p>"
         },
         "status":{
           "shape":"TargetStatus",
-          "documentation":"<p>The current status of the Gateway Target deletion.</p>"
+          "documentation":"<p>The current status of the gateway target deletion.</p>"
         },
         "statusReasons":{
           "shape":"StatusReasons",
-          "documentation":"<p>The reasons for the current status of the Gateway Target deletion.</p>"
+          "documentation":"<p>The reasons for the current status of the gateway target deletion.</p>"
         }
       }
     },
@@ -2740,11 +2845,11 @@
       "members":{
         "memoryId":{
           "shape":"MemoryId",
-          "documentation":"<p>The unique identifier of the deleted memory.</p>"
+          "documentation":"<p>The unique identifier of the deleted AgentCore Memory resource.</p>"
         },
         "status":{
           "shape":"MemoryStatus",
-          "documentation":"<p>The current status of the memory deletion.</p>"
+          "documentation":"<p>The current status of the AgentCore Memory resource deletion.</p>"
         }
       }
     },
@@ -2982,13 +3087,13 @@
       "members":{
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime associated with the endpoint.</p>",
+          "documentation":"<p>The unique identifier of the AgentCore Runtime associated with the endpoint.</p>",
           "location":"uri",
           "locationName":"agentRuntimeId"
         },
         "endpointName":{
           "shape":"EndpointName",
-          "documentation":"<p>The name of the agent runtime endpoint to retrieve.</p>",
+          "documentation":"<p>The name of the AgentCore Runtime endpoint to retrieve.</p>",
           "location":"uri",
           "locationName":"endpointName"
         }
@@ -3008,47 +3113,47 @@
       "members":{
         "liveVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The currently deployed version of the agent runtime on the endpoint.</p>"
+          "documentation":"<p>The currently deployed version of the AgentCore Runtime on the endpoint.</p>"
         },
         "targetVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The target version of the agent runtime for the endpoint.</p>"
+          "documentation":"<p>The target version of the AgentCore Runtime for the endpoint.</p>"
         },
         "agentRuntimeEndpointArn":{
           "shape":"AgentRuntimeEndpointArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the agent runtime endpoint.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AgentCore Runtime endpoint.</p>"
         },
         "agentRuntimeArn":{
           "shape":"AgentRuntimeArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the agent runtime.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AgentCore Runtime.</p>"
         },
         "description":{
           "shape":"AgentEndpointDescription",
-          "documentation":"<p>The description of the agent runtime endpoint.</p>"
+          "documentation":"<p>The description of the AgentCore Runtime endpoint.</p>"
         },
         "status":{
-          "shape":"AgentEndpointStatus",
-          "documentation":"<p>The current status of the agent runtime endpoint.</p>"
+          "shape":"AgentRuntimeEndpointStatus",
+          "documentation":"<p>The current status of the AgentCore Runtime endpoint.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime endpoint was created.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime endpoint was created.</p>"
         },
         "lastUpdatedAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime endpoint was last updated.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime endpoint was last updated.</p>"
         },
         "failureReason":{
           "shape":"String",
-          "documentation":"<p>The reason for failure if the agent runtime endpoint is in a failed state.</p>"
+          "documentation":"<p>The reason for failure if the AgentCore Runtime endpoint is in a failed state.</p>"
         },
         "name":{
           "shape":"EndpointName",
-          "documentation":"<p>The name of the agent runtime endpoint.</p>"
+          "documentation":"<p>The name of the AgentCore Runtime endpoint.</p>"
         },
         "id":{
           "shape":"AgentRuntimeEndpointId",
-          "documentation":"<p>The unique identifier of the agent runtime endpoint.</p>"
+          "documentation":"<p>The unique identifier of the AgentCore Runtime endpoint.</p>"
         }
       }
     },
@@ -3058,13 +3163,13 @@
       "members":{
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime to retrieve.</p>",
+          "documentation":"<p>The unique identifier of the AgentCore Runtime to retrieve.</p>",
           "location":"uri",
           "locationName":"agentRuntimeId"
         },
         "agentRuntimeVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The version of the agent runtime to retrieve.</p>",
+          "documentation":"<p>The version of the AgentCore Runtime to retrieve.</p>",
           "location":"querystring",
           "locationName":"version"
         }
@@ -3086,60 +3191,64 @@
       "members":{
         "agentRuntimeArn":{
           "shape":"AgentRuntimeArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the agent runtime.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AgentCore Runtime.</p>"
         },
         "workloadIdentityDetails":{
           "shape":"WorkloadIdentityDetails",
-          "documentation":"<p>The workload identity details for the agent runtime.</p>"
+          "documentation":"<p>The workload identity details for the AgentCore Runtime.</p>"
         },
         "agentRuntimeName":{
           "shape":"AgentRuntimeName",
-          "documentation":"<p>The name of the agent runtime.</p>"
+          "documentation":"<p>The name of the AgentCore Runtime.</p>"
         },
         "description":{
           "shape":"Description",
-          "documentation":"<p>The description of the agent runtime.</p>"
+          "documentation":"<p>The description of the AgentCore Runtime.</p>"
         },
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime.</p>"
+          "documentation":"<p>The unique identifier of the AgentCore Runtime.</p>"
         },
         "agentRuntimeVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The version of the agent runtime.</p>"
+          "documentation":"<p>The version of the AgentCore Runtime.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime was created.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime was created.</p>"
         },
         "lastUpdatedAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime was last updated.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime was last updated.</p>"
         },
         "roleArn":{
           "shape":"RoleArn",
-          "documentation":"<p>The IAM role ARN that provides permissions for the agent runtime.</p>"
+          "documentation":"<p>The IAM role ARN that provides permissions for the AgentCore Runtime.</p>"
         },
         "agentRuntimeArtifact":{
-          "shape":"AgentArtifact",
-          "documentation":"<p>The artifact of the agent runtime.</p>"
+          "shape":"AgentRuntimeArtifact",
+          "documentation":"<p>The artifact of the AgentCore Runtime.</p>"
         },
         "networkConfiguration":{
           "shape":"NetworkConfiguration",
-          "documentation":"<p>The network configuration for the agent runtime.</p>"
+          "documentation":"<p>The network configuration for the AgentCore Runtime.</p>"
         },
         "protocolConfiguration":{"shape":"ProtocolConfiguration"},
         "environmentVariables":{
           "shape":"EnvironmentVariablesMap",
-          "documentation":"<p>Environment variables set in the agent runtime environment.</p>"
+          "documentation":"<p>Environment variables set in the AgentCore Runtime environment.</p>"
         },
         "authorizerConfiguration":{
           "shape":"AuthorizerConfiguration",
-          "documentation":"<p>The authorizer configuration for the agent runtime.</p>"
+          "documentation":"<p>The authorizer configuration for the AgentCore Runtime.</p>"
+        },
+        "requestHeaderConfiguration":{
+          "shape":"RequestHeaderConfiguration",
+          "documentation":"<p>Configuration for HTTP request headers that will be passed through to the runtime.</p>"
         },
         "status":{
-          "shape":"AgentStatus",
-          "documentation":"<p>The current status of the agent runtime.</p>"
+          "shape":"AgentRuntimeStatus",
+          "documentation":"<p>The current status of the AgentCore Runtime.</p>"
         }
       }
     },
@@ -3235,6 +3344,10 @@
           "shape":"BrowserStatus",
           "documentation":"<p>The current status of the browser.</p>"
         },
+        "failureReason":{
+          "shape":"String",
+          "documentation":"<p>The reason for failure if the browser is in a failed state.</p>"
+        },
         "createdAt":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp when the browser was created.</p>"
@@ -3294,6 +3407,10 @@
           "shape":"CodeInterpreterStatus",
           "documentation":"<p>The current status of the code interpreter.</p>"
         },
+        "failureReason":{
+          "shape":"String",
+          "documentation":"<p>The reason for failure if the code interpreter is in a failed state.</p>"
+        },
         "createdAt":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp when the code interpreter was created.</p>"
@@ -3310,7 +3427,7 @@
       "members":{
         "gatewayIdentifier":{
           "shape":"GatewayIdentifier",
-          "documentation":"<p>The identifier of the gateway to retrieve. This can be either the gateway ID or the gateway ARN.</p>",
+          "documentation":"<p>The identifier of the gateway to retrieve.</p>",
           "location":"uri",
           "locationName":"gatewayIdentifier"
         }
@@ -3331,47 +3448,47 @@
       "members":{
         "gatewayArn":{
           "shape":"GatewayArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Gateway.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the gateway.</p>"
         },
         "gatewayId":{
           "shape":"GatewayId",
-          "documentation":"<p>The unique identifier of the Gateway.</p>"
+          "documentation":"<p>The unique identifier of the gateway.</p>"
         },
         "gatewayUrl":{
           "shape":"GatewayUrl",
-          "documentation":"<p>An endpoint for invoking Gateway.</p>"
+          "documentation":"<p>An endpoint for invoking gateway.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the Gateway was created.</p>"
+          "documentation":"<p>The timestamp when the gateway was created.</p>"
         },
         "updatedAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the Gateway was last updated.</p>"
+          "documentation":"<p>The timestamp when the gateway was last updated.</p>"
         },
         "status":{
           "shape":"GatewayStatus",
-          "documentation":"<p>The current status of the Gateway.</p>"
+          "documentation":"<p>The current status of the gateway.</p>"
         },
         "statusReasons":{
           "shape":"StatusReasons",
-          "documentation":"<p>The reasons for the current status of the Gateway.</p>"
+          "documentation":"<p>The reasons for the current status of the gateway.</p>"
         },
         "name":{
           "shape":"GatewayName",
-          "documentation":"<p>The name of the Gateway.</p>"
+          "documentation":"<p>The name of the gateway.</p>"
         },
         "description":{
           "shape":"GatewayDescription",
-          "documentation":"<p>The description of the Gateway.</p>"
+          "documentation":"<p>The description of the gateway.</p>"
         },
         "roleArn":{
           "shape":"RoleArn",
-          "documentation":"<p>The IAM role ARN that provides permissions for the Gateway.</p>"
+          "documentation":"<p>The IAM role ARN that provides permissions for the gateway.</p>"
         },
         "protocolType":{
           "shape":"GatewayProtocolType",
-          "documentation":"<p>Protocol applied to a Gateway.</p>"
+          "documentation":"<p>Protocol applied to a gateway.</p>"
         },
         "protocolConfiguration":{"shape":"GatewayProtocolConfiguration"},
         "authorizerType":{
@@ -3380,19 +3497,19 @@
         },
         "authorizerConfiguration":{
           "shape":"AuthorizerConfiguration",
-          "documentation":"<p>The authorizer configuration for the Gateway.</p>"
+          "documentation":"<p>The authorizer configuration for the gateway.</p>"
         },
         "kmsKeyArn":{
           "shape":"KmsKeyArn",
-          "documentation":"<p>The ARN of the KMS key used to encrypt the Gateway.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the KMS key used to encrypt the gateway.</p>"
         },
         "workloadIdentityDetails":{
           "shape":"WorkloadIdentityDetails",
-          "documentation":"<p>The workload identity details for the Gateway.</p>"
+          "documentation":"<p>The workload identity details for the gateway.</p>"
         },
         "exceptionLevel":{
           "shape":"ExceptionLevel",
-          "documentation":"<p>The verbosity of exception messages. Use DEBUG mode to see granular exception messages from a Gateway. If this parameter is not set, exception messages are by default sanitized for presentation to end users.</p>"
+          "documentation":"<p>The level of detail in error messages returned when invoking the gateway.</p> <ul> <li> <p>If the value is <code>DEBUG</code>, granular exception messages are returned to help a user debug the gateway.</p> </li> <li> <p>If the value is omitted, a generic error message is returned to the end user.</p> </li> </ul>"
         }
       }
     },
@@ -3405,7 +3522,7 @@
       "members":{
         "gatewayIdentifier":{
           "shape":"GatewayIdentifier",
-          "documentation":"<p>The identifier of the gateway that contains the target. This can be either the gateway ID or the gateway ARN.</p>",
+          "documentation":"<p>The identifier of the gateway that contains the target.</p>",
           "location":"uri",
           "locationName":"gatewayIdentifier"
         },
@@ -3432,40 +3549,40 @@
       "members":{
         "gatewayArn":{
           "shape":"GatewayArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Gateway.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the gateway.</p>"
         },
         "targetId":{
           "shape":"TargetId",
-          "documentation":"<p>The unique identifier of the Gateway Target.</p>"
+          "documentation":"<p>The unique identifier of the gateway target.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the Gateway Target was created.</p>"
+          "documentation":"<p>The timestamp when the gateway target was created.</p>"
         },
         "updatedAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the Gateway Target was last updated.</p>"
+          "documentation":"<p>The timestamp when the gateway target was last updated.</p>"
         },
         "status":{
           "shape":"TargetStatus",
-          "documentation":"<p>The current status of the Gateway Target.</p>"
+          "documentation":"<p>The current status of the gateway target.</p>"
         },
         "statusReasons":{
           "shape":"StatusReasons",
-          "documentation":"<p>The reasons for the current status of the Gateway Target.</p>"
+          "documentation":"<p>The reasons for the current status of the gateway target.</p>"
         },
         "name":{
           "shape":"TargetName",
-          "documentation":"<p>The name of the Gateway Target.</p>"
+          "documentation":"<p>The name of the gateway target.</p>"
         },
         "description":{
           "shape":"TargetDescription",
-          "documentation":"<p>The description of the Gateway Target.</p>"
+          "documentation":"<p>The description of the gateway target.</p>"
         },
         "targetConfiguration":{"shape":"TargetConfiguration"},
         "credentialProviderConfigurations":{
           "shape":"CredentialProviderConfigurations",
-          "documentation":"<p>The credential provider configurations for the Gateway Target.</p>"
+          "documentation":"<p>The credential provider configurations for the gateway target.</p>"
         }
       }
     },
@@ -3487,7 +3604,7 @@
       "members":{
         "memory":{
           "shape":"Memory",
-          "documentation":"<p>The retrieved memory details.</p>"
+          "documentation":"<p>The retrieved AgentCore Memory resource details.</p>"
         }
       }
     },
@@ -3673,6 +3790,12 @@
       },
       "documentation":"<p>Output configuration for a Google OAuth2 provider.</p>"
     },
+    "HeaderName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"(Authorization|X-Amzn-Bedrock-AgentCore-Runtime-Custom-[a-zA-Z0-9_-]+)"
+    },
     "InlinePayload":{
       "type":"string",
       "sensitive":true
@@ -3728,7 +3851,7 @@
       "members":{
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime to list endpoints for.</p>",
+          "documentation":"<p>The unique identifier of the AgentCore Runtime to list endpoints for.</p>",
           "location":"uri",
           "locationName":"agentRuntimeId"
         },
@@ -3751,8 +3874,8 @@
       "required":["runtimeEndpoints"],
       "members":{
         "runtimeEndpoints":{
-          "shape":"AgentEndpoints",
-          "documentation":"<p>The list of agent runtime endpoints.</p>"
+          "shape":"AgentRuntimeEndpoints",
+          "documentation":"<p>The list of AgentCore Runtime endpoints.</p>"
         },
         "nextToken":{
           "shape":"NextToken",
@@ -3766,7 +3889,7 @@
       "members":{
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime to list versions for.</p>",
+          "documentation":"<p>The unique identifier of the AgentCore Runtime to list versions for.</p>",
           "location":"uri",
           "locationName":"agentRuntimeId"
         },
@@ -3789,8 +3912,8 @@
       "required":["agentRuntimes"],
       "members":{
         "agentRuntimes":{
-          "shape":"Agents",
-          "documentation":"<p>The list of agent runtime versions.</p>"
+          "shape":"AgentRuntimes",
+          "documentation":"<p>The list of AgentCore Runtime versions.</p>"
         },
         "nextToken":{
           "shape":"NextToken",
@@ -3820,8 +3943,8 @@
       "required":["agentRuntimes"],
       "members":{
         "agentRuntimes":{
-          "shape":"Agents",
-          "documentation":"<p>The list of agent runtimes.</p>"
+          "shape":"AgentRuntimes",
+          "documentation":"<p>The list of AgentCore Runtime resources.</p>"
         },
         "nextToken":{
           "shape":"NextToken",
@@ -3936,19 +4059,19 @@
       "members":{
         "gatewayIdentifier":{
           "shape":"GatewayIdentifier",
-          "documentation":"<p>The identifier of the gateway to list targets for. This can be either the gateway ID or the gateway ARN.</p>",
+          "documentation":"<p>The identifier of the gateway to list targets for.</p>",
           "location":"uri",
           "locationName":"gatewayIdentifier"
         },
         "maxResults":{
           "shape":"TargetMaxResults",
-          "documentation":"<p>The maximum number of results to return in a single call. The default value is 10. The maximum value is 50.</p>",
+          "documentation":"<p>The maximum number of results to return in the response. If the total number of results is greater than this value, use the token returned in the response in the <code>nextToken</code> field when making another request to return the next batch of results.</p>",
           "location":"querystring",
           "locationName":"maxResults"
         },
         "nextToken":{
           "shape":"TargetNextToken",
-          "documentation":"<p>The token for the next set of results. Use the value returned in the previous response in the next request to retrieve the next set of results.</p>",
+          "documentation":"<p>If the total number of results is greater than the <code>maxResults</code> value provided in the request, enter the token returned in the <code>nextToken</code> field in the response in this field to return the next batch of results.</p>",
           "location":"querystring",
           "locationName":"nextToken"
         }
@@ -3960,11 +4083,11 @@
       "members":{
         "items":{
           "shape":"TargetSummaries",
-          "documentation":"<p>The list of Gateway Target summaries.</p>"
+          "documentation":"<p>The list of gateway target summaries.</p>"
         },
         "nextToken":{
           "shape":"TargetNextToken",
-          "documentation":"<p>Opaque continuation token for the next paginated response.</p>"
+          "documentation":"<p>If the total number of results is greater than the <code>maxResults</code> value provided in the request, use this token when making another request in the <code>nextToken</code> field to return the next batch of results.</p>"
         }
       }
     },
@@ -3973,13 +4096,13 @@
       "members":{
         "maxResults":{
           "shape":"GatewayMaxResults",
-          "documentation":"<p>The maximum number of results to return in a single call. The default value is 10. The maximum value is 50.</p>",
+          "documentation":"<p>The maximum number of results to return in the response. If the total number of results is greater than this value, use the token returned in the response in the <code>nextToken</code> field when making another request to return the next batch of results.</p>",
           "location":"querystring",
           "locationName":"maxResults"
         },
         "nextToken":{
           "shape":"GatewayNextToken",
-          "documentation":"<p>The token for the next set of results. Use the value returned in the previous response in the next request to retrieve the next set of results.</p>",
+          "documentation":"<p>If the total number of results is greater than the <code>maxResults</code> value provided in the request, enter the token returned in the <code>nextToken</code> field in the response in this field to return the next batch of results.</p>",
           "location":"querystring",
           "locationName":"nextToken"
         }
@@ -3991,11 +4114,11 @@
       "members":{
         "items":{
           "shape":"GatewaySummaries",
-          "documentation":"<p>The list of Gateway summaries.</p>"
+          "documentation":"<p>The list of gateway summaries.</p>"
         },
         "nextToken":{
           "shape":"GatewayNextToken",
-          "documentation":"<p>Opaque continuation token for the next paginated response.</p>"
+          "documentation":"<p>If the total number of results is greater than the <code>maxResults</code> value provided in the request, use this token when making another request in the <code>nextToken</code> field to return the next batch of results.</p>"
         }
       }
     },
@@ -4024,7 +4147,7 @@
       "members":{
         "memories":{
           "shape":"MemorySummaryList",
-          "documentation":"<p>The list of memory summaries.</p>"
+          "documentation":"<p>The list of AgentCore Memory resource summaries.</p>"
         },
         "nextToken":{
           "shape":"String",
@@ -4065,6 +4188,27 @@
         }
       }
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"TaggableResourcesArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource for which you want to list tags.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>The tags associated with the resource.</p>"
+        }
+      }
+    },
     "ListWorkloadIdentitiesRequest":{
       "type":"structure",
       "members":{
@@ -4523,14 +4667,21 @@
       "members":{
         "networkMode":{
           "shape":"NetworkMode",
-          "documentation":"<p>The network mode for the agent runtime.</p>"
+          "documentation":"<p>The network mode for the AgentCore Runtime.</p>"
+        },
+        "networkModeConfig":{
+          "shape":"VpcConfig",
+          "documentation":"<p>The network mode configuration for the AgentCore Runtime.</p>"
         }
       },
       "documentation":"<p>SecurityConfig for the Agent.</p>"
     },
     "NetworkMode":{
       "type":"string",
-      "enum":["PUBLIC"]
+      "enum":[
+        "PUBLIC",
+        "VPC"
+      ]
     },
     "NextToken":{
       "type":"string",
@@ -4777,6 +4928,23 @@
       },
       "documentation":"<p>The recording configuration for a browser. This structure defines how browser sessions are recorded.</p>"
     },
+    "RequestHeaderAllowlist":{
+      "type":"list",
+      "member":{"shape":"HeaderName"},
+      "max":20,
+      "min":1
+    },
+    "RequestHeaderConfiguration":{
+      "type":"structure",
+      "members":{
+        "requestHeaderAllowlist":{
+          "shape":"RequestHeaderAllowlist",
+          "documentation":"<p>A list of HTTP request headers that are allowed to be passed through to the runtime.</p>"
+        }
+      },
+      "documentation":"<p>Configuration for HTTP request headers that will be passed through to the runtime.</p>",
+      "union":true
+    },
     "RequiredProperties":{
       "type":"list",
       "member":{"shape":"String"}
@@ -4837,7 +5005,7 @@
       "type":"string",
       "max":1024,
       "min":1,
-      "pattern":"\\d{12}\\.dkr\\.ecr\\.([a-z0-9-]+)\\.amazonaws\\.com/((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)([:@]\\S+)"
+      "pattern":"([0-9]{12})\\.dkr\\.ecr\\.([a-z0-9-]+)\\.amazonaws\\.com/((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)(?::([^:@]{1,300}))?(?:@(.+))?"
     },
     "S3BucketUri":{
       "type":"string",
@@ -4978,6 +5146,16 @@
       "type":"string",
       "pattern":"arn:(aws|aws-us-gov):secretsmanager:[A-Za-z0-9-]{1,64}:[0-9]{12}:secret:[a-zA-Z0-9-_/+=.@!]+"
     },
+    "SecurityGroupId":{
+      "type":"string",
+      "pattern":"sg-[0-9a-zA-Z]{8,17}"
+    },
+    "SecurityGroups":{
+      "type":"list",
+      "member":{"shape":"SecurityGroupId"},
+      "max":16,
+      "min":1
+    },
     "SemanticConsolidationOverride":{
       "type":"structure",
       "required":[
@@ -5208,6 +5386,16 @@
       "documentation":"<p>Contains configuration information for a memory strategy.</p>"
     },
     "String":{"type":"string"},
+    "SubnetId":{
+      "type":"string",
+      "pattern":"subnet-[0-9a-zA-Z]{8,17}"
+    },
+    "Subnets":{
+      "type":"list",
+      "member":{"shape":"SubnetId"},
+      "max":16,
+      "min":1
+    },
     "SummaryConsolidationOverride":{
       "type":"structure",
       "required":[
@@ -5273,6 +5461,60 @@
       },
       "documentation":"<p>Input for summary override consolidation configuration in a memory strategy.</p>"
     },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-zA-Z0-9\\s._:/=+@-]*"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"TaggableResourcesArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource that you want to tag.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>The tags to add to the resource. A tag is a key-value pair.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{}
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":"[a-zA-Z0-9\\s._:/=+@-]*"
+    },
+    "TaggableResourcesArn":{
+      "type":"string",
+      "max":1011,
+      "min":20,
+      "pattern":"arn:(?:[^:]+)?:bedrock-agentcore:[a-z0-9-]+:[0-9]{12}:([a-z-]+/[^/]+)(?:/[a-z-]+/[^/]+)*"
+    },
+    "TagsMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"},
+      "max":50,
+      "min":0
+    },
     "TargetConfiguration":{
       "type":"structure",
       "members":{
@@ -5454,6 +5696,31 @@
       },
       "exception":true
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"TaggableResourcesArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource that you want to untag.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tag keys of the tags to remove from the resource.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{}
+    },
     "UpdateAgentRuntimeEndpointRequest":{
       "type":"structure",
       "required":[
@@ -5463,23 +5730,23 @@
       "members":{
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime associated with the endpoint.</p>",
+          "documentation":"<p>The unique identifier of the AgentCore Runtime associated with the endpoint.</p>",
           "location":"uri",
           "locationName":"agentRuntimeId"
         },
         "endpointName":{
           "shape":"EndpointName",
-          "documentation":"<p>The name of the agent runtime endpoint to update.</p>",
+          "documentation":"<p>The name of the AgentCore Runtime endpoint to update.</p>",
           "location":"uri",
           "locationName":"endpointName"
         },
         "agentRuntimeVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The updated version of the agent runtime for the endpoint.</p>"
+          "documentation":"<p>The updated version of the AgentCore Runtime for the endpoint.</p>"
         },
         "description":{
           "shape":"AgentEndpointDescription",
-          "documentation":"<p>The updated description of the agent runtime endpoint.</p>"
+          "documentation":"<p>The updated description of the AgentCore Runtime endpoint.</p>"
         },
         "clientToken":{
           "shape":"ClientToken",
@@ -5500,31 +5767,31 @@
       "members":{
         "liveVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The currently deployed version of the agent runtime on the endpoint.</p>"
+          "documentation":"<p>The currently deployed version of the AgentCore Runtime on the endpoint.</p>"
         },
         "targetVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The target version of the agent runtime for the endpoint.</p>"
+          "documentation":"<p>The target version of the AgentCore Runtime for the endpoint.</p>"
         },
         "agentRuntimeEndpointArn":{
           "shape":"AgentRuntimeEndpointArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the agent runtime endpoint.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AgentCore Runtime endpoint.</p>"
         },
         "agentRuntimeArn":{
           "shape":"AgentRuntimeArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the agent runtime.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AgentCore Runtime.</p>"
         },
         "status":{
-          "shape":"AgentEndpointStatus",
-          "documentation":"<p>The current status of the updated agent runtime endpoint.</p>"
+          "shape":"AgentRuntimeEndpointStatus",
+          "documentation":"<p>The current status of the updated AgentCore Runtime endpoint.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime endpoint was created.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime endpoint was created.</p>"
         },
         "lastUpdatedAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime endpoint was last updated.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime endpoint was last updated.</p>"
         }
       }
     },
@@ -5539,25 +5806,25 @@
       "members":{
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the agent runtime to update.</p>",
+          "documentation":"<p>The unique identifier of the AgentCore Runtime to update.</p>",
           "location":"uri",
           "locationName":"agentRuntimeId"
         },
         "description":{
           "shape":"Description",
-          "documentation":"<p>The updated description of the agent runtime.</p>"
+          "documentation":"<p>The updated description of the AgentCore Runtime.</p>"
         },
         "agentRuntimeArtifact":{
-          "shape":"AgentArtifact",
-          "documentation":"<p>The updated artifact of the agent runtime.</p>"
+          "shape":"AgentRuntimeArtifact",
+          "documentation":"<p>The updated artifact of the AgentCore Runtime.</p>"
         },
         "roleArn":{
           "shape":"RoleArn",
-          "documentation":"<p>The updated IAM role ARN that provides permissions for the agent runtime.</p>"
+          "documentation":"<p>The updated IAM role ARN that provides permissions for the AgentCore Runtime.</p>"
         },
         "networkConfiguration":{
           "shape":"NetworkConfiguration",
-          "documentation":"<p>The updated network configuration for the agent runtime.</p>"
+          "documentation":"<p>The updated network configuration for the AgentCore Runtime.</p>"
         },
         "protocolConfiguration":{"shape":"ProtocolConfiguration"},
         "clientToken":{
@@ -5567,11 +5834,15 @@
         },
         "environmentVariables":{
           "shape":"EnvironmentVariablesMap",
-          "documentation":"<p>Updated environment variables to set in the agent runtime environment.</p>"
+          "documentation":"<p>Updated environment variables to set in the AgentCore Runtime environment.</p>"
         },
         "authorizerConfiguration":{
           "shape":"AuthorizerConfiguration",
-          "documentation":"<p>The updated authorizer configuration for the agent runtime.</p>"
+          "documentation":"<p>The updated authorizer configuration for the AgentCore Runtime.</p>"
+        },
+        "requestHeaderConfiguration":{
+          "shape":"RequestHeaderConfiguration",
+          "documentation":"<p>The updated configuration for HTTP request headers that will be passed through to the runtime.</p>"
         }
       }
     },
@@ -5588,31 +5859,31 @@
       "members":{
         "agentRuntimeArn":{
           "shape":"AgentRuntimeArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the updated agent runtime.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the updated AgentCore Runtime.</p>"
         },
         "agentRuntimeId":{
           "shape":"AgentRuntimeId",
-          "documentation":"<p>The unique identifier of the updated agent runtime.</p>"
+          "documentation":"<p>The unique identifier of the updated AgentCore Runtime.</p>"
         },
         "workloadIdentityDetails":{
           "shape":"WorkloadIdentityDetails",
-          "documentation":"<p>The workload identity details for the updated agent runtime.</p>"
+          "documentation":"<p>The workload identity details for the updated AgentCore Runtime.</p>"
         },
         "agentRuntimeVersion":{
           "shape":"AgentRuntimeVersion",
-          "documentation":"<p>The version of the updated agent runtime.</p>"
+          "documentation":"<p>The version of the updated AgentCore Runtime.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime was created.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime was created.</p>"
         },
         "lastUpdatedAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the agent runtime was last updated.</p>"
+          "documentation":"<p>The timestamp when the AgentCore Runtime was last updated.</p>"
         },
         "status":{
-          "shape":"AgentStatus",
-          "documentation":"<p>The current status of the updated agent runtime.</p>"
+          "shape":"AgentRuntimeStatus",
+          "documentation":"<p>The current status of the updated AgentCore Runtime.</p>"
         }
       }
     },
@@ -5678,42 +5949,42 @@
       "members":{
         "gatewayIdentifier":{
           "shape":"GatewayIdentifier",
-          "documentation":"<p>The identifier of the gateway to update. This can be either the gateway ID or the gateway ARN.</p>",
+          "documentation":"<p>The identifier of the gateway to update.</p>",
           "location":"uri",
           "locationName":"gatewayIdentifier"
         },
         "name":{
           "shape":"GatewayName",
-          "documentation":"<p>The updated name for the Gateway.</p>"
+          "documentation":"<p>The name of the gateway. This name must be the same as the one when the gateway was created.</p>"
         },
         "description":{
           "shape":"GatewayDescription",
-          "documentation":"<p>The updated description for the Gateway.</p>"
+          "documentation":"<p>The updated description for the gateway.</p>"
         },
         "roleArn":{
           "shape":"RoleArn",
-          "documentation":"<p>The updated IAM role ARN that provides permissions for the Gateway.</p>"
+          "documentation":"<p>The updated IAM role ARN that provides permissions for the gateway.</p>"
         },
         "protocolType":{
           "shape":"GatewayProtocolType",
-          "documentation":"<p>The updated protocol type for the Gateway.</p>"
+          "documentation":"<p>The updated protocol type for the gateway.</p>"
         },
         "protocolConfiguration":{"shape":"GatewayProtocolConfiguration"},
         "authorizerType":{
           "shape":"AuthorizerType",
-          "documentation":"<p>The updated authorizer type for the Gateway.</p>"
+          "documentation":"<p>The updated authorizer type for the gateway.</p>"
         },
         "authorizerConfiguration":{
           "shape":"AuthorizerConfiguration",
-          "documentation":"<p>The updated authorizer configuration for the Gateway.</p>"
+          "documentation":"<p>The updated authorizer configuration for the gateway.</p>"
         },
         "kmsKeyArn":{
           "shape":"KmsKeyArn",
-          "documentation":"<p>The updated ARN of the KMS key used to encrypt the Gateway.</p>"
+          "documentation":"<p>The updated ARN of the KMS key used to encrypt the gateway.</p>"
         },
         "exceptionLevel":{
           "shape":"ExceptionLevel",
-          "documentation":"<p>The verbosity of exception messages. Use DEBUG mode to see granular exception messages from a Gateway. If this parameter is not set, exception messages are by default sanitized for presentation to end users.</p>"
+          "documentation":"<p>The level of detail in error messages returned when invoking the gateway.</p> <ul> <li> <p>If the value is <code>DEBUG</code>, granular exception messages are returned to help a user debug the gateway.</p> </li> <li> <p>If the value is omitted, a generic error message is returned to the end user.</p> </li> </ul>"
         }
       }
     },
@@ -5732,68 +6003,68 @@
       "members":{
         "gatewayArn":{
           "shape":"GatewayArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the updated Gateway.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the updated gateway.</p>"
         },
         "gatewayId":{
           "shape":"GatewayId",
-          "documentation":"<p>The unique identifier of the updated Gateway.</p>"
+          "documentation":"<p>The unique identifier of the updated gateway.</p>"
         },
         "gatewayUrl":{
           "shape":"GatewayUrl",
-          "documentation":"<p>An endpoint for invoking the updated Gateway.</p>"
+          "documentation":"<p>An endpoint for invoking the updated gateway.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the Gateway was created.</p>"
+          "documentation":"<p>The timestamp when the gateway was created.</p>"
         },
         "updatedAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the Gateway was last updated.</p>"
+          "documentation":"<p>The timestamp when the gateway was last updated.</p>"
         },
         "status":{
           "shape":"GatewayStatus",
-          "documentation":"<p>The current status of the updated Gateway.</p>"
+          "documentation":"<p>The current status of the updated gateway.</p>"
         },
         "statusReasons":{
           "shape":"StatusReasons",
-          "documentation":"<p>The reasons for the current status of the updated Gateway.</p>"
+          "documentation":"<p>The reasons for the current status of the updated gateway.</p>"
         },
         "name":{
           "shape":"GatewayName",
-          "documentation":"<p>The updated name of the Gateway.</p>"
+          "documentation":"<p>The name of the gateway.</p>"
         },
         "description":{
           "shape":"GatewayDescription",
-          "documentation":"<p>The updated description of the Gateway.</p>"
+          "documentation":"<p>The updated description of the gateway.</p>"
         },
         "roleArn":{
           "shape":"RoleArn",
-          "documentation":"<p>The updated IAM role ARN that provides permissions for the Gateway.</p>"
+          "documentation":"<p>The updated IAM role ARN that provides permissions for the gateway.</p>"
         },
         "protocolType":{
           "shape":"GatewayProtocolType",
-          "documentation":"<p>The updated protocol type for the Gateway.</p>"
+          "documentation":"<p>The updated protocol type for the gateway.</p>"
         },
         "protocolConfiguration":{"shape":"GatewayProtocolConfiguration"},
         "authorizerType":{
           "shape":"AuthorizerType",
-          "documentation":"<p>The updated authorizer type for the Gateway.</p>"
+          "documentation":"<p>The updated authorizer type for the gateway.</p>"
         },
         "authorizerConfiguration":{
           "shape":"AuthorizerConfiguration",
-          "documentation":"<p>The updated authorizer configuration for the Gateway.</p>"
+          "documentation":"<p>The updated authorizer configuration for the gateway.</p>"
         },
         "kmsKeyArn":{
           "shape":"KmsKeyArn",
-          "documentation":"<p>The updated ARN of the KMS key used to encrypt the Gateway.</p>"
+          "documentation":"<p>The updated ARN of the KMS key used to encrypt the gateway.</p>"
         },
         "workloadIdentityDetails":{
           "shape":"WorkloadIdentityDetails",
-          "documentation":"<p>The workload identity details for the updated Gateway.</p>"
+          "documentation":"<p>The workload identity details for the updated gateway.</p>"
         },
         "exceptionLevel":{
           "shape":"ExceptionLevel",
-          "documentation":"<p>The verbosity of exception messages. Use DEBUG mode to see granular exception messages from a Gateway. If this parameter is not set, exception messages are by default sanitized for presentation to end users.</p>"
+          "documentation":"<p>The level of detail in error messages returned when invoking the gateway.</p> <ul> <li> <p>If the value is <code>DEBUG</code>, granular exception messages are returned to help a user debug the gateway.</p> </li> <li> <p>If the value is omitted, a generic error message is returned to the end user.</p> </li> </ul>"
         }
       }
     },
@@ -5809,28 +6080,28 @@
       "members":{
         "gatewayIdentifier":{
           "shape":"GatewayIdentifier",
-          "documentation":"<p>The unique identifier of the Gateway associated with the target.</p>",
+          "documentation":"<p>The unique identifier of the gateway associated with the target.</p>",
           "location":"uri",
           "locationName":"gatewayIdentifier"
         },
         "targetId":{
           "shape":"TargetId",
-          "documentation":"<p>The unique identifier of the Gateway Target to update.</p>",
+          "documentation":"<p>The unique identifier of the gateway target to update.</p>",
           "location":"uri",
           "locationName":"targetId"
         },
         "name":{
           "shape":"TargetName",
-          "documentation":"<p>The updated name for the Gateway Target.</p>"
+          "documentation":"<p>The updated name for the gateway target.</p>"
         },
         "description":{
           "shape":"TargetDescription",
-          "documentation":"<p>The updated description for the Gateway Target.</p>"
+          "documentation":"<p>The updated description for the gateway target.</p>"
         },
         "targetConfiguration":{"shape":"TargetConfiguration"},
         "credentialProviderConfigurations":{
           "shape":"CredentialProviderConfigurations",
-          "documentation":"<p>The updated credential provider configurations for the Gateway Target.</p>"
+          "documentation":"<p>The updated credential provider configurations for the gateway target.</p>"
         }
       }
     },
@@ -5849,40 +6120,40 @@
       "members":{
         "gatewayArn":{
           "shape":"GatewayArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Gateway.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the gateway.</p>"
         },
         "targetId":{
           "shape":"TargetId",
-          "documentation":"<p>The unique identifier of the updated Gateway Target.</p>"
+          "documentation":"<p>The unique identifier of the updated gateway target.</p>"
         },
         "createdAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the Gateway Target was created.</p>"
+          "documentation":"<p>The timestamp when the gateway target was created.</p>"
         },
         "updatedAt":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the Gateway Target was last updated.</p>"
+          "documentation":"<p>The timestamp when the gateway target was last updated.</p>"
         },
         "status":{
           "shape":"TargetStatus",
-          "documentation":"<p>The current status of the updated Gateway Target.</p>"
+          "documentation":"<p>The current status of the updated gateway target.</p>"
         },
         "statusReasons":{
           "shape":"StatusReasons",
-          "documentation":"<p>The reasons for the current status of the updated Gateway Target.</p>"
+          "documentation":"<p>The reasons for the current status of the updated gateway target.</p>"
         },
         "name":{
           "shape":"TargetName",
-          "documentation":"<p>The updated name of the Gateway Target.</p>"
+          "documentation":"<p>The updated name of the gateway target.</p>"
         },
         "description":{
           "shape":"TargetDescription",
-          "documentation":"<p>The updated description of the Gateway Target.</p>"
+          "documentation":"<p>The updated description of the gateway target.</p>"
         },
         "targetConfiguration":{"shape":"TargetConfiguration"},
         "credentialProviderConfigurations":{
           "shape":"CredentialProviderConfigurations",
-          "documentation":"<p>The updated credential provider configurations for the Gateway Target.</p>"
+          "documentation":"<p>The updated credential provider configurations for the gateway target.</p>"
         }
       }
     },
@@ -5903,7 +6174,7 @@
         },
         "description":{
           "shape":"Description",
-          "documentation":"<p>The updated description of the memory.</p>"
+          "documentation":"<p>The updated description of the AgentCore Memory resource.</p>"
         },
         "eventExpiryDuration":{
           "shape":"UpdateMemoryInputEventExpiryDurationInteger",
@@ -5911,7 +6182,7 @@
         },
         "memoryExecutionRoleArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the IAM role that provides permissions for the memory.</p>"
+          "documentation":"<p>The ARN of the IAM role that provides permissions for the AgentCore Memory resource.</p>"
         },
         "memoryStrategies":{
           "shape":"ModifyMemoryStrategies",
@@ -5935,7 +6206,7 @@
       "members":{
         "memory":{
           "shape":"Memory",
-          "documentation":"<p>The updated memory details.</p>"
+          "documentation":"<p>The updated AgentCore Memory resource details.</p>"
         }
       }
     },
@@ -6203,6 +6474,24 @@
         "ResourceConflict"
       ]
     },
+    "VpcConfig":{
+      "type":"structure",
+      "required":[
+        "securityGroups",
+        "subnets"
+      ],
+      "members":{
+        "securityGroups":{
+          "shape":"SecurityGroups",
+          "documentation":"<p>The security groups associated with the VPC configuration.</p>"
+        },
+        "subnets":{
+          "shape":"Subnets",
+          "documentation":"<p>The subnets associated with the VPC configuration.</p>"
+        }
+      },
+      "documentation":"<p>VpcConfig for the Agent.</p>"
+    },
     "WorkloadIdentityArn":{
       "type":"string",
       "max":1024,
@@ -6253,5 +6542,5 @@
       "documentation":"<p>Contains information about a workload identity.</p>"
     }
   },
-  "documentation":"<p><note> <p>Amazon Bedrock AgentCore is in preview release and is subject to change.</p> </note> <p>Amazon Bedrock Agent Core Control is a service that enables you to manage memory resources for your Amazon Bedrock agents.</p> <p>Use this API to create, retrieve, update, and delete memory resources and their associated memory strategies. Memory resources enable your agents to store and retrieve information from conversations and interactions.</p></p>"
+  "documentation":"<p><note> <p> is in preview release and is subject to change.</p> </note> <p>Welcome to the Amazon Bedrock AgentCore Control plane API reference. Control plane actions configure, create, modify, and monitor Amazon Web Services resources.</p></p>"
 }
diff --git a/services/bedrockagentruntime/pom.xml b/services/bedrockagentruntime/pom.xml
index 5ff7fc5d2a29..39952334931f 100644
--- a/services/bedrockagentruntime/pom.xml
+++ b/services/bedrockagentruntime/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bedrockagentruntime</artifactId>
     <name>AWS Java SDK :: Services :: Bedrock Agent Runtime</name>
diff --git a/services/bedrockagentruntime/src/main/resources/codegen-resources/service-2.json b/services/bedrockagentruntime/src/main/resources/codegen-resources/service-2.json
index e56955988f23..56d7ef914dfe 100644
--- a/services/bedrockagentruntime/src/main/resources/codegen-resources/service-2.json
+++ b/services/bedrockagentruntime/src/main/resources/codegen-resources/service-2.json
@@ -2,16 +2,15 @@
   "version":"2.0",
   "metadata":{
     "apiVersion":"2023-07-26",
+    "auth":["aws.auth#sigv4"],
     "endpointPrefix":"bedrock-agent-runtime",
-    "jsonVersion":"1.1",
     "protocol":"rest-json",
     "protocols":["rest-json"],
     "serviceFullName":"Agents for Amazon Bedrock Runtime",
     "serviceId":"Bedrock Agent Runtime",
     "signatureVersion":"v4",
     "signingName":"bedrock",
-    "uid":"bedrock-agent-runtime-2023-07-26",
-    "auth":["aws.auth#sigv4"]
+    "uid":"bedrock-agent-runtime-2023-07-26"
   },
   "operations":{
     "CreateInvocation":{
@@ -138,7 +137,8 @@
         {"shape":"AccessDeniedException"},
         {"shape":"ServiceQuotaExceededException"}
       ],
-      "documentation":"<p>Generates an SQL query from a natural language query. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/knowledge-base-generate-query.html\">Generate a query for structured data</a> in the Amazon Bedrock User Guide.</p>"
+      "documentation":"<p>Generates an SQL query from a natural language query. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/knowledge-base-generate-query.html\">Generate a query for structured data</a> in the Amazon Bedrock User Guide.</p>",
+      "readonly":true
     },
     "GetAgentMemory":{
       "name":"GetAgentMemory",
@@ -160,7 +160,8 @@
         {"shape":"AccessDeniedException"},
         {"shape":"ServiceQuotaExceededException"}
       ],
-      "documentation":"<p>Gets the sessions stored in the memory of the agent.</p>"
+      "documentation":"<p>Gets the sessions stored in the memory of the agent.</p>",
+      "readonly":true
     },
     "GetExecutionFlowSnapshot":{
       "name":"GetExecutionFlowSnapshot",
@@ -178,7 +179,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves the flow definition snapshot used for a flow execution. The snapshot represents the flow metadata and definition as it existed at the time the execution was started. Note that even if the flow is edited after an execution starts, the snapshot connected to the execution remains unchanged.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>"
+      "documentation":"<p>Retrieves the flow definition snapshot used for a flow execution. The snapshot represents the flow metadata and definition as it existed at the time the execution was started. Note that even if the flow is edited after an execution starts, the snapshot connected to the execution remains unchanged.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
+      "readonly":true
     },
     "GetFlowExecution":{
       "name":"GetFlowExecution",
@@ -196,7 +198,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves details about a specific flow execution, including its status, start and end times, and any errors that occurred during execution.</p>"
+      "documentation":"<p>Retrieves details about a specific flow execution, including its status, start and end times, and any errors that occurred during execution.</p>",
+      "readonly":true
     },
     "GetInvocationStep":{
       "name":"GetInvocationStep",
@@ -214,7 +217,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves the details of a specific invocation step within an invocation in a session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>"
+      "documentation":"<p>Retrieves the details of a specific invocation step within an invocation in a session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>",
+      "readonly":true
     },
     "GetSession":{
       "name":"GetSession",
@@ -232,7 +236,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves details about a specific session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>"
+      "documentation":"<p>Retrieves details about a specific session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>",
+      "readonly":true
     },
     "InvokeAgent":{
       "name":"InvokeAgent",
@@ -317,7 +322,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists events that occurred during a flow execution. Events provide detailed information about the execution progress, including node inputs and outputs, flow inputs and outputs, condition results, and failure events.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>"
+      "documentation":"<p>Lists events that occurred during a flow execution. Events provide detailed information about the execution progress, including node inputs and outputs, flow inputs and outputs, condition results, and failure events.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
+      "readonly":true
     },
     "ListFlowExecutions":{
       "name":"ListFlowExecutions",
@@ -335,7 +341,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists all executions of a flow. Results can be paginated and include summary information about each execution, such as status, start and end times, and the execution's Amazon Resource Name (ARN).</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>"
+      "documentation":"<p>Lists all executions of a flow. Results can be paginated and include summary information about each execution, such as status, start and end times, and the execution's Amazon Resource Name (ARN).</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
+      "readonly":true
     },
     "ListInvocationSteps":{
       "name":"ListInvocationSteps",
@@ -353,7 +360,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists all invocation steps associated with a session and optionally, an invocation within the session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>"
+      "documentation":"<p>Lists all invocation steps associated with a session and optionally, an invocation within the session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>",
+      "readonly":true
     },
     "ListInvocations":{
       "name":"ListInvocations",
@@ -371,7 +379,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists all invocations associated with a specific session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>"
+      "documentation":"<p>Lists all invocations associated with a specific session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>",
+      "readonly":true
     },
     "ListSessions":{
       "name":"ListSessions",
@@ -388,7 +397,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists all sessions in your Amazon Web Services account. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>"
+      "documentation":"<p>Lists all sessions in your Amazon Web Services account. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>",
+      "readonly":true
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -406,7 +416,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>List all the tags for the resource you specify.</p>"
+      "documentation":"<p>List all the tags for the resource you specify.</p>",
+      "readonly":true
     },
     "OptimizePrompt":{
       "name":"OptimizePrompt",
@@ -490,7 +501,8 @@
         {"shape":"AccessDeniedException"},
         {"shape":"ServiceQuotaExceededException"}
       ],
-      "documentation":"<p>Queries a knowledge base and retrieves information from it.</p>"
+      "documentation":"<p>Queries a knowledge base and retrieves information from it.</p>",
+      "readonly":true
     },
     "RetrieveAndGenerate":{
       "name":"RetrieveAndGenerate",
@@ -642,13 +654,13 @@
     "APISchema":{
       "type":"structure",
       "members":{
-        "payload":{
-          "shape":"Payload",
-          "documentation":"<p> The JSON or YAML-formatted payload defining the OpenAPI schema for the action group. </p>"
-        },
         "s3":{
           "shape":"S3Identifier",
           "documentation":"<p> Contains details about the S3 object containing the OpenAPI schema for the action group. </p>"
+        },
+        "payload":{
+          "shape":"Payload",
+          "documentation":"<p> The JSON or YAML-formatted payload defining the OpenAPI schema for the action group. </p>"
         }
       },
       "documentation":"<p> Contains details about the OpenAPI schema for the action group. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-api-schema.html\">Action group OpenAPI schemas</a>. You can either include the schema directly in the payload field or you can upload it to an S3 bucket and specify the S3 bucket location in the s3 field. </p>",
@@ -658,7 +670,7 @@
       "type":"string",
       "max":2048,
       "min":0,
-      "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:agent/[0-9a-zA-Z]{10}$"
+      "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:agent/[0-9a-zA-Z]{10}"
     },
     "AccessDeniedException":{
       "type":"structure",
@@ -675,13 +687,13 @@
     "ActionGroupExecutor":{
       "type":"structure",
       "members":{
-        "customControl":{
-          "shape":"CustomControlMethod",
-          "documentation":"<p> To return the action group invocation results directly in the <code>InvokeInlineAgent</code> response, specify <code>RETURN_CONTROL</code>. </p>"
-        },
         "lambda":{
           "shape":"LambdaResourceArn",
           "documentation":"<p> The Amazon Resource Name (ARN) of the Lambda function containing the business logic that is carried out upon invoking the action. </p>"
+        },
+        "customControl":{
+          "shape":"CustomControlMethod",
+          "documentation":"<p> To return the action group invocation results directly in the <code>InvokeInlineAgent</code> response, specify <code>RETURN_CONTROL</code>. </p>"
         }
       },
       "documentation":"<p> Contains details about the Lambda function containing the business logic that is carried out upon invoking the action or the custom control method for handling the information elicited from the user. </p>",
@@ -694,22 +706,14 @@
           "shape":"ActionGroupName",
           "documentation":"<p>The name of the action group.</p>"
         },
+        "verb":{
+          "shape":"Verb",
+          "documentation":"<p>The API method being used, based off the action group.</p>"
+        },
         "apiPath":{
           "shape":"ApiPath",
           "documentation":"<p>The path to the API to call, based off the action group.</p>"
         },
-        "executionType":{
-          "shape":"ExecutionType",
-          "documentation":"<p>How fulfillment of the action is handled. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/action-handle.html\">Handling fulfillment of the action</a>.</p>"
-        },
-        "function":{
-          "shape":"Function",
-          "documentation":"<p>The function in the action group to call.</p>"
-        },
-        "invocationId":{
-          "shape":"String",
-          "documentation":"<p>The unique identifier of the invocation. Only returned if the <code>executionType</code> is <code>RETURN_CONTROL</code>.</p>"
-        },
         "parameters":{
           "shape":"Parameters",
           "documentation":"<p>The parameters in the Lambda input event.</p>"
@@ -718,9 +722,17 @@
           "shape":"RequestBody",
           "documentation":"<p>The parameters in the request body for the Lambda input event.</p>"
         },
-        "verb":{
-          "shape":"Verb",
-          "documentation":"<p>The API method being used, based off the action group.</p>"
+        "function":{
+          "shape":"Function",
+          "documentation":"<p>The function in the action group to call.</p>"
+        },
+        "executionType":{
+          "shape":"ExecutionType",
+          "documentation":"<p>How fulfillment of the action is handled. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/action-handle.html\">Handling fulfillment of the action</a>.</p>"
+        },
+        "invocationId":{
+          "shape":"String",
+          "documentation":"<p>The unique identifier of the invocation. Only returned if the <code>executionType</code> is <code>RETURN_CONTROL</code>.</p>"
         }
       },
       "documentation":"<p>Contains information about the action group being invoked. For more information about the possible structures, see the InvocationInput tab in <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/trace-orchestration.html\">OrchestrationTrace</a> in the <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-service.html\">Amazon Bedrock User Guide</a>.</p>"
@@ -728,13 +740,13 @@
     "ActionGroupInvocationOutput":{
       "type":"structure",
       "members":{
-        "metadata":{
-          "shape":"Metadata",
-          "documentation":"<p>Contains information about the action group output.</p>"
-        },
         "text":{
           "shape":"ActionGroupOutputString",
           "documentation":"<p>The JSON-formatted string returned by the API invoked by the action group.</p>"
+        },
+        "metadata":{
+          "shape":"Metadata",
+          "documentation":"<p>Contains information about the action group output.</p>"
         }
       },
       "documentation":"<p>Contains the JSON-formatted string returned by the API invoked by the action group.</p>"
@@ -792,38 +804,37 @@
     },
     "AdditionalModelRequestFieldsValue":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "document":true
     },
     "AgentActionGroup":{
       "type":"structure",
       "required":["actionGroupName"],
       "members":{
-        "actionGroupExecutor":{
-          "shape":"ActionGroupExecutor",
-          "documentation":"<p> The Amazon Resource Name (ARN) of the Lambda function containing the business logic that is carried out upon invoking the action or the custom control method for handling the information elicited from the user. </p>"
-        },
         "actionGroupName":{
           "shape":"ResourceName",
           "documentation":"<p> The name of the action group. </p>"
         },
-        "apiSchema":{
-          "shape":"APISchema",
-          "documentation":"<p> Contains either details about the S3 object containing the OpenAPI schema for the action group or the JSON or YAML-formatted payload defining the schema. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-api-schema.html\">Action group OpenAPI schemas</a>. </p>"
-        },
         "description":{
           "shape":"ResourceDescription",
           "documentation":"<p> A description of the action group. </p>"
         },
-        "functionSchema":{
-          "shape":"FunctionSchema",
-          "documentation":"<p> Contains details about the function schema for the action group or the JSON or YAML-formatted payload defining the schema. </p>"
-        },
         "parentActionGroupSignature":{
           "shape":"ActionGroupSignature",
           "documentation":"<p>Specify a built-in or computer use action for this action group. If you specify a value, you must leave the <code>description</code>, <code>apiSchema</code>, and <code>actionGroupExecutor</code> fields empty for this action group. </p> <ul> <li> <p>To allow your agent to request the user for additional information when trying to complete a task, set this field to <code>AMAZON.UserInput</code>. </p> </li> <li> <p>To allow your agent to generate, run, and troubleshoot code when trying to complete a task, set this field to <code>AMAZON.CodeInterpreter</code>.</p> </li> <li> <p>To allow your agent to use an Anthropic computer use tool, specify one of the following values. </p> <important> <p> Computer use is a new Anthropic Claude model capability (in beta) available with Anthropic Claude 3.7 Sonnet and Claude 3.5 Sonnet v2 only. When operating computer use functionality, we recommend taking additional security precautions, such as executing computer actions in virtual environments with restricted data access and limited internet connectivity. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agent-computer-use.html\">Configure an Amazon Bedrock Agent to complete tasks with computer use tools</a>. </p> </important> <ul> <li> <p> <code>ANTHROPIC.Computer</code> - Gives the agent permission to use the mouse and keyboard and take screenshots.</p> </li> <li> <p> <code>ANTHROPIC.TextEditor</code> - Gives the agent permission to view, create and edit files.</p> </li> <li> <p> <code>ANTHROPIC.Bash</code> - Gives the agent permission to run commands in a bash shell.</p> </li> </ul> </li> </ul>"
         },
+        "actionGroupExecutor":{
+          "shape":"ActionGroupExecutor",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the Lambda function containing the business logic that is carried out upon invoking the action or the custom control method for handling the information elicited from the user. </p>"
+        },
+        "apiSchema":{
+          "shape":"APISchema",
+          "documentation":"<p> Contains either details about the S3 object containing the OpenAPI schema for the action group or the JSON or YAML-formatted payload defining the schema. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-api-schema.html\">Action group OpenAPI schemas</a>. </p>"
+        },
+        "functionSchema":{
+          "shape":"FunctionSchema",
+          "documentation":"<p> Contains details about the function schema for the action group or the JSON or YAML-formatted payload defining the schema. </p>"
+        },
         "parentActionGroupSignatureParams":{
           "shape":"ActionGroupSignatureParams",
           "documentation":"<p> The configuration settings for a computer use action. </p> <important> <p>Computer use is a new Anthropic Claude model capability (in beta) available with Claude 3.7 Sonnet and Claude 3.5 Sonnet v2 only. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agent-computer-use.html\">Configure an Amazon Bedrock Agent to complete tasks with computer use tools</a>.</p> </important>"
@@ -839,13 +850,13 @@
       "type":"string",
       "max":2048,
       "min":0,
-      "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:agent-alias/[0-9a-zA-Z]{10}/[0-9a-zA-Z]{10}$"
+      "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:agent-alias/[0-9a-zA-Z]{10}/[0-9a-zA-Z]{10}"
     },
     "AgentAliasId":{
       "type":"string",
       "max":10,
       "min":0,
-      "pattern":"^[0-9a-zA-Z]+$"
+      "pattern":"[0-9a-zA-Z]+"
     },
     "AgentCollaboration":{
       "type":"string",
@@ -858,17 +869,17 @@
     "AgentCollaboratorInputPayload":{
       "type":"structure",
       "members":{
-        "returnControlResults":{
-          "shape":"ReturnControlResults",
-          "documentation":"<p>An action invocation result.</p>"
+        "type":{
+          "shape":"PayloadType",
+          "documentation":"<p>The input type.</p>"
         },
         "text":{
           "shape":"AgentCollaboratorPayloadString",
           "documentation":"<p>Input text.</p>"
         },
-        "type":{
-          "shape":"PayloadType",
-          "documentation":"<p>The input type.</p>"
+        "returnControlResults":{
+          "shape":"ReturnControlResults",
+          "documentation":"<p>An action invocation result.</p>"
         }
       },
       "documentation":"<p>Input for an agent collaborator. The input can be text or an action invocation result.</p>"
@@ -876,14 +887,14 @@
     "AgentCollaboratorInvocationInput":{
       "type":"structure",
       "members":{
-        "agentCollaboratorAliasArn":{
-          "shape":"AgentAliasArn",
-          "documentation":"<p>The collaborator's alias ARN.</p>"
-        },
         "agentCollaboratorName":{
           "shape":"String",
           "documentation":"<p>The collaborator's name.</p>"
         },
+        "agentCollaboratorAliasArn":{
+          "shape":"AgentAliasArn",
+          "documentation":"<p>The collaborator's alias ARN.</p>"
+        },
         "input":{
           "shape":"AgentCollaboratorInputPayload",
           "documentation":"<p>Text or action invocation result input for the collaborator.</p>"
@@ -894,21 +905,21 @@
     "AgentCollaboratorInvocationOutput":{
       "type":"structure",
       "members":{
-        "agentCollaboratorAliasArn":{
-          "shape":"AgentAliasArn",
-          "documentation":"<p>The output's agent collaborator alias ARN.</p>"
-        },
         "agentCollaboratorName":{
           "shape":"String",
           "documentation":"<p>The output's agent collaborator name.</p>"
         },
-        "metadata":{
-          "shape":"Metadata",
-          "documentation":"<p>Contains information about the output from the agent collaborator.</p>"
+        "agentCollaboratorAliasArn":{
+          "shape":"AgentAliasArn",
+          "documentation":"<p>The output's agent collaborator alias ARN.</p>"
         },
         "output":{
           "shape":"AgentCollaboratorOutputPayload",
           "documentation":"<p>The output's output.</p>"
+        },
+        "metadata":{
+          "shape":"Metadata",
+          "documentation":"<p>Contains information about the output from the agent collaborator.</p>"
         }
       },
       "documentation":"<p>Output from an agent collaborator.</p>"
@@ -916,17 +927,17 @@
     "AgentCollaboratorOutputPayload":{
       "type":"structure",
       "members":{
-        "returnControlPayload":{
-          "shape":"ReturnControlPayload",
-          "documentation":"<p>An action invocation result.</p>"
+        "type":{
+          "shape":"PayloadType",
+          "documentation":"<p>The type of output.</p>"
         },
         "text":{
           "shape":"AgentCollaboratorPayloadString",
           "documentation":"<p>Text output.</p>"
         },
-        "type":{
-          "shape":"PayloadType",
-          "documentation":"<p>The type of output.</p>"
+        "returnControlPayload":{
+          "shape":"ReturnControlPayload",
+          "documentation":"<p>An action invocation result.</p>"
         }
       },
       "documentation":"<p>Output from an agent collaborator. The output can be text or an action invocation result.</p>"
@@ -939,13 +950,17 @@
       "type":"string",
       "max":10,
       "min":0,
-      "pattern":"^[0-9a-zA-Z]+$"
+      "pattern":"[0-9a-zA-Z]+"
+    },
+    "AgentTraces":{
+      "type":"list",
+      "member":{"shape":"TracePart"}
     },
     "AgentVersion":{
       "type":"string",
       "max":5,
       "min":1,
-      "pattern":"^(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})$"
+      "pattern":"(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})"
     },
     "AnalyzePromptEvent":{
       "type":"structure",
@@ -972,26 +987,14 @@
           "shape":"String",
           "documentation":"<p>The action group that the API operation belongs to.</p>"
         },
-        "actionInvocationType":{
-          "shape":"ActionInvocationType",
-          "documentation":"<p>Contains information about the API operation to invoke.</p>"
-        },
-        "agentId":{
+        "httpMethod":{
           "shape":"String",
-          "documentation":"<p>The agent's ID.</p>"
+          "documentation":"<p>The HTTP method of the API operation.</p>"
         },
         "apiPath":{
           "shape":"ApiPath",
           "documentation":"<p>The path to the API operation.</p>"
         },
-        "collaboratorName":{
-          "shape":"Name",
-          "documentation":"<p>The agent collaborator's name.</p>"
-        },
-        "httpMethod":{
-          "shape":"String",
-          "documentation":"<p>The HTTP method of the API operation.</p>"
-        },
         "parameters":{
           "shape":"ApiParameters",
           "documentation":"<p>The parameters to provide for the API request, as the agent elicited from the user.</p>"
@@ -999,6 +1002,18 @@
         "requestBody":{
           "shape":"ApiRequestBody",
           "documentation":"<p>The request body to provide for the API request, as the agent elicited from the user.</p>"
+        },
+        "actionInvocationType":{
+          "shape":"ActionInvocationType",
+          "documentation":"<p>Contains information about the API operation to invoke.</p>"
+        },
+        "agentId":{
+          "shape":"String",
+          "documentation":"<p>The agent's ID.</p>"
+        },
+        "collaboratorName":{
+          "shape":"Name",
+          "documentation":"<p>The agent collaborator's name.</p>"
         }
       },
       "documentation":"<p>Contains information about the API operation that the agent predicts should be called.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p>In the <code>returnControl</code> field of the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_ResponseSyntax\">InvokeAgent response</a> </p> </li> </ul>"
@@ -1047,9 +1062,9 @@
           "shape":"String",
           "documentation":"<p>The action group that the API operation belongs to.</p>"
         },
-        "agentId":{
+        "httpMethod":{
           "shape":"String",
-          "documentation":"<p>The agent's ID.</p>"
+          "documentation":"<p>The HTTP method for the API operation.</p>"
         },
         "apiPath":{
           "shape":"ApiPath",
@@ -1059,9 +1074,9 @@
           "shape":"ConfirmationState",
           "documentation":"<p>Controls the API operations or functions to invoke based on the user confirmation.</p>"
         },
-        "httpMethod":{
-          "shape":"String",
-          "documentation":"<p>The HTTP method for the API operation.</p>"
+        "responseState":{
+          "shape":"ResponseState",
+          "documentation":"<p>Controls the final response state returned to end user when API/Function execution failed. When this state is FAILURE, the request would fail with dependency failure exception. When this state is REPROMPT, the API/function response will be sent to model for re-prompt</p>"
         },
         "httpStatusCode":{
           "shape":"Integer",
@@ -1071,9 +1086,9 @@
           "shape":"ResponseBody",
           "documentation":"<p>The response body from the API operation. The key of the object is the content type (currently, only <code>TEXT</code> is supported). The response may be returned directly or from the Lambda function.</p>"
         },
-        "responseState":{
-          "shape":"ResponseState",
-          "documentation":"<p>Controls the final response state returned to end user when API/Function execution failed. When this state is FAILURE, the request would fail with dependency failure exception. When this state is REPROMPT, the API/function response will be sent to model for re-prompt</p>"
+        "agentId":{
+          "shape":"String",
+          "documentation":"<p>The agent's ID.</p>"
         }
       },
       "documentation":"<p>Contains information about the API operation that was called from the action group and the response body that was returned.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p>In the <code>returnControlInvocationResults</code> of the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_RequestSyntax\">InvokeAgent request</a> </p> </li> </ul>"
@@ -1121,7 +1136,7 @@
       "type":"string",
       "max":2048,
       "min":1,
-      "pattern":"^(arn:aws(-[^:]+)?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$"
+      "pattern":"(arn:aws(-[^:]+)?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?"
     },
     "BedrockModelConfigurations":{
       "type":"structure",
@@ -1137,13 +1152,13 @@
       "type":"structure",
       "required":["modelConfiguration"],
       "members":{
-        "modelConfiguration":{
-          "shape":"BedrockRerankingModelConfiguration",
-          "documentation":"<p>Contains configurations for a reranker model.</p>"
-        },
         "numberOfResults":{
           "shape":"BedrockRerankingConfigurationNumberOfResultsInteger",
           "documentation":"<p>The number of results to return after reranking.</p>"
+        },
+        "modelConfiguration":{
+          "shape":"BedrockRerankingModelConfiguration",
+          "documentation":"<p>Contains configurations for a reranker model.</p>"
         }
       },
       "documentation":"<p>Contains configurations for an Amazon Bedrock reranker model.</p>"
@@ -1158,19 +1173,19 @@
       "type":"string",
       "max":2048,
       "min":1,
-      "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/(.*))?$"
+      "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/(.*))?"
     },
     "BedrockRerankingModelConfiguration":{
       "type":"structure",
       "required":["modelArn"],
       "members":{
-        "additionalModelRequestFields":{
-          "shape":"AdditionalModelRequestFields",
-          "documentation":"<p>A JSON object whose keys are request fields for the model and whose values are values for those fields.</p>"
-        },
         "modelArn":{
           "shape":"BedrockModelArn",
           "documentation":"<p>The ARN of the reranker model.</p>"
+        },
+        "additionalModelRequestFields":{
+          "shape":"AdditionalModelRequestFields",
+          "documentation":"<p>A JSON object whose keys are request fields for the model and whose values are values for those fields.</p>"
         }
       },
       "documentation":"<p>Contains configurations for a reranker model.</p>"
@@ -1178,13 +1193,13 @@
     "BedrockSessionContentBlock":{
       "type":"structure",
       "members":{
-        "image":{
-          "shape":"ImageBlock",
-          "documentation":"<p>The image in the invocation step.</p>"
-        },
         "text":{
           "shape":"BedrockSessionContentBlockTextString",
           "documentation":"<p>The text in the invocation step.</p>"
+        },
+        "image":{
+          "shape":"ImageBlock",
+          "documentation":"<p>The image in the invocation step.</p>"
         }
       },
       "documentation":"<p>A block of content that you pass to, or receive from, a Amazon Bedrock session in an invocation step. You pass the content to a session in the <code>payLoad</code> of the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_PutInvocationStep.html\">PutInvocationStep</a> API operation. You retrieve the content with the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_GetInvocationStep.html\">GetInvocationStep</a> API operation.</p> <p>For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>",
@@ -1214,11 +1229,15 @@
     "ByteContentDoc":{
       "type":"structure",
       "required":[
+        "identifier",
         "contentType",
-        "data",
-        "identifier"
+        "data"
       ],
       "members":{
+        "identifier":{
+          "shape":"Identifier",
+          "documentation":"<p>The file name of the document contained in the wrapper object.</p>"
+        },
         "contentType":{
           "shape":"ContentType",
           "documentation":"<p>The MIME type of the document contained in the wrapper object.</p>"
@@ -1226,10 +1245,6 @@
         "data":{
           "shape":"ByteContentBlob",
           "documentation":"<p>The byte value of the file to upload, encoded as a Base-64 string.</p>"
-        },
-        "identifier":{
-          "shape":"Identifier",
-          "documentation":"<p>The file name of the document contained in the wrapper object.</p>"
         }
       },
       "documentation":"<p>This property contains the document to chat with, along with its attributes.</p>"
@@ -1237,17 +1252,17 @@
     "ByteContentFile":{
       "type":"structure",
       "required":[
-        "data",
-        "mediaType"
+        "mediaType",
+        "data"
       ],
       "members":{
-        "data":{
-          "shape":"ByteContentBlob",
-          "documentation":"<p>The raw bytes of the file to attach. The maximum size of all files that is attached is 10MB. You can attach a maximum of 5 files. </p>"
-        },
         "mediaType":{
           "shape":"MimeType",
           "documentation":"<p>The MIME type of data contained in the file used for chat.</p>"
+        },
+        "data":{
+          "shape":"ByteContentBlob",
+          "documentation":"<p>The raw bytes of the file to attach. The maximum size of all files that is attached is 10MB. You can attach a maximum of 5 files. </p>"
         }
       },
       "documentation":"<p>The property contains the file to chat with, along with its attributes.</p>"
@@ -1288,7 +1303,8 @@
           "shape":"Citation",
           "documentation":"<p>The citation.</p>",
           "deprecated":true,
-          "deprecatedMessage":"Citation is deprecated. Please use GeneratedResponsePart and RetrievedReferences for citation event."
+          "deprecatedMessage":"Citation is deprecated. Please use GeneratedResponsePart and RetrievedReferences for citation event.",
+          "deprecatedSince":"2024-12-17"
         },
         "generatedResponsePart":{
           "shape":"GeneratedResponsePart",
@@ -1323,22 +1339,22 @@
     "CodeInterpreterInvocationOutput":{
       "type":"structure",
       "members":{
-        "executionError":{
-          "shape":"String",
-          "documentation":"<p>Contains the error returned from code execution.</p>"
-        },
         "executionOutput":{
           "shape":"String",
           "documentation":"<p>Contains the successful output returned from code execution</p>"
         },
-        "executionTimeout":{
-          "shape":"Boolean",
-          "documentation":"<p>Indicates if the execution of the code timed out.</p>"
+        "executionError":{
+          "shape":"String",
+          "documentation":"<p>Contains the error returned from code execution.</p>"
         },
         "files":{
           "shape":"Files",
           "documentation":"<p>Contains output files, if generated by code execution.</p>"
         },
+        "executionTimeout":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates if the execution of the code timed out.</p>"
+        },
         "metadata":{
           "shape":"Metadata",
           "documentation":"<p>Contains information about the output from the code interpreter.</p>"
@@ -1359,22 +1375,6 @@
         "instruction"
       ],
       "members":{
-        "actionGroups":{
-          "shape":"AgentActionGroups",
-          "documentation":"<p> List of action groups with each action group defining tasks the inline collaborator agent needs to carry out. </p>"
-        },
-        "agentCollaboration":{
-          "shape":"AgentCollaboration",
-          "documentation":"<p> Defines how the inline supervisor agent handles information across multiple collaborator agents to coordinate a final response. </p>"
-        },
-        "agentName":{
-          "shape":"Name",
-          "documentation":"<p> Name of the inline collaborator agent which must be the same name as specified for <code>collaboratorName</code>. </p>"
-        },
-        "collaboratorConfigurations":{
-          "shape":"CollaboratorConfigurations",
-          "documentation":"<p> Settings of the collaborator agent. </p>"
-        },
         "customerEncryptionKeyArn":{
           "shape":"KmsKeyArn",
           "documentation":"<p> The Amazon Resource Name (ARN) of the AWS KMS key that encrypts the inline collaborator. </p>"
@@ -1383,25 +1383,41 @@
           "shape":"ModelIdentifier",
           "documentation":"<p> The foundation model used by the inline collaborator agent. </p>"
         },
-        "guardrailConfiguration":{
-          "shape":"GuardrailConfigurationWithArn",
-          "documentation":"<p> Details of the guardwrail associated with the inline collaborator. </p>"
+        "instruction":{
+          "shape":"Instruction",
+          "documentation":"<p> Instruction that tell the inline collaborator agent what it should do and how it should interact with users. </p>"
         },
         "idleSessionTTLInSeconds":{
           "shape":"SessionTTL",
           "documentation":"<p> The number of seconds for which the Amazon Bedrock keeps information about the user's conversation with the inline collaborator agent.</p> <p>A user interaction remains active for the amount of time specified. If no conversation occurs during this time, the session expires and Amazon Bedrock deletes any data provided before the timeout. </p>"
         },
-        "instruction":{
-          "shape":"Instruction",
-          "documentation":"<p> Instruction that tell the inline collaborator agent what it should do and how it should interact with users. </p>"
+        "actionGroups":{
+          "shape":"AgentActionGroups",
+          "documentation":"<p> List of action groups with each action group defining tasks the inline collaborator agent needs to carry out. </p>"
         },
         "knowledgeBases":{
           "shape":"KnowledgeBases",
           "documentation":"<p> Knowledge base associated with the inline collaborator agent. </p>"
         },
-        "promptOverrideConfiguration":{
-          "shape":"PromptOverrideConfiguration",
+        "guardrailConfiguration":{
+          "shape":"GuardrailConfigurationWithArn",
+          "documentation":"<p> Details of the guardwrail associated with the inline collaborator. </p>"
+        },
+        "promptOverrideConfiguration":{
+          "shape":"PromptOverrideConfiguration",
           "documentation":"<p> Contains configurations to override prompt templates in different parts of an inline collaborator sequence. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/advanced-prompts.html\">Advanced prompts</a>. </p>"
+        },
+        "agentCollaboration":{
+          "shape":"AgentCollaboration",
+          "documentation":"<p> Defines how the inline supervisor agent handles information across multiple collaborator agents to coordinate a final response. </p>"
+        },
+        "collaboratorConfigurations":{
+          "shape":"CollaboratorConfigurations",
+          "documentation":"<p> Settings of the collaborator agent. </p>"
+        },
+        "agentName":{
+          "shape":"Name",
+          "documentation":"<p> Name of the inline collaborator agent which must be the same name as specified for <code>collaboratorName</code>. </p>"
         }
       },
       "documentation":"<p> List of inline collaborators. </p>"
@@ -1409,21 +1425,21 @@
     "CollaboratorConfiguration":{
       "type":"structure",
       "required":[
-        "collaboratorInstruction",
-        "collaboratorName"
+        "collaboratorName",
+        "collaboratorInstruction"
       ],
       "members":{
-        "agentAliasArn":{
-          "shape":"AgentAliasArn",
-          "documentation":"<p> The Amazon Resource Name (ARN) of the inline collaborator agent. </p>"
+        "collaboratorName":{
+          "shape":"Name",
+          "documentation":"<p> Name of the inline collaborator agent which must be the same name as specified for <code>agentName</code>. </p>"
         },
         "collaboratorInstruction":{
           "shape":"CollaborationInstruction",
           "documentation":"<p> Instructions that tell the inline collaborator agent what it should do and how it should interact with users. </p>"
         },
-        "collaboratorName":{
-          "shape":"Name",
-          "documentation":"<p> Name of the inline collaborator agent which must be the same name as specified for <code>agentName</code>. </p>"
+        "agentAliasArn":{
+          "shape":"AgentAliasArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the inline collaborator agent. </p>"
         },
         "relayConversationHistory":{
           "shape":"RelayConversationHistory",
@@ -1444,21 +1460,21 @@
       "type":"structure",
       "required":[
         "nodeName",
-        "satisfiedConditions",
-        "timestamp"
+        "timestamp",
+        "satisfiedConditions"
       ],
       "members":{
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the condition node that evaluated the conditions.</p>"
         },
-        "satisfiedConditions":{
-          "shape":"SatisfiedConditions",
-          "documentation":"<p>A list of conditions that were satisfied during the evaluation.</p>"
-        },
         "timestamp":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp when the condition evaluation occurred.</p>"
+        },
+        "satisfiedConditions":{
+          "shape":"SatisfiedConditions",
+          "documentation":"<p>A list of conditions that were satisfied during the evaluation.</p>"
         }
       },
       "documentation":"<p>Contains information about a condition evaluation result during a flow execution. This event is generated when a condition node in the flow evaluates its conditions.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
@@ -1520,7 +1536,7 @@
     },
     "ContentType":{
       "type":"string",
-      "pattern":"[a-z]{1,20}/.{1,20}"
+      "pattern":".*[a-z]{1,20}/.{1,20}.*"
     },
     "ConversationHistory":{
       "type":"structure",
@@ -1543,14 +1559,14 @@
       "type":"structure",
       "required":["sessionIdentifier"],
       "members":{
-        "description":{
-          "shape":"InvocationDescription",
-          "documentation":"<p>A description for the interactions in the invocation. For example, \"User asking about weather in Seattle\".</p>"
-        },
         "invocationId":{
           "shape":"Uuid",
           "documentation":"<p>A unique identifier for the invocation in UUID format.</p>"
         },
+        "description":{
+          "shape":"InvocationDescription",
+          "documentation":"<p>A description for the interactions in the invocation. For example, \"User asking about weather in Seattle\".</p>"
+        },
         "sessionIdentifier":{
           "shape":"SessionIdentifier",
           "documentation":"<p>The unique identifier for the associated session for the invocation. You can specify either the session's <code>sessionId</code> or its Amazon Resource Name (ARN). </p>",
@@ -1562,36 +1578,36 @@
     "CreateInvocationResponse":{
       "type":"structure",
       "required":[
-        "createdAt",
+        "sessionId",
         "invocationId",
-        "sessionId"
+        "createdAt"
       ],
       "members":{
-        "createdAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp for when the invocation was created.</p>"
+        "sessionId":{
+          "shape":"Uuid",
+          "documentation":"<p>The unique identifier for the session associated with the invocation.</p>"
         },
         "invocationId":{
           "shape":"Uuid",
           "documentation":"<p>The unique identifier for the invocation.</p>"
         },
-        "sessionId":{
-          "shape":"Uuid",
-          "documentation":"<p>The unique identifier for the session associated with the invocation.</p>"
+        "createdAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp for when the invocation was created.</p>"
         }
       }
     },
     "CreateSessionRequest":{
       "type":"structure",
       "members":{
-        "encryptionKeyArn":{
-          "shape":"KmsKeyArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the KMS key to use to encrypt the session data. The user or role creating the session must have permission to use the key. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/session-encryption.html\">Amazon Bedrock session encryption</a>. </p>"
-        },
         "sessionMetadata":{
           "shape":"SessionMetadataMap",
           "documentation":"<p>A map of key-value pairs containing attributes to be persisted across the session. For example, the user's ID, their language preference, and the type of device they are using.</p>"
         },
+        "encryptionKeyArn":{
+          "shape":"KmsKeyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the KMS key to use to encrypt the session data. The user or role creating the session must have permission to use the key. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/session-encryption.html\">Amazon Bedrock session encryption</a>. </p>"
+        },
         "tags":{
           "shape":"TagsMap",
           "documentation":"<p>Specify the key-value pairs for the tags that you want to attach to the session.</p>"
@@ -1601,27 +1617,27 @@
     "CreateSessionResponse":{
       "type":"structure",
       "required":[
-        "createdAt",
-        "sessionArn",
         "sessionId",
-        "sessionStatus"
+        "sessionArn",
+        "sessionStatus",
+        "createdAt"
       ],
       "members":{
-        "createdAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp for when the session was created.</p>"
+        "sessionId":{
+          "shape":"Uuid",
+          "documentation":"<p>The unique identifier for the session.</p>"
         },
         "sessionArn":{
           "shape":"SessionArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the created session.</p>"
         },
-        "sessionId":{
-          "shape":"Uuid",
-          "documentation":"<p>The unique identifier for the session.</p>"
-        },
         "sessionStatus":{
           "shape":"SessionStatus",
           "documentation":"<p>The current status of the session.</p>"
+        },
+        "createdAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp for when the session was created.</p>"
         }
       }
     },
@@ -1649,13 +1665,13 @@
     "CustomOrchestrationTrace":{
       "type":"structure",
       "members":{
-        "event":{
-          "shape":"CustomOrchestrationTraceEvent",
-          "documentation":"<p> The event details used with the custom orchestration. </p>"
-        },
         "traceId":{
           "shape":"TraceId",
           "documentation":"<p> The unique identifier of the trace. </p>"
+        },
+        "event":{
+          "shape":"CustomOrchestrationTraceEvent",
+          "documentation":"<p> The event details used with the custom orchestration. </p>"
         }
       },
       "documentation":"<p> The trace behavior for the custom orchestration. </p>",
@@ -1680,22 +1696,22 @@
     "DeleteAgentMemoryRequest":{
       "type":"structure",
       "required":[
-        "agentAliasId",
-        "agentId"
+        "agentId",
+        "agentAliasId"
       ],
       "members":{
-        "agentAliasId":{
-          "shape":"AgentAliasId",
-          "documentation":"<p>The unique identifier of an alias of an agent.</p>",
-          "location":"uri",
-          "locationName":"agentAliasId"
-        },
         "agentId":{
           "shape":"AgentId",
           "documentation":"<p>The unique identifier of the agent to which the alias belongs.</p>",
           "location":"uri",
           "locationName":"agentId"
         },
+        "agentAliasId":{
+          "shape":"AgentAliasId",
+          "documentation":"<p>The unique identifier of an alias of an agent.</p>",
+          "location":"uri",
+          "locationName":"agentAliasId"
+        },
         "memoryId":{
           "shape":"MemoryId",
           "documentation":"<p>The unique identifier of the memory.</p>",
@@ -1712,8 +1728,7 @@
     },
     "DeleteAgentMemoryResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "DeleteSessionRequest":{
       "type":"structure",
@@ -1729,8 +1744,7 @@
     },
     "DeleteSessionResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "DependencyFailedException":{
       "type":"structure",
@@ -1750,8 +1764,7 @@
     },
     "Document":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "document":true
     },
     "Double":{
@@ -1773,19 +1786,19 @@
     "EndSessionResponse":{
       "type":"structure",
       "required":[
-        "sessionArn",
         "sessionId",
+        "sessionArn",
         "sessionStatus"
       ],
       "members":{
-        "sessionArn":{
-          "shape":"SessionArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the session you ended.</p>"
-        },
         "sessionId":{
           "shape":"Uuid",
           "documentation":"<p>The unique identifier of the session you ended.</p>"
         },
+        "sessionArn":{
+          "shape":"SessionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the session you ended.</p>"
+        },
         "sessionStatus":{
           "shape":"SessionStatus",
           "documentation":"<p>The current status of the session you ended.</p>"
@@ -1803,17 +1816,17 @@
       "type":"structure",
       "required":["sourceType"],
       "members":{
-        "byteContent":{
-          "shape":"ByteContentDoc",
-          "documentation":"<p>The identifier, contentType, and data of the external source wrapper object.</p>"
+        "sourceType":{
+          "shape":"ExternalSourceType",
+          "documentation":"<p>The source type of the external source wrapper object.</p>"
         },
         "s3Location":{
           "shape":"S3ObjectDoc",
           "documentation":"<p>The S3 location of the external source wrapper object.</p>"
         },
-        "sourceType":{
-          "shape":"ExternalSourceType",
-          "documentation":"<p>The source type of the external source wrapper object.</p>"
+        "byteContent":{
+          "shape":"ByteContentDoc",
+          "documentation":"<p>The identifier, contentType, and data of the external source wrapper object.</p>"
         }
       },
       "documentation":"<p>The unique external source of the content contained in the wrapper object.</p>"
@@ -1834,9 +1847,9 @@
     "ExternalSourcesGenerationConfiguration":{
       "type":"structure",
       "members":{
-        "additionalModelRequestFields":{
-          "shape":"AdditionalModelRequestFields",
-          "documentation":"<p> Additional model parameters and their corresponding values not included in the textInferenceConfig structure for an external source. Takes in custom model parameters specific to the language model being used. </p>"
+        "promptTemplate":{
+          "shape":"PromptTemplate",
+          "documentation":"<p>Contain the textPromptTemplate string for the external source wrapper object.</p>"
         },
         "guardrailConfiguration":{
           "shape":"GuardrailConfiguration",
@@ -1846,13 +1859,13 @@
           "shape":"InferenceConfig",
           "documentation":"<p> Configuration settings for inference when using RetrieveAndGenerate to generate responses while using an external source.</p>"
         },
+        "additionalModelRequestFields":{
+          "shape":"AdditionalModelRequestFields",
+          "documentation":"<p> Additional model parameters and their corresponding values not included in the textInferenceConfig structure for an external source. Takes in custom model parameters specific to the language model being used. </p>"
+        },
         "performanceConfig":{
           "shape":"PerformanceConfiguration",
           "documentation":"<p>The latency configuration for the model.</p>"
-        },
-        "promptTemplate":{
-          "shape":"PromptTemplate",
-          "documentation":"<p>Contain the textPromptTemplate string for the external source wrapper object.</p>"
         }
       },
       "documentation":"<p>Contains the generation configuration of the external source wrapper object.</p>"
@@ -1864,10 +1877,6 @@
         "sources"
       ],
       "members":{
-        "generationConfiguration":{
-          "shape":"ExternalSourcesGenerationConfiguration",
-          "documentation":"<p>The prompt used with the external source wrapper object with the <code>retrieveAndGenerate</code> function.</p>"
-        },
         "modelArn":{
           "shape":"BedrockModelArn",
           "documentation":"<p>The model Amazon Resource Name (ARN) for the external source wrapper object in the <code>retrieveAndGenerate</code> function.</p>"
@@ -1875,6 +1884,10 @@
         "sources":{
           "shape":"ExternalSources",
           "documentation":"<p>The document for the external source wrapper object in the <code>retrieveAndGenerate</code> function.</p>"
+        },
+        "generationConfiguration":{
+          "shape":"ExternalSourcesGenerationConfiguration",
+          "documentation":"<p>The prompt used with the external source wrapper object with the <code>retrieveAndGenerate</code> function.</p>"
         }
       },
       "documentation":"<p>The configurations of the external source wrapper object in the <code>retrieveAndGenerate</code> function.</p>"
@@ -1886,21 +1899,21 @@
     "FailureTrace":{
       "type":"structure",
       "members":{
-        "failureCode":{
-          "shape":"Integer",
-          "documentation":"<p>The failure code for the trace.</p>"
+        "traceId":{
+          "shape":"TraceId",
+          "documentation":"<p>The unique identifier of the trace.</p>"
         },
         "failureReason":{
           "shape":"FailureReasonString",
           "documentation":"<p>The reason the interaction failed.</p>"
         },
+        "failureCode":{
+          "shape":"Integer",
+          "documentation":"<p>The failure code for the trace.</p>"
+        },
         "metadata":{
           "shape":"Metadata",
           "documentation":"<p>Information about the failure that occurred.</p>"
-        },
-        "traceId":{
-          "shape":"TraceId",
-          "documentation":"<p>The unique identifier of the trace.</p>"
         }
       },
       "documentation":"<p>Contains information about the failure of the interaction.</p>",
@@ -1950,17 +1963,17 @@
       "type":"structure",
       "required":["sourceType"],
       "members":{
-        "byteContent":{
-          "shape":"ByteContentFile",
-          "documentation":"<p>The data and the text of the attached files.</p>"
+        "sourceType":{
+          "shape":"FileSourceType",
+          "documentation":"<p>The source type of the files to attach.</p>"
         },
         "s3Location":{
           "shape":"S3ObjectFile",
           "documentation":"<p>The s3 location of the files to attach.</p>"
         },
-        "sourceType":{
-          "shape":"FileSourceType",
-          "documentation":"<p>The source type of the files to attach.</p>"
+        "byteContent":{
+          "shape":"ByteContentFile",
+          "documentation":"<p>The data and the text of the attached files.</p>"
         }
       },
       "documentation":"<p>The source file of the content contained in the wrapper object.</p>"
@@ -2008,20 +2021,19 @@
     },
     "FilterValue":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "document":true
     },
     "FinalResponse":{
       "type":"structure",
       "members":{
-        "metadata":{
-          "shape":"Metadata",
-          "documentation":"<p>Contains information about the invoke agent operation.</p>"
-        },
         "text":{
           "shape":"FinalResponseString",
           "documentation":"<p>The text in the response to the user.</p>"
+        },
+        "metadata":{
+          "shape":"Metadata",
+          "documentation":"<p>Contains information about the invoke agent operation.</p>"
         }
       },
       "documentation":"<p>Contains details about the response to the user.</p>"
@@ -2038,7 +2050,7 @@
       "type":"string",
       "max":2048,
       "min":0,
-      "pattern":"^(arn:aws:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:flow/[0-9a-zA-Z]{10}/alias/[0-9a-zA-Z]{10})|(\\bTSTALIASID\\b|[0-9a-zA-Z]+)$"
+      "pattern":"(arn:aws:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:flow/[0-9a-zA-Z]{10}/alias/[0-9a-zA-Z]{10})|(\\bTSTALIASID\\b|[0-9a-zA-Z]+)"
     },
     "FlowCompletionEvent":{
       "type":"structure",
@@ -2060,6 +2072,13 @@
         "INPUT_REQUIRED"
       ]
     },
+    "FlowControlNodeType":{
+      "type":"string",
+      "enum":[
+        "Iterator",
+        "Loop"
+      ]
+    },
     "FlowErrorCode":{
       "type":"string",
       "enum":[
@@ -2083,6 +2102,10 @@
     "FlowExecutionError":{
       "type":"structure",
       "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the node in the flow where the error occurred (if applicable).</p>"
+        },
         "error":{
           "shape":"FlowExecutionErrorType",
           "documentation":"<p>The error code for the type of error that occurred.</p>"
@@ -2090,10 +2113,6 @@
         "message":{
           "shape":"String",
           "documentation":"<p>A descriptive message that provides details about the error.</p>"
-        },
-        "nodeName":{
-          "shape":"NodeName",
-          "documentation":"<p>The name of the node in the flow where the error occurred (if applicable).</p>"
         }
       },
       "documentation":"<p>Contains information about an error that occurred during an flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>"
@@ -2109,14 +2128,6 @@
     "FlowExecutionEvent":{
       "type":"structure",
       "members":{
-        "conditionResultEvent":{
-          "shape":"ConditionResultEvent",
-          "documentation":"<p>Contains information about a condition evaluation result during the flow execution. This event is generated when a condition node in the flow evaluates its conditions.</p>"
-        },
-        "flowFailureEvent":{
-          "shape":"FlowFailureEvent",
-          "documentation":"<p>Contains information about a failure that occurred at the flow level during execution.</p>"
-        },
         "flowInputEvent":{
           "shape":"FlowExecutionInputEvent",
           "documentation":"<p>Contains information about the inputs provided to the flow at the start of execution.</p>"
@@ -2125,10 +2136,6 @@
           "shape":"FlowExecutionOutputEvent",
           "documentation":"<p>Contains information about the outputs produced by the flow at the end of execution.</p>"
         },
-        "nodeFailureEvent":{
-          "shape":"NodeFailureEvent",
-          "documentation":"<p>Contains information about a failure that occurred at a specific node during execution.</p>"
-        },
         "nodeInputEvent":{
           "shape":"NodeInputEvent",
           "documentation":"<p>Contains information about the inputs provided to a specific node during execution.</p>"
@@ -2136,6 +2143,26 @@
         "nodeOutputEvent":{
           "shape":"NodeOutputEvent",
           "documentation":"<p>Contains information about the outputs produced by a specific node during execution.</p>"
+        },
+        "conditionResultEvent":{
+          "shape":"ConditionResultEvent",
+          "documentation":"<p>Contains information about a condition evaluation result during the flow execution. This event is generated when a condition node in the flow evaluates its conditions.</p>"
+        },
+        "nodeFailureEvent":{
+          "shape":"NodeFailureEvent",
+          "documentation":"<p>Contains information about a failure that occurred at a specific node during execution.</p>"
+        },
+        "flowFailureEvent":{
+          "shape":"FlowFailureEvent",
+          "documentation":"<p>Contains information about a failure that occurred at the flow level during execution.</p>"
+        },
+        "nodeActionEvent":{
+          "shape":"NodeActionEvent",
+          "documentation":"<p>Contains information about an action (operation) called by a node during execution.</p>"
+        },
+        "nodeDependencyEvent":{
+          "shape":"NodeDependencyEvent",
+          "documentation":"<p>Contains information about an internal trace of a specific node during execution.</p>"
         }
       },
       "documentation":"<p>Represents an event that occurred during an flow execution. This is a union type that can contain one of several event types, such as node input and output events; flow input and output events; condition node result events, or failure events.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
@@ -2158,26 +2185,22 @@
       "type":"string",
       "max":100,
       "min":2,
-      "pattern":"^[0-9a-zA-Z._:-]+$"
+      "pattern":"[0-9a-zA-Z._:-]+"
     },
     "FlowExecutionIdentifier":{
       "type":"string",
       "max":2048,
       "min":0,
-      "pattern":"^[a-zA-Z0-9-]{1,36}$|^(arn:aws:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:flow/[0-9a-zA-Z]{10}/alias/[0-9a-zA-Z]{10}/execution/[a-zA-Z0-9-]{1,36})$"
+      "pattern":"[a-zA-Z0-9-]{1,36}$|^(arn:aws:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:flow/[0-9a-zA-Z]{10}/alias/[0-9a-zA-Z]{10}/execution/[a-zA-Z0-9-]{1,36})"
     },
     "FlowExecutionInputEvent":{
       "type":"structure",
       "required":[
-        "fields",
         "nodeName",
-        "timestamp"
+        "timestamp",
+        "fields"
       ],
       "members":{
-        "fields":{
-          "shape":"FlowInputFields",
-          "documentation":"<p>A list of input fields provided to the flow.</p>"
-        },
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the node that receives the inputs.</p>"
@@ -2185,6 +2208,10 @@
         "timestamp":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp when the inputs are provided.</p>"
+        },
+        "fields":{
+          "shape":"FlowInputFields",
+          "documentation":"<p>A list of input fields provided to the flow.</p>"
         }
       },
       "documentation":"<p>Contains information about the inputs provided to the flow at the start of a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
@@ -2194,20 +2221,16 @@
       "type":"string",
       "max":36,
       "min":0,
-      "pattern":"^[a-zA-Z0-9-]{1,36}$"
+      "pattern":"[a-zA-Z0-9-]{1,36}"
     },
     "FlowExecutionOutputEvent":{
       "type":"structure",
       "required":[
-        "fields",
         "nodeName",
-        "timestamp"
+        "timestamp",
+        "fields"
       ],
       "members":{
-        "fields":{
-          "shape":"FlowOutputFields",
-          "documentation":"<p>A list of output fields produced by the flow.</p>"
-        },
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the node that produces the outputs.</p>"
@@ -2215,6 +2238,10 @@
         "timestamp":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp when the outputs are produced.</p>"
+        },
+        "fields":{
+          "shape":"FlowOutputFields",
+          "documentation":"<p>A list of output fields produced by the flow.</p>"
         }
       },
       "documentation":"<p>Contains information about the outputs produced by the flow during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
@@ -2224,7 +2251,7 @@
       "type":"string",
       "max":2048,
       "min":0,
-      "pattern":"^arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/(service-role/)?.+$"
+      "pattern":"arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/(service-role/)?.+"
     },
     "FlowExecutionStatus":{
       "type":"string",
@@ -2245,25 +2272,17 @@
     "FlowExecutionSummary":{
       "type":"structure",
       "required":[
-        "createdAt",
         "executionArn",
         "flowAliasIdentifier",
         "flowIdentifier",
         "flowVersion",
-        "status"
+        "status",
+        "createdAt"
       ],
       "members":{
-        "createdAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the flow execution was created.</p>"
-        },
-        "endedAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the flow execution ended. This field is only populated when the execution has completed, failed, timed out, or been aborted.</p>"
-        },
-        "executionArn":{
-          "shape":"FlowExecutionIdentifier",
-          "documentation":"<p>The Amazon Resource Name (ARN) that uniquely identifies the flow execution.</p>"
+        "executionArn":{
+          "shape":"FlowExecutionIdentifier",
+          "documentation":"<p>The Amazon Resource Name (ARN) that uniquely identifies the flow execution.</p>"
         },
         "flowAliasIdentifier":{
           "shape":"FlowAliasIdentifier",
@@ -2280,6 +2299,14 @@
         "status":{
           "shape":"FlowExecutionStatus",
           "documentation":"<p>The current status of the flow execution.</p> <p>Flow executions time out after 24 hours.</p>"
+        },
+        "createdAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp when the flow execution was created.</p>"
+        },
+        "endedAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp when the flow execution ended. This field is only populated when the execution has completed, failed, timed out, or been aborted.</p>"
         }
       },
       "documentation":"<p>Contains summary information about a flow execution, including its status, timestamps, and identifiers.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>"
@@ -2287,11 +2314,15 @@
     "FlowFailureEvent":{
       "type":"structure",
       "required":[
+        "timestamp",
         "errorCode",
-        "errorMessage",
-        "timestamp"
+        "errorMessage"
       ],
       "members":{
+        "timestamp":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp when the failure occurred.</p>"
+        },
         "errorCode":{
           "shape":"FlowErrorCode",
           "documentation":"<p>The error code that identifies the type of failure that occurred.</p>"
@@ -2299,10 +2330,6 @@
         "errorMessage":{
           "shape":"String",
           "documentation":"<p>A descriptive message that provides details about the failure.</p>"
-        },
-        "timestamp":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the failure occurred.</p>"
         }
       },
       "documentation":"<p>Contains information about a failure that occurred at the flow level during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
@@ -2312,23 +2339,15 @@
       "type":"string",
       "max":2048,
       "min":0,
-      "pattern":"^(arn:aws:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:flow/[0-9a-zA-Z]{10})|([0-9a-zA-Z]{10})$"
+      "pattern":"(arn:aws:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:flow/[0-9a-zA-Z]{10})|([0-9a-zA-Z]{10})"
     },
     "FlowInput":{
       "type":"structure",
       "required":[
-        "content",
-        "nodeName"
+        "nodeName",
+        "content"
       ],
       "members":{
-        "content":{
-          "shape":"FlowInputContent",
-          "documentation":"<p>Contains information about an input into the prompt flow.</p>"
-        },
-        "nodeInputName":{
-          "shape":"NodeInputName",
-          "documentation":"<p>The name of the input from the flow input node.</p>"
-        },
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the flow input node that begins the prompt flow.</p>"
@@ -2336,6 +2355,14 @@
         "nodeOutputName":{
           "shape":"NodeOutputName",
           "documentation":"<p>The name of the output from the flow input node that begins the prompt flow.</p>"
+        },
+        "content":{
+          "shape":"FlowInputContent",
+          "documentation":"<p>Contains information about an input into the prompt flow.</p>"
+        },
+        "nodeInputName":{
+          "shape":"NodeInputName",
+          "documentation":"<p>The name of the input from the flow input node.</p>"
         }
       },
       "documentation":"<p>Contains information about an input into the prompt flow and where to send it.</p>"
@@ -2355,17 +2382,17 @@
     "FlowInputField":{
       "type":"structure",
       "required":[
-        "content",
-        "name"
+        "name",
+        "content"
       ],
       "members":{
-        "content":{
-          "shape":"FlowExecutionContent",
-          "documentation":"<p>The content of the input field, which can contain text or structured data.</p>"
-        },
         "name":{
           "shape":"NodeInputName",
           "documentation":"<p>The name of the input field as defined in the flow's input schema.</p>"
+        },
+        "content":{
+          "shape":"FlowExecutionContent",
+          "documentation":"<p>The content of the input field, which can contain text or structured data.</p>"
         }
       },
       "documentation":"<p>Represents an input field provided to a flow during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
@@ -2397,15 +2424,11 @@
     "FlowMultiTurnInputRequestEvent":{
       "type":"structure",
       "required":[
-        "content",
         "nodeName",
-        "nodeType"
+        "nodeType",
+        "content"
       ],
       "members":{
-        "content":{
-          "shape":"FlowMultiTurnInputContent",
-          "documentation":"<p>The content payload containing the input request details for the multi-turn interaction.</p>"
-        },
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the node in the flow that is requesting the input.</p>"
@@ -2413,12 +2436,48 @@
         "nodeType":{
           "shape":"NodeType",
           "documentation":"<p>The type of the node in the flow that is requesting the input.</p>"
+        },
+        "content":{
+          "shape":"FlowMultiTurnInputContent",
+          "documentation":"<p>The content payload containing the input request details for the multi-turn interaction.</p>"
         }
       },
       "documentation":"<p>Response object from the flow multi-turn node requesting additional information.</p>",
       "event":true,
       "sensitive":true
     },
+    "FlowNodeIODataType":{
+      "type":"string",
+      "enum":[
+        "String",
+        "Number",
+        "Boolean",
+        "Object",
+        "Array"
+      ]
+    },
+    "FlowNodeInputCategory":{
+      "type":"string",
+      "enum":[
+        "LoopCondition",
+        "ReturnValueToLoopStart",
+        "ExitLoop"
+      ]
+    },
+    "FlowNodeInputExpression":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "sensitive":true
+    },
+    "FlowNodeInputName":{
+      "type":"string",
+      "pattern":"[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}"
+    },
+    "FlowNodeOutputName":{
+      "type":"string",
+      "pattern":"[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}"
+    },
     "FlowOutputContent":{
       "type":"structure",
       "members":{
@@ -2433,15 +2492,11 @@
     "FlowOutputEvent":{
       "type":"structure",
       "required":[
-        "content",
         "nodeName",
-        "nodeType"
+        "nodeType",
+        "content"
       ],
       "members":{
-        "content":{
-          "shape":"FlowOutputContent",
-          "documentation":"<p>The content in the output.</p>"
-        },
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the flow output node that the output is from.</p>"
@@ -2449,6 +2504,10 @@
         "nodeType":{
           "shape":"NodeType",
           "documentation":"<p>The type of the node that the output is from.</p>"
+        },
+        "content":{
+          "shape":"FlowOutputContent",
+          "documentation":"<p>The content in the output.</p>"
         }
       },
       "documentation":"<p>Contains information about an output from prompt flow invoction.</p>",
@@ -2458,17 +2517,17 @@
     "FlowOutputField":{
       "type":"structure",
       "required":[
-        "content",
-        "name"
+        "name",
+        "content"
       ],
       "members":{
-        "content":{
-          "shape":"FlowExecutionContent",
-          "documentation":"<p>The content of the output field, which can contain text or structured data.</p>"
-        },
         "name":{
           "shape":"NodeOutputName",
           "documentation":"<p>The name of the output field as defined in the flow's output schema.</p>"
+        },
+        "content":{
+          "shape":"FlowExecutionContent",
+          "documentation":"<p>The content of the output field, which can contain text or structured data.</p>"
         }
       },
       "documentation":"<p>Represents an output field produced by a flow during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
@@ -2483,34 +2542,14 @@
     "FlowResponseStream":{
       "type":"structure",
       "members":{
-        "accessDeniedException":{
-          "shape":"AccessDeniedException",
-          "documentation":"<p>The request is denied because of missing access permissions. Check your permissions and retry your request.</p>"
-        },
-        "badGatewayException":{
-          "shape":"BadGatewayException",
-          "documentation":"<p>There was an issue with a dependency due to a server issue. Retry your request.</p>"
-        },
-        "conflictException":{
-          "shape":"ConflictException",
-          "documentation":"<p>There was a conflict performing an operation. Resolve the conflict and retry your request.</p>"
-        },
-        "dependencyFailedException":{
-          "shape":"DependencyFailedException",
-          "documentation":"<p>There was an issue with a dependency. Check the resource configurations and retry the request.</p>"
+        "flowOutputEvent":{
+          "shape":"FlowOutputEvent",
+          "documentation":"<p>Contains information about an output from flow invocation.</p>"
         },
         "flowCompletionEvent":{
           "shape":"FlowCompletionEvent",
           "documentation":"<p>Contains information about why the flow completed.</p>"
         },
-        "flowMultiTurnInputRequestEvent":{
-          "shape":"FlowMultiTurnInputRequestEvent",
-          "documentation":"<p>The event stream containing the multi-turn input request information from the flow.</p>"
-        },
-        "flowOutputEvent":{
-          "shape":"FlowOutputEvent",
-          "documentation":"<p>Contains information about an output from flow invocation.</p>"
-        },
         "flowTraceEvent":{
           "shape":"FlowTraceEvent",
           "documentation":"<p>Contains information about a trace, which tracks an input or output for a node in the flow.</p>"
@@ -2519,6 +2558,10 @@
           "shape":"InternalServerException",
           "documentation":"<p>An internal server error occurred. Retry your request.</p>"
         },
+        "validationException":{
+          "shape":"ValidationException",
+          "documentation":"<p>Input validation failed. Check your request parameters and retry the request.</p>"
+        },
         "resourceNotFoundException":{
           "shape":"ResourceNotFoundException",
           "documentation":"<p>The specified resource Amazon Resource Name (ARN) was not found. Check the Amazon Resource Name (ARN) and try your request again.</p>"
@@ -2531,9 +2574,25 @@
           "shape":"ThrottlingException",
           "documentation":"<p>The number of requests exceeds the limit. Resubmit your request later.</p>"
         },
-        "validationException":{
-          "shape":"ValidationException",
-          "documentation":"<p>Input validation failed. Check your request parameters and retry the request.</p>"
+        "accessDeniedException":{
+          "shape":"AccessDeniedException",
+          "documentation":"<p>The request is denied because of missing access permissions. Check your permissions and retry your request.</p>"
+        },
+        "conflictException":{
+          "shape":"ConflictException",
+          "documentation":"<p>There was a conflict performing an operation. Resolve the conflict and retry your request.</p>"
+        },
+        "dependencyFailedException":{
+          "shape":"DependencyFailedException",
+          "documentation":"<p>There was an issue with a dependency. Check the resource configurations and retry the request.</p>"
+        },
+        "badGatewayException":{
+          "shape":"BadGatewayException",
+          "documentation":"<p>There was an issue with a dependency due to a server issue. Retry your request.</p>"
+        },
+        "flowMultiTurnInputRequestEvent":{
+          "shape":"FlowMultiTurnInputRequestEvent",
+          "documentation":"<p>The event stream containing the multi-turn input request information from the flow.</p>"
         }
       },
       "documentation":"<p>The output of the flow.</p>",
@@ -2542,14 +2601,6 @@
     "FlowTrace":{
       "type":"structure",
       "members":{
-        "conditionNodeResultTrace":{
-          "shape":"FlowTraceConditionNodeResultEvent",
-          "documentation":"<p>Contains information about an output from a condition node.</p>"
-        },
-        "nodeActionTrace":{
-          "shape":"FlowTraceNodeActionEvent",
-          "documentation":"<p>Contains information about an action (operation) called by a node. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html\">Track each step in your prompt flow by viewing its trace in Amazon Bedrock</a>.</p>"
-        },
         "nodeInputTrace":{
           "shape":"FlowTraceNodeInputEvent",
           "documentation":"<p>Contains information about the input into a node.</p>"
@@ -2557,6 +2608,18 @@
         "nodeOutputTrace":{
           "shape":"FlowTraceNodeOutputEvent",
           "documentation":"<p>Contains information about the output from a node.</p>"
+        },
+        "conditionNodeResultTrace":{
+          "shape":"FlowTraceConditionNodeResultEvent",
+          "documentation":"<p>Contains information about an output from a condition node.</p>"
+        },
+        "nodeActionTrace":{
+          "shape":"FlowTraceNodeActionEvent",
+          "documentation":"<p>Contains information about an action (operation) called by a node.</p>"
+        },
+        "nodeDependencyTrace":{
+          "shape":"FlowTraceDependencyEvent",
+          "documentation":"<p>Contains information about an internal trace of a node.</p>"
         }
       },
       "documentation":"<p>Contains information about an input or output for a node in the flow. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html\">Track each step in your prompt flow by viewing its trace in Amazon Bedrock</a>.</p>",
@@ -2579,21 +2642,21 @@
       "type":"structure",
       "required":[
         "nodeName",
-        "satisfiedConditions",
-        "timestamp"
+        "timestamp",
+        "satisfiedConditions"
       ],
       "members":{
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the condition node.</p>"
         },
-        "satisfiedConditions":{
-          "shape":"FlowTraceConditions",
-          "documentation":"<p>An array of objects containing information about the conditions that were satisfied.</p>"
-        },
         "timestamp":{
           "shape":"DateTimestamp",
           "documentation":"<p>The date and time that the trace was returned.</p>"
+        },
+        "satisfiedConditions":{
+          "shape":"FlowTraceConditions",
+          "documentation":"<p>An array of objects containing information about the conditions that were satisfied.</p>"
         }
       },
       "documentation":"<p>Contains information about an output from a condition node. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html\">Track each step in your prompt flow by viewing its trace in Amazon Bedrock</a>.</p>",
@@ -2605,6 +2668,30 @@
       "max":5,
       "min":1
     },
+    "FlowTraceDependencyEvent":{
+      "type":"structure",
+      "required":[
+        "nodeName",
+        "timestamp",
+        "traceElements"
+      ],
+      "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the node that generated the dependency trace.</p>"
+        },
+        "timestamp":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The date and time that the dependency trace was generated.</p>"
+        },
+        "traceElements":{
+          "shape":"TraceElements",
+          "documentation":"<p>The trace elements containing detailed information about the dependency.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about a dependency trace event in the flow.</p>",
+      "sensitive":true
+    },
     "FlowTraceEvent":{
       "type":"structure",
       "required":["trace"],
@@ -2621,19 +2708,19 @@
       "type":"structure",
       "required":[
         "nodeName",
-        "operationName",
+        "timestamp",
         "requestId",
         "serviceName",
-        "timestamp"
+        "operationName"
       ],
       "members":{
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the node that called the operation.</p>"
         },
-        "operationName":{
-          "shape":"String",
-          "documentation":"<p>The name of the operation that the node called.</p>"
+        "timestamp":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The date and time that the operation was called.</p>"
         },
         "requestId":{
           "shape":"String",
@@ -2643,9 +2730,17 @@
           "shape":"String",
           "documentation":"<p>The name of the service that the node called.</p>"
         },
-        "timestamp":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The date and time that the operation was called.</p>"
+        "operationName":{
+          "shape":"String",
+          "documentation":"<p>The name of the operation that the node called.</p>"
+        },
+        "operationRequest":{
+          "shape":"Document",
+          "documentation":"<p>The request payload sent to the downstream service.</p>"
+        },
+        "operationResponse":{
+          "shape":"Document",
+          "documentation":"<p>The response payload received from the downstream service.</p>"
         }
       },
       "documentation":"<p>Contains information about an action (operation) called by a node in an Amazon Bedrock flow. The service generates action events for calls made by prompt nodes, agent nodes, and Amazon Web Services Lambda nodes. </p>",
@@ -2666,15 +2761,11 @@
     "FlowTraceNodeInputEvent":{
       "type":"structure",
       "required":[
-        "fields",
         "nodeName",
-        "timestamp"
+        "timestamp",
+        "fields"
       ],
       "members":{
-        "fields":{
-          "shape":"FlowTraceNodeInputFields",
-          "documentation":"<p>An array of objects containing information about each field in the input.</p>"
-        },
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the node that received the input.</p>"
@@ -2682,25 +2773,73 @@
         "timestamp":{
           "shape":"DateTimestamp",
           "documentation":"<p>The date and time that the trace was returned.</p>"
+        },
+        "fields":{
+          "shape":"FlowTraceNodeInputFields",
+          "documentation":"<p>An array of objects containing information about each field in the input.</p>"
         }
       },
       "documentation":"<p>Contains information about the input into a node. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html\">Track each step in your prompt flow by viewing its trace in Amazon Bedrock</a>.</p>",
       "sensitive":true
     },
+    "FlowTraceNodeInputExecutionChain":{
+      "type":"list",
+      "member":{"shape":"FlowTraceNodeInputExecutionChainItem"},
+      "sensitive":true
+    },
+    "FlowTraceNodeInputExecutionChainItem":{
+      "type":"structure",
+      "required":[
+        "nodeName",
+        "type"
+      ],
+      "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the node in the execution chain.</p>"
+        },
+        "index":{
+          "shape":"Integer",
+          "documentation":"<p>The index position of this item in the execution chain.</p>"
+        },
+        "type":{
+          "shape":"FlowControlNodeType",
+          "documentation":"<p>The type of execution chain item. Supported values are Iterator and Loop.</p>"
+        }
+      },
+      "documentation":"<p>Represents an item in the execution chain for flow trace node input tracking.</p>",
+      "sensitive":true
+    },
     "FlowTraceNodeInputField":{
       "type":"structure",
       "required":[
-        "content",
-        "nodeInputName"
+        "nodeInputName",
+        "content"
       ],
       "members":{
+        "nodeInputName":{
+          "shape":"NodeInputName",
+          "documentation":"<p>The name of the node input.</p>"
+        },
         "content":{
           "shape":"FlowTraceNodeInputContent",
           "documentation":"<p>The content of the node input.</p>"
         },
-        "nodeInputName":{
-          "shape":"NodeInputName",
-          "documentation":"<p>The name of the node input.</p>"
+        "source":{
+          "shape":"FlowTraceNodeInputSource",
+          "documentation":"<p>The source node that provides input data to this field.</p>"
+        },
+        "type":{
+          "shape":"FlowNodeIODataType",
+          "documentation":"<p>The data type of the input field for compatibility validation.</p>"
+        },
+        "category":{
+          "shape":"FlowNodeInputCategory",
+          "documentation":"<p>The category of the input field.</p>"
+        },
+        "executionChain":{
+          "shape":"FlowTraceNodeInputExecutionChain",
+          "documentation":"<p>The execution path through nested nodes like iterators and loops.</p>"
         }
       },
       "documentation":"<p>Contains information about a field in the input into a node. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html\">Track each step in your prompt flow by viewing its trace in Amazon Bedrock</a>.</p>",
@@ -2712,6 +2851,30 @@
       "max":5,
       "min":1
     },
+    "FlowTraceNodeInputSource":{
+      "type":"structure",
+      "required":[
+        "nodeName",
+        "outputFieldName",
+        "expression"
+      ],
+      "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the source node that provides the input data.</p>"
+        },
+        "outputFieldName":{
+          "shape":"FlowNodeOutputName",
+          "documentation":"<p>The name of the output field from the source node.</p>"
+        },
+        "expression":{
+          "shape":"FlowNodeInputExpression",
+          "documentation":"<p>The expression used to extract data from the source.</p>"
+        }
+      },
+      "documentation":"<p>Represents the source of input data for a flow trace node field.</p>",
+      "sensitive":true
+    },
     "FlowTraceNodeOutputContent":{
       "type":"structure",
       "members":{
@@ -2726,15 +2889,11 @@
     "FlowTraceNodeOutputEvent":{
       "type":"structure",
       "required":[
-        "fields",
         "nodeName",
-        "timestamp"
+        "timestamp",
+        "fields"
       ],
       "members":{
-        "fields":{
-          "shape":"FlowTraceNodeOutputFields",
-          "documentation":"<p>An array of objects containing information about each field in the output.</p>"
-        },
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the node that yielded the output.</p>"
@@ -2742,7 +2901,11 @@
         "timestamp":{
           "shape":"DateTimestamp",
           "documentation":"<p>The date and time that the trace was returned.</p>"
-        }
+        },
+        "fields":{
+          "shape":"FlowTraceNodeOutputFields",
+          "documentation":"<p>An array of objects containing information about each field in the output.</p>"
+        }
       },
       "documentation":"<p>Contains information about the output from a node. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html\">Track each step in your prompt flow by viewing its trace in Amazon Bedrock</a>.</p>",
       "sensitive":true
@@ -2750,17 +2913,25 @@
     "FlowTraceNodeOutputField":{
       "type":"structure",
       "required":[
-        "content",
-        "nodeOutputName"
+        "nodeOutputName",
+        "content"
       ],
       "members":{
+        "nodeOutputName":{
+          "shape":"NodeOutputName",
+          "documentation":"<p>The name of the node output.</p>"
+        },
         "content":{
           "shape":"FlowTraceNodeOutputContent",
           "documentation":"<p>The content of the node output.</p>"
         },
-        "nodeOutputName":{
-          "shape":"NodeOutputName",
-          "documentation":"<p>The name of the node output.</p>"
+        "next":{
+          "shape":"FlowTraceNodeOutputNextList",
+          "documentation":"<p>The next node that receives output data from this field.</p>"
+        },
+        "type":{
+          "shape":"FlowNodeIODataType",
+          "documentation":"<p>The data type of the output field for compatibility validation.</p>"
         }
       },
       "documentation":"<p>Contains information about a field in the output from a node. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html\">Track each step in your prompt flow by viewing its trace in Amazon Bedrock</a>.</p>",
@@ -2772,6 +2943,29 @@
       "max":2,
       "min":1
     },
+    "FlowTraceNodeOutputNext":{
+      "type":"structure",
+      "required":[
+        "nodeName",
+        "inputFieldName"
+      ],
+      "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the next node that receives the output data.</p>"
+        },
+        "inputFieldName":{
+          "shape":"FlowNodeInputName",
+          "documentation":"<p>The name of the input field in the next node that receives the data.</p>"
+        }
+      },
+      "documentation":"<p>Represents the next node that receives output data from a flow trace.</p>",
+      "sensitive":true
+    },
+    "FlowTraceNodeOutputNextList":{
+      "type":"list",
+      "member":{"shape":"FlowTraceNodeOutputNext"}
+    },
     "Function":{
       "type":"string",
       "sensitive":true
@@ -2780,14 +2974,14 @@
       "type":"structure",
       "required":["name"],
       "members":{
-        "description":{
-          "shape":"FunctionDescription",
-          "documentation":"<p> A description of the function and its purpose. </p>"
-        },
         "name":{
           "shape":"ResourceName",
           "documentation":"<p> A name for the function. </p>"
         },
+        "description":{
+          "shape":"FunctionDescription",
+          "documentation":"<p> A description of the function and its purpose. </p>"
+        },
         "parameters":{
           "shape":"ParameterMap",
           "documentation":"<p> The parameters that the agent elicits from the user to fulfill the function. </p>"
@@ -2812,6 +3006,14 @@
           "shape":"String",
           "documentation":"<p>The action group that the function belongs to.</p>"
         },
+        "parameters":{
+          "shape":"FunctionParameters",
+          "documentation":"<p>A list of parameters of the function.</p>"
+        },
+        "function":{
+          "shape":"String",
+          "documentation":"<p>The name of the function.</p>"
+        },
         "actionInvocationType":{
           "shape":"ActionInvocationType",
           "documentation":"<p>Contains information about the function to invoke,</p>"
@@ -2823,14 +3025,6 @@
         "collaboratorName":{
           "shape":"Name",
           "documentation":"<p>The collaborator's name.</p>"
-        },
-        "function":{
-          "shape":"String",
-          "documentation":"<p>The name of the function.</p>"
-        },
-        "parameters":{
-          "shape":"FunctionParameters",
-          "documentation":"<p>A list of parameters of the function.</p>"
         }
       },
       "documentation":"<p>Contains information about the function that the agent predicts should be called.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p>In the <code>returnControl</code> field of the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_ResponseSyntax\">InvokeAgent response</a> </p> </li> </ul>"
@@ -2865,10 +3059,6 @@
           "shape":"String",
           "documentation":"<p>The action group that the function belongs to.</p>"
         },
-        "agentId":{
-          "shape":"String",
-          "documentation":"<p>The agent's ID.</p>"
-        },
         "confirmationState":{
           "shape":"ConfirmationState",
           "documentation":"<p>Contains the user confirmation information about the function that was called.</p>"
@@ -2884,6 +3074,10 @@
         "responseState":{
           "shape":"ResponseState",
           "documentation":"<p>Controls the final response state returned to end user when API/Function execution failed. When this state is FAILURE, the request would fail with dependency failure exception. When this state is REPROMPT, the API/function response will be sent to model for re-prompt</p>"
+        },
+        "agentId":{
+          "shape":"String",
+          "documentation":"<p>The agent's ID.</p>"
         }
       },
       "documentation":"<p>Contains information about the function that was called from the action group and the response that was returned.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p>In the <code>returnControlInvocationResults</code> of the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_RequestSyntax\">InvokeAgent request</a> </p> </li> </ul>"
@@ -2937,13 +3131,13 @@
     "GeneratedQuery":{
       "type":"structure",
       "members":{
-        "sql":{
-          "shape":"String",
-          "documentation":"<p>An SQL query that corresponds to the natural language query.</p>"
-        },
         "type":{
           "shape":"GeneratedQueryType",
           "documentation":"<p>The type of transformed query.</p>"
+        },
+        "sql":{
+          "shape":"String",
+          "documentation":"<p>An SQL query that corresponds to the natural language query.</p>"
         }
       },
       "documentation":"<p>Contains information about a query generated for a natural language query.</p>",
@@ -2966,9 +3160,9 @@
     "GenerationConfiguration":{
       "type":"structure",
       "members":{
-        "additionalModelRequestFields":{
-          "shape":"AdditionalModelRequestFields",
-          "documentation":"<p> Additional model parameters and corresponding values not included in the textInferenceConfig structure for a knowledge base. This allows users to provide custom model parameters specific to the language model being used. </p>"
+        "promptTemplate":{
+          "shape":"PromptTemplate",
+          "documentation":"<p>Contains the template for the prompt that's sent to the model for response generation. Generation prompts must include the <code>$search_results$</code> variable. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-placeholders.html\">Use placeholder variables</a> in the user guide.</p>"
         },
         "guardrailConfiguration":{
           "shape":"GuardrailConfiguration",
@@ -2978,13 +3172,13 @@
           "shape":"InferenceConfig",
           "documentation":"<p> Configuration settings for inference when using RetrieveAndGenerate to generate responses while using a knowledge base as a source. </p>"
         },
+        "additionalModelRequestFields":{
+          "shape":"AdditionalModelRequestFields",
+          "documentation":"<p> Additional model parameters and corresponding values not included in the textInferenceConfig structure for a knowledge base. This allows users to provide custom model parameters specific to the language model being used. </p>"
+        },
         "performanceConfig":{
           "shape":"PerformanceConfiguration",
           "documentation":"<p>The latency configuration for the model.</p>"
-        },
-        "promptTemplate":{
-          "shape":"PromptTemplate",
-          "documentation":"<p>Contains the template for the prompt that's sent to the model for response generation. Generation prompts must include the <code>$search_results$</code> variable. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-placeholders.html\">Use placeholder variables</a> in the user guide.</p>"
         }
       },
       "documentation":"<p>Contains configurations for response generation based on the knowledge base query results.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_RequestSyntax\">RetrieveAndGenerate request</a> </p> </li> </ul>"
@@ -2992,23 +3186,17 @@
     "GetAgentMemoryRequest":{
       "type":"structure",
       "required":[
-        "agentAliasId",
         "agentId",
-        "memoryId",
-        "memoryType"
+        "agentAliasId",
+        "memoryType",
+        "memoryId"
       ],
       "members":{
-        "agentAliasId":{
-          "shape":"AgentAliasId",
-          "documentation":"<p>The unique identifier of an alias of an agent.</p>",
-          "location":"uri",
-          "locationName":"agentAliasId"
-        },
-        "agentId":{
-          "shape":"AgentId",
-          "documentation":"<p>The unique identifier of the agent to which the alias belongs.</p>",
-          "location":"uri",
-          "locationName":"agentId"
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the total number of results is greater than the maxItems value provided in the request, enter the token returned in the <code>nextToken</code> field in the response in this field to return the next batch of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
         },
         "maxItems":{
           "shape":"MaxResults",
@@ -3016,11 +3204,17 @@
           "location":"querystring",
           "locationName":"maxItems"
         },
-        "memoryId":{
-          "shape":"MemoryId",
-          "documentation":"<p>The unique identifier of the memory. </p>",
-          "location":"querystring",
-          "locationName":"memoryId"
+        "agentId":{
+          "shape":"AgentId",
+          "documentation":"<p>The unique identifier of the agent to which the alias belongs.</p>",
+          "location":"uri",
+          "locationName":"agentId"
+        },
+        "agentAliasId":{
+          "shape":"AgentAliasId",
+          "documentation":"<p>The unique identifier of an alias of an agent.</p>",
+          "location":"uri",
+          "locationName":"agentAliasId"
         },
         "memoryType":{
           "shape":"MemoryType",
@@ -3028,40 +3222,40 @@
           "location":"querystring",
           "locationName":"memoryType"
         },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>If the total number of results is greater than the maxItems value provided in the request, enter the token returned in the <code>nextToken</code> field in the response in this field to return the next batch of results.</p>",
+        "memoryId":{
+          "shape":"MemoryId",
+          "documentation":"<p>The unique identifier of the memory. </p>",
           "location":"querystring",
-          "locationName":"nextToken"
+          "locationName":"memoryId"
         }
       }
     },
     "GetAgentMemoryResponse":{
       "type":"structure",
       "members":{
-        "memoryContents":{
-          "shape":"Memories",
-          "documentation":"<p>Contains details of the sessions stored in the memory</p>"
-        },
         "nextToken":{
           "shape":"NextToken",
           "documentation":"<p>If the total number of results is greater than the maxItems value provided in the request, use this token when making another request in the <code>nextToken</code> field to return the next batch of results.</p>"
+        },
+        "memoryContents":{
+          "shape":"Memories",
+          "documentation":"<p>Contains details of the sessions stored in the memory</p>"
         }
       }
     },
     "GetExecutionFlowSnapshotRequest":{
       "type":"structure",
       "required":[
-        "executionIdentifier",
+        "flowIdentifier",
         "flowAliasIdentifier",
-        "flowIdentifier"
+        "executionIdentifier"
       ],
       "members":{
-        "executionIdentifier":{
-          "shape":"FlowExecutionIdentifier",
-          "documentation":"<p>The unique identifier of the flow execution.</p>",
+        "flowIdentifier":{
+          "shape":"FlowIdentifier",
+          "documentation":"<p>The unique identifier of the flow.</p>",
           "location":"uri",
-          "locationName":"executionIdentifier"
+          "locationName":"flowIdentifier"
         },
         "flowAliasIdentifier":{
           "shape":"FlowAliasIdentifier",
@@ -3069,63 +3263,63 @@
           "location":"uri",
           "locationName":"flowAliasIdentifier"
         },
-        "flowIdentifier":{
-          "shape":"FlowIdentifier",
-          "documentation":"<p>The unique identifier of the flow.</p>",
+        "executionIdentifier":{
+          "shape":"FlowExecutionIdentifier",
+          "documentation":"<p>The unique identifier of the flow execution.</p>",
           "location":"uri",
-          "locationName":"flowIdentifier"
+          "locationName":"executionIdentifier"
         }
       }
     },
     "GetExecutionFlowSnapshotResponse":{
       "type":"structure",
       "required":[
-        "definition",
-        "executionRoleArn",
-        "flowAliasIdentifier",
         "flowIdentifier",
-        "flowVersion"
+        "flowAliasIdentifier",
+        "flowVersion",
+        "executionRoleArn",
+        "definition"
       ],
       "members":{
-        "customerEncryptionKeyArn":{
-          "shape":"KmsKeyArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the customer managed KMS key that's used to encrypt the flow snapshot.</p>"
-        },
-        "definition":{
-          "shape":"String",
-          "documentation":"<p>The flow definition used for the flow execution, including the nodes, connections, and configuration at the time when the execution started.</p> <p>The definition returns as a string that follows the structure of a <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_FlowDefinition.html\">FlowDefinition</a> object.</p>"
-        },
-        "executionRoleArn":{
-          "shape":"FlowExecutionRoleArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM service role that's used by the flow execution.</p>"
+        "flowIdentifier":{
+          "shape":"FlowIdentifier",
+          "documentation":"<p>The unique identifier of the flow.</p>"
         },
         "flowAliasIdentifier":{
           "shape":"FlowAliasIdentifier",
           "documentation":"<p>The unique identifier of the flow alias used for the flow execution.</p>"
         },
-        "flowIdentifier":{
-          "shape":"FlowIdentifier",
-          "documentation":"<p>The unique identifier of the flow.</p>"
-        },
         "flowVersion":{
           "shape":"Version",
           "documentation":"<p>The version of the flow used for the flow execution.</p>"
+        },
+        "executionRoleArn":{
+          "shape":"FlowExecutionRoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM service role that's used by the flow execution.</p>"
+        },
+        "definition":{
+          "shape":"String",
+          "documentation":"<p>The flow definition used for the flow execution, including the nodes, connections, and configuration at the time when the execution started.</p> <p>The definition returns as a string that follows the structure of a <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_FlowDefinition.html\">FlowDefinition</a> object.</p>"
+        },
+        "customerEncryptionKeyArn":{
+          "shape":"KmsKeyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the customer managed KMS key that's used to encrypt the flow snapshot.</p>"
         }
       }
     },
     "GetFlowExecutionRequest":{
       "type":"structure",
       "required":[
-        "executionIdentifier",
+        "flowIdentifier",
         "flowAliasIdentifier",
-        "flowIdentifier"
+        "executionIdentifier"
       ],
       "members":{
-        "executionIdentifier":{
-          "shape":"FlowExecutionIdentifier",
-          "documentation":"<p>The unique identifier of the flow execution to retrieve.</p>",
+        "flowIdentifier":{
+          "shape":"FlowIdentifier",
+          "documentation":"<p>The unique identifier of the flow.</p>",
           "location":"uri",
-          "locationName":"executionIdentifier"
+          "locationName":"flowIdentifier"
         },
         "flowAliasIdentifier":{
           "shape":"FlowAliasIdentifier",
@@ -3133,11 +3327,11 @@
           "location":"uri",
           "locationName":"flowAliasIdentifier"
         },
-        "flowIdentifier":{
-          "shape":"FlowIdentifier",
-          "documentation":"<p>The unique identifier of the flow.</p>",
+        "executionIdentifier":{
+          "shape":"FlowExecutionIdentifier",
+          "documentation":"<p>The unique identifier of the flow execution to retrieve.</p>",
           "location":"uri",
-          "locationName":"flowIdentifier"
+          "locationName":"executionIdentifier"
         }
       }
     },
@@ -3145,13 +3339,25 @@
       "type":"structure",
       "required":[
         "executionArn",
+        "status",
+        "startedAt",
         "flowAliasIdentifier",
         "flowIdentifier",
-        "flowVersion",
-        "startedAt",
-        "status"
+        "flowVersion"
       ],
       "members":{
+        "executionArn":{
+          "shape":"FlowExecutionIdentifier",
+          "documentation":"<p>The Amazon Resource Name (ARN) that uniquely identifies the flow execution.</p>"
+        },
+        "status":{
+          "shape":"FlowExecutionStatus",
+          "documentation":"<p>The current status of the flow execution.</p> <p>Flow executions time out after 24 hours.</p>"
+        },
+        "startedAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp when the flow execution started.</p>"
+        },
         "endedAt":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp when the flow execution ended. This field is only populated when the execution has completed, failed, timed out, or been aborted.</p>"
@@ -3160,10 +3366,6 @@
           "shape":"FlowExecutionErrors",
           "documentation":"<p>A list of errors that occurred during the flow execution. Each error includes an error code, message, and the node where the error occurred, if applicable.</p>"
         },
-        "executionArn":{
-          "shape":"FlowExecutionIdentifier",
-          "documentation":"<p>The Amazon Resource Name (ARN) that uniquely identifies the flow execution.</p>"
-        },
         "flowAliasIdentifier":{
           "shape":"FlowAliasIdentifier",
           "documentation":"<p>The unique identifier of the flow alias used for the execution.</p>"
@@ -3175,14 +3377,6 @@
         "flowVersion":{
           "shape":"Version",
           "documentation":"<p>The version of the flow used for the execution.</p>"
-        },
-        "startedAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the flow execution started.</p>"
-        },
-        "status":{
-          "shape":"FlowExecutionStatus",
-          "documentation":"<p>The current status of the flow execution.</p> <p>Flow executions time out after 24 hours.</p>"
         }
       }
     },
@@ -3237,40 +3431,40 @@
     "GetSessionResponse":{
       "type":"structure",
       "required":[
-        "createdAt",
-        "lastUpdatedAt",
-        "sessionArn",
         "sessionId",
-        "sessionStatus"
+        "sessionArn",
+        "sessionStatus",
+        "createdAt",
+        "lastUpdatedAt"
       ],
       "members":{
+        "sessionId":{
+          "shape":"Uuid",
+          "documentation":"<p>The unique identifier for the session in UUID format.</p>"
+        },
+        "sessionArn":{
+          "shape":"SessionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the session.</p>"
+        },
+        "sessionStatus":{
+          "shape":"SessionStatus",
+          "documentation":"<p>The current status of the session.</p>"
+        },
         "createdAt":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp for when the session was created.</p>"
         },
-        "encryptionKeyArn":{
-          "shape":"KmsKeyArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Key Management Service key used to encrypt the session data. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/session-encryption.html\">Amazon Bedrock session encryption</a>.</p>"
-        },
         "lastUpdatedAt":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp for when the session was last modified.</p>"
         },
-        "sessionArn":{
-          "shape":"SessionArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the session.</p>"
-        },
-        "sessionId":{
-          "shape":"Uuid",
-          "documentation":"<p>The unique identifier for the session in UUID format.</p>"
-        },
         "sessionMetadata":{
           "shape":"SessionMetadataMap",
           "documentation":"<p>A map of key-value pairs containing attributes persisted across the session.</p>"
         },
-        "sessionStatus":{
-          "shape":"SessionStatus",
-          "documentation":"<p>The current status of the session.</p>"
+        "encryptionKeyArn":{
+          "shape":"KmsKeyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Key Management Service key used to encrypt the session data. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/session-encryption.html\">Amazon Bedrock session encryption</a>.</p>"
         }
       }
     },
@@ -3291,21 +3485,21 @@
     "GuardrailAssessment":{
       "type":"structure",
       "members":{
-        "contentPolicy":{
-          "shape":"GuardrailContentPolicyAssessment",
-          "documentation":"<p>Content policy details of the Guardrail.</p>"
-        },
-        "sensitiveInformationPolicy":{
-          "shape":"GuardrailSensitiveInformationPolicyAssessment",
-          "documentation":"<p>Sensitive Information policy details of Guardrail.</p>"
-        },
         "topicPolicy":{
           "shape":"GuardrailTopicPolicyAssessment",
           "documentation":"<p>Topic policy details of the Guardrail.</p>"
         },
+        "contentPolicy":{
+          "shape":"GuardrailContentPolicyAssessment",
+          "documentation":"<p>Content policy details of the Guardrail.</p>"
+        },
         "wordPolicy":{
           "shape":"GuardrailWordPolicyAssessment",
           "documentation":"<p>Word policy details of the Guardrail.</p>"
+        },
+        "sensitiveInformationPolicy":{
+          "shape":"GuardrailSensitiveInformationPolicyAssessment",
+          "documentation":"<p>Sensitive Information policy details of Guardrail.</p>"
         }
       },
       "documentation":"<p>Assessment details of the content analyzed by Guardrails.</p>",
@@ -3337,13 +3531,13 @@
       "type":"string",
       "max":64,
       "min":0,
-      "pattern":"^[a-z0-9]+$"
+      "pattern":"[a-z0-9]+"
     },
     "GuardrailConfigurationGuardrailVersionString":{
       "type":"string",
       "max":5,
       "min":1,
-      "pattern":"^(([1-9][0-9]{0,7})|(DRAFT))$"
+      "pattern":"(([1-9][0-9]{0,7})|(DRAFT))"
     },
     "GuardrailConfigurationWithArn":{
       "type":"structure",
@@ -3366,17 +3560,17 @@
     "GuardrailContentFilter":{
       "type":"structure",
       "members":{
-        "action":{
-          "shape":"GuardrailContentPolicyAction",
-          "documentation":"<p>The action placed on the content by the Guardrail filter.</p>"
+        "type":{
+          "shape":"GuardrailContentFilterType",
+          "documentation":"<p>The type of content detected in the filter by the Guardrail.</p>"
         },
         "confidence":{
           "shape":"GuardrailContentFilterConfidence",
           "documentation":"<p>The confidence level regarding the content detected in the filter by the Guardrail.</p>"
         },
-        "type":{
-          "shape":"GuardrailContentFilterType",
-          "documentation":"<p>The type of content detected in the filter by the Guardrail.</p>"
+        "action":{
+          "shape":"GuardrailContentPolicyAction",
+          "documentation":"<p>The action placed on the content by the Guardrail filter.</p>"
         }
       },
       "documentation":"<p>Details of the content filter used in the Guardrail.</p>",
@@ -3425,13 +3619,13 @@
     "GuardrailCustomWord":{
       "type":"structure",
       "members":{
-        "action":{
-          "shape":"GuardrailWordPolicyAction",
-          "documentation":"<p>The action details for the custom word filter in the Guardrail.</p>"
-        },
         "match":{
           "shape":"String",
           "documentation":"<p>The match details for the custom word filter in the Guardrail.</p>"
+        },
+        "action":{
+          "shape":"GuardrailWordPolicyAction",
+          "documentation":"<p>The action details for the custom word filter in the Guardrail.</p>"
         }
       },
       "documentation":"<p>The custom word details for the filter in the Guardrail.</p>",
@@ -3457,15 +3651,11 @@
       "type":"string",
       "max":2048,
       "min":0,
-      "pattern":"^(([a-z0-9]+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:guardrail/[a-z0-9]+))$"
+      "pattern":"(([a-z0-9]+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:guardrail/[a-z0-9]+))"
     },
     "GuardrailManagedWord":{
       "type":"structure",
       "members":{
-        "action":{
-          "shape":"GuardrailWordPolicyAction",
-          "documentation":"<p>The action details for the managed word filter in the Guardrail.</p>"
-        },
         "match":{
           "shape":"String",
           "documentation":"<p>The match details for the managed word filter in the Guardrail.</p>"
@@ -3473,6 +3663,10 @@
         "type":{
           "shape":"GuardrailManagedWordType",
           "documentation":"<p>The type details for the managed word filter in the Guardrail.</p>"
+        },
+        "action":{
+          "shape":"GuardrailWordPolicyAction",
+          "documentation":"<p>The action details for the managed word filter in the Guardrail.</p>"
         }
       },
       "documentation":"<p>The managed word details for the filter in the Guardrail.</p>",
@@ -3490,17 +3684,17 @@
     "GuardrailPiiEntityFilter":{
       "type":"structure",
       "members":{
-        "action":{
-          "shape":"GuardrailSensitiveInformationPolicyAction",
-          "documentation":"<p>The action of the Guardrail filter to identify and remove PII.</p>"
+        "type":{
+          "shape":"GuardrailPiiEntityType",
+          "documentation":"<p>The type of PII the Guardrail filter has identified and removed.</p>"
         },
         "match":{
           "shape":"String",
           "documentation":"<p>The match to settings in the Guardrail filter to identify and remove PII.</p>"
         },
-        "type":{
-          "shape":"GuardrailPiiEntityType",
-          "documentation":"<p>The type of PII the Guardrail filter has identified and removed.</p>"
+        "action":{
+          "shape":"GuardrailSensitiveInformationPolicyAction",
+          "documentation":"<p>The action of the Guardrail filter to identify and remove PII.</p>"
         }
       },
       "documentation":"<p>The Guardrail filter to identify and remove personally identifiable information (PII).</p>",
@@ -3550,14 +3744,6 @@
     "GuardrailRegexFilter":{
       "type":"structure",
       "members":{
-        "action":{
-          "shape":"GuardrailSensitiveInformationPolicyAction",
-          "documentation":"<p>The action details for the regex filter used in the Guardrail.</p>"
-        },
-        "match":{
-          "shape":"String",
-          "documentation":"<p>The match details for the regex filter used in the Guardrail.</p>"
-        },
         "name":{
           "shape":"String",
           "documentation":"<p>The name details for the regex filter used in the Guardrail.</p>"
@@ -3565,6 +3751,14 @@
         "regex":{
           "shape":"String",
           "documentation":"<p>The regex details for the regex filter used in the Guardrail.</p>"
+        },
+        "match":{
+          "shape":"String",
+          "documentation":"<p>The match details for the regex filter used in the Guardrail.</p>"
+        },
+        "action":{
+          "shape":"GuardrailSensitiveInformationPolicyAction",
+          "documentation":"<p>The action details for the regex filter used in the Guardrail.</p>"
         }
       },
       "documentation":"<p>The details for the regex filter used in the Guardrail.</p>",
@@ -3600,10 +3794,6 @@
     "GuardrailTopic":{
       "type":"structure",
       "members":{
-        "action":{
-          "shape":"GuardrailTopicPolicyAction",
-          "documentation":"<p>The action details on a specific topic in the Guardrail.</p>"
-        },
         "name":{
           "shape":"String",
           "documentation":"<p>The name details on a specific topic in the Guardrail.</p>"
@@ -3611,6 +3801,10 @@
         "type":{
           "shape":"GuardrailTopicType",
           "documentation":"<p>The type details on a specific topic in the Guardrail.</p>"
+        },
+        "action":{
+          "shape":"GuardrailTopicPolicyAction",
+          "documentation":"<p>The action details on a specific topic in the Guardrail.</p>"
         }
       },
       "documentation":"<p>The details for a specific topic defined in the Guardrail.</p>",
@@ -3647,21 +3841,21 @@
           "shape":"GuardrailAction",
           "documentation":"<p>The trace action details used with the Guardrail.</p>"
         },
+        "traceId":{
+          "shape":"TraceId",
+          "documentation":"<p>The details of the trace Id used in the Guardrail Trace.</p>"
+        },
         "inputAssessments":{
           "shape":"GuardrailAssessmentList",
           "documentation":"<p>The details of the input assessments used in the Guardrail Trace.</p>"
         },
-        "metadata":{
-          "shape":"Metadata",
-          "documentation":"<p>Contains information about the Guardrail output.</p>"
-        },
         "outputAssessments":{
           "shape":"GuardrailAssessmentList",
           "documentation":"<p>The details of the output assessments used in the Guardrail Trace.</p>"
         },
-        "traceId":{
-          "shape":"TraceId",
-          "documentation":"<p>The details of the trace Id used in the Guardrail Trace.</p>"
+        "metadata":{
+          "shape":"Metadata",
+          "documentation":"<p>Contains information about the Guardrail output.</p>"
         }
       },
       "documentation":"<p>The trace details used in the Guardrail.</p>",
@@ -3671,7 +3865,7 @@
       "type":"string",
       "max":5,
       "min":1,
-      "pattern":"^(([1-9][0-9]{0,7})|(DRAFT))$"
+      "pattern":"(([1-9][0-9]{0,7})|(DRAFT))"
     },
     "GuardrailWordPolicyAction":{
       "type":"string",
@@ -3821,25 +4015,25 @@
     "InferenceConfiguration":{
       "type":"structure",
       "members":{
-        "maximumLength":{
-          "shape":"MaximumLength",
-          "documentation":"<p>The maximum number of tokens allowed in the generated response.</p>"
-        },
-        "stopSequences":{
-          "shape":"StopSequences",
-          "documentation":"<p>A list of stop sequences. A stop sequence is a sequence of characters that causes the model to stop generating the response.</p>"
-        },
         "temperature":{
           "shape":"Temperature",
           "documentation":"<p>The likelihood of the model selecting higher-probability options while generating a response. A lower value makes the model more likely to choose higher-probability options, while a higher value makes the model more likely to choose lower-probability options.</p>"
         },
+        "topP":{
+          "shape":"TopP",
+          "documentation":"<p>While generating a response, the model determines the probability of the following token at each point of generation. The value that you set for <code>Top P</code> determines the number of most-likely candidates from which the model chooses the next token in the sequence. For example, if you set <code>topP</code> to 0.8, the model only selects the next token from the top 80% of the probability distribution of next tokens.</p>"
+        },
         "topK":{
           "shape":"TopK",
           "documentation":"<p>While generating a response, the model determines the probability of the following token at each point of generation. The value that you set for <code>topK</code> is the number of most-likely candidates from which the model chooses the next token in the sequence. For example, if you set <code>topK</code> to 50, the model selects the next token from among the top 50 most likely choices.</p>"
         },
-        "topP":{
-          "shape":"TopP",
-          "documentation":"<p>While generating a response, the model determines the probability of the following token at each point of generation. The value that you set for <code>Top P</code> determines the number of most-likely candidates from which the model chooses the next token in the sequence. For example, if you set <code>topP</code> to 0.8, the model only selects the next token from the top 80% of the probability distribution of next tokens.</p>"
+        "maximumLength":{
+          "shape":"MaximumLength",
+          "documentation":"<p>The maximum number of tokens allowed in the generated response.</p>"
+        },
+        "stopSequences":{
+          "shape":"StopSequences",
+          "documentation":"<p>A list of stop sequences. A stop sequence is a sequence of characters that causes the model to stop generating the response.</p>"
         }
       },
       "documentation":"<p>Specifications about the inference parameters that were provided alongside the prompt. These are specified in the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_PromptOverrideConfiguration.html\">PromptOverrideConfiguration</a> object that was set when the agent was created or updated. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html\">Inference parameters for foundation models</a>.</p>"
@@ -3858,13 +4052,13 @@
     "InlineAgentPayloadPart":{
       "type":"structure",
       "members":{
-        "attribution":{
-          "shape":"Attribution",
-          "documentation":"<p>Contains citations for a part of an agent response.</p>"
-        },
         "bytes":{
           "shape":"PartBody",
           "documentation":"<p>A part of the agent response in bytes.</p>"
+        },
+        "attribution":{
+          "shape":"Attribution",
+          "documentation":"<p>Contains citations for a part of an agent response.</p>"
         }
       },
       "documentation":"<p>Contains a part of an agent response and citations for it. </p>",
@@ -3874,42 +4068,30 @@
     "InlineAgentResponseStream":{
       "type":"structure",
       "members":{
-        "accessDeniedException":{
-          "shape":"AccessDeniedException",
-          "documentation":"<p>The request is denied because of missing access permissions. Check your permissions and retry your request.</p>"
-        },
-        "badGatewayException":{
-          "shape":"BadGatewayException",
-          "documentation":"<p>There was an issue with a dependency due to a server issue. Retry your request. </p>"
-        },
         "chunk":{
           "shape":"InlineAgentPayloadPart",
           "documentation":"<p>Contains a part of an agent response and citations for it.</p>"
         },
-        "conflictException":{
-          "shape":"ConflictException",
-          "documentation":"<p>There was a conflict performing an operation. Resolve the conflict and retry your request. </p>"
-        },
-        "dependencyFailedException":{
-          "shape":"DependencyFailedException",
-          "documentation":"<p>There was an issue with a dependency. Check the resource configurations and retry the request.</p>"
+        "trace":{
+          "shape":"InlineAgentTracePart",
+          "documentation":"<p>Contains information about the agent and session, alongside the agent's reasoning process and results from calling actions and querying knowledge bases and metadata about the trace. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/trace-events.html\">Trace events</a>. </p>"
         },
-        "files":{
-          "shape":"InlineAgentFilePart",
-          "documentation":"<p>Contains intermediate response for code interpreter if any files have been generated.</p>"
+        "returnControl":{
+          "shape":"InlineAgentReturnControlPayload",
+          "documentation":"<p>Contains the parameters and information that the agent elicited from the customer to carry out an action. This information is returned to the system and can be used in your own setup for fulfilling the action.</p>"
         },
         "internalServerException":{
           "shape":"InternalServerException",
           "documentation":"<p>An internal server error occurred. Retry your request.</p>"
         },
+        "validationException":{
+          "shape":"ValidationException",
+          "documentation":"<p>Input validation failed. Check your request parameters and retry the request.</p>"
+        },
         "resourceNotFoundException":{
           "shape":"ResourceNotFoundException",
           "documentation":"<p>The specified resource Amazon Resource Name (ARN) was not found. Check the Amazon Resource Name (ARN) and try your request again. </p>"
         },
-        "returnControl":{
-          "shape":"InlineAgentReturnControlPayload",
-          "documentation":"<p>Contains the parameters and information that the agent elicited from the customer to carry out an action. This information is returned to the system and can be used in your own setup for fulfilling the action.</p>"
-        },
         "serviceQuotaExceededException":{
           "shape":"ServiceQuotaExceededException",
           "documentation":"<p>The number of requests exceeds the service quota. Resubmit your request later.</p>"
@@ -3918,13 +4100,25 @@
           "shape":"ThrottlingException",
           "documentation":"<p>The number of requests exceeds the limit. Resubmit your request later.</p>"
         },
-        "trace":{
-          "shape":"InlineAgentTracePart",
-          "documentation":"<p>Contains information about the agent and session, alongside the agent's reasoning process and results from calling actions and querying knowledge bases and metadata about the trace. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/trace-events.html\">Trace events</a>. </p>"
+        "accessDeniedException":{
+          "shape":"AccessDeniedException",
+          "documentation":"<p>The request is denied because of missing access permissions. Check your permissions and retry your request.</p>"
         },
-        "validationException":{
-          "shape":"ValidationException",
-          "documentation":"<p>Input validation failed. Check your request parameters and retry the request.</p>"
+        "conflictException":{
+          "shape":"ConflictException",
+          "documentation":"<p>There was a conflict performing an operation. Resolve the conflict and retry your request. </p>"
+        },
+        "dependencyFailedException":{
+          "shape":"DependencyFailedException",
+          "documentation":"<p>There was an issue with a dependency. Check the resource configurations and retry the request.</p>"
+        },
+        "badGatewayException":{
+          "shape":"BadGatewayException",
+          "documentation":"<p>There was an issue with a dependency due to a server issue. Retry your request. </p>"
+        },
+        "files":{
+          "shape":"InlineAgentFilePart",
+          "documentation":"<p>Contains intermediate response for code interpreter if any files have been generated.</p>"
         }
       },
       "documentation":"<p>The response from invoking the agent and associated citations and trace information.</p>",
@@ -3933,13 +4127,13 @@
     "InlineAgentReturnControlPayload":{
       "type":"structure",
       "members":{
-        "invocationId":{
-          "shape":"String",
-          "documentation":"<p>The identifier of the action group invocation. </p>"
-        },
         "invocationInputs":{
           "shape":"InvocationInputs",
           "documentation":"<p>A list of objects that contain information about the parameters and inputs that need to be sent into the API operation or function, based on what the agent determines from its session with the user.</p>"
+        },
+        "invocationId":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the action group invocation. </p>"
         }
       },
       "documentation":"<p>Contains information to return from the action group that the agent has predicted to invoke.</p> <p>This data type is used in the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_ResponseSyntax\">InvokeAgent response</a> API operation.</p>",
@@ -3949,25 +4143,25 @@
     "InlineAgentTracePart":{
       "type":"structure",
       "members":{
+        "sessionId":{
+          "shape":"SessionId",
+          "documentation":"<p>The unique identifier of the session with the agent.</p>"
+        },
+        "trace":{
+          "shape":"Trace",
+          "documentation":"<p>Contains one part of the agent's reasoning process and results from calling API actions and querying knowledge bases. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-test.html#trace-enablement\">Trace enablement</a>. </p>"
+        },
         "callerChain":{
           "shape":"CallerChain",
           "documentation":"<p>The caller chain for the trace part.</p>"
         },
-        "collaboratorName":{
-          "shape":"Name",
-          "documentation":"<p>The collaborator name for the trace part.</p>"
-        },
         "eventTime":{
           "shape":"SyntheticTimestamp_date_time",
           "documentation":"<p>The time that trace occurred. </p>"
         },
-        "sessionId":{
-          "shape":"SessionId",
-          "documentation":"<p>The unique identifier of the session with the agent.</p>"
-        },
-        "trace":{
-          "shape":"Trace",
-          "documentation":"<p>Contains one part of the agent's reasoning process and results from calling API actions and querying knowledge bases. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-test.html#trace-enablement\">Trace enablement</a>. </p>"
+        "collaboratorName":{
+          "shape":"Name",
+          "documentation":"<p>The collaborator name for the trace part.</p>"
         }
       },
       "documentation":"<p>Contains information about the agent and session, alongside the agent's reasoning process and results from calling API actions and querying knowledge bases and metadata about the trace. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-test.html#trace-enablement\">Trace enablement</a>.</p>",
@@ -3987,17 +4181,9 @@
     "InlineSessionState":{
       "type":"structure",
       "members":{
-        "conversationHistory":{
-          "shape":"ConversationHistory",
-          "documentation":"<p> Contains the conversation history that persist across sessions. </p>"
-        },
-        "files":{
-          "shape":"InputFiles",
-          "documentation":"<p> Contains information about the files used by code interpreter. </p>"
-        },
-        "invocationId":{
-          "shape":"String",
-          "documentation":"<p> The identifier of the invocation of an action. This value must match the <code>invocationId</code> returned in the <code>InvokeInlineAgent</code> response for the action whose results are provided in the <code>returnControlInvocationResults</code> field. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-returncontrol.html\">Return control to the agent developer</a>. </p>"
+        "sessionAttributes":{
+          "shape":"SessionAttributesMap",
+          "documentation":"<p> Contains attributes that persist across a session and the values of those attributes. </p>"
         },
         "promptSessionAttributes":{
           "shape":"PromptSessionAttributesMap",
@@ -4007,9 +4193,17 @@
           "shape":"ReturnControlInvocationResults",
           "documentation":"<p> Contains information about the results from the action group invocation. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-returncontrol.html\">Return control to the agent developer</a>. </p> <note> <p>If you include this field in the <code>sessionState</code> field, the <code>inputText</code> field will be ignored.</p> </note>"
         },
-        "sessionAttributes":{
-          "shape":"SessionAttributesMap",
-          "documentation":"<p> Contains attributes that persist across a session and the values of those attributes. </p>"
+        "invocationId":{
+          "shape":"String",
+          "documentation":"<p> The identifier of the invocation of an action. This value must match the <code>invocationId</code> returned in the <code>InvokeInlineAgent</code> response for the action whose results are provided in the <code>returnControlInvocationResults</code> field. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-returncontrol.html\">Return control to the agent developer</a>. </p>"
+        },
+        "files":{
+          "shape":"InputFiles",
+          "documentation":"<p> Contains information about the files used by code interpreter. </p>"
+        },
+        "conversationHistory":{
+          "shape":"ConversationHistory",
+          "documentation":"<p> Contains the conversation history that persist across sessions. </p>"
         }
       },
       "documentation":"<p> Contains parameters that specify various attributes that persist across a session or prompt. You can define session state attributes as key-value pairs when writing a <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-lambda.html\">Lambda function</a> for an action group or pass them when making an <code>InvokeInlineAgent</code> request. Use session state attributes to control and provide conversational context for your inline agent and to help customize your agent's behavior. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html\">Control session context</a> </p>"
@@ -4092,34 +4286,34 @@
     },
     "InvocationIdentifier":{
       "type":"string",
-      "pattern":"^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
+      "pattern":"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"
     },
     "InvocationInput":{
       "type":"structure",
       "members":{
-        "actionGroupInvocationInput":{
-          "shape":"ActionGroupInvocationInput",
-          "documentation":"<p>Contains information about the action group to be invoked.</p>"
-        },
-        "agentCollaboratorInvocationInput":{
-          "shape":"AgentCollaboratorInvocationInput",
-          "documentation":"<p>The collaborator's invocation input.</p>"
-        },
-        "codeInterpreterInvocationInput":{
-          "shape":"CodeInterpreterInvocationInput",
-          "documentation":"<p>Contains information about the code interpreter to be invoked.</p>"
+        "traceId":{
+          "shape":"TraceId",
+          "documentation":"<p>The unique identifier of the trace.</p>"
         },
         "invocationType":{
           "shape":"InvocationType",
           "documentation":"<p>Specifies whether the agent is invoking an action group or a knowledge base.</p>"
         },
+        "actionGroupInvocationInput":{
+          "shape":"ActionGroupInvocationInput",
+          "documentation":"<p>Contains information about the action group to be invoked.</p>"
+        },
         "knowledgeBaseLookupInput":{
           "shape":"KnowledgeBaseLookupInput",
           "documentation":"<p>Contains details about the knowledge base to look up and the query to be made.</p>"
         },
-        "traceId":{
-          "shape":"TraceId",
-          "documentation":"<p>The unique identifier of the trace.</p>"
+        "codeInterpreterInvocationInput":{
+          "shape":"CodeInterpreterInvocationInput",
+          "documentation":"<p>Contains information about the code interpreter to be invoked.</p>"
+        },
+        "agentCollaboratorInvocationInput":{
+          "shape":"AgentCollaboratorInvocationInput",
+          "documentation":"<p>The collaborator's invocation input.</p>"
         }
       },
       "documentation":"<p>Contains information pertaining to the action group or knowledge base that is being invoked.</p>",
@@ -4164,13 +4358,17 @@
     "InvocationStep":{
       "type":"structure",
       "required":[
+        "sessionId",
         "invocationId",
         "invocationStepId",
         "invocationStepTime",
-        "payload",
-        "sessionId"
+        "payload"
       ],
       "members":{
+        "sessionId":{
+          "shape":"Uuid",
+          "documentation":"<p>The unique identifier of the session containing the invocation step.</p>"
+        },
         "invocationId":{
           "shape":"Uuid",
           "documentation":"<p>The unique identifier (in UUID format) for the invocation that includes the invocation step.</p>"
@@ -4186,10 +4384,6 @@
         "payload":{
           "shape":"InvocationStepPayload",
           "documentation":"<p>Payload content, such as text and images, for the invocation step.</p>"
-        },
-        "sessionId":{
-          "shape":"Uuid",
-          "documentation":"<p>The unique identifier of the session containing the invocation step.</p>"
         }
       },
       "documentation":"<p>Stores fine-grained state checkpoints, including text and images, for each interaction in an invocation in a session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>. </p>"
@@ -4212,12 +4406,16 @@
     "InvocationStepSummary":{
       "type":"structure",
       "required":[
+        "sessionId",
         "invocationId",
         "invocationStepId",
-        "invocationStepTime",
-        "sessionId"
+        "invocationStepTime"
       ],
       "members":{
+        "sessionId":{
+          "shape":"Uuid",
+          "documentation":"<p>The unique identifier for the session associated with the invocation step.</p>"
+        },
         "invocationId":{
           "shape":"Uuid",
           "documentation":"<p>A unique identifier for the invocation in UUID format.</p>"
@@ -4229,10 +4427,6 @@
         "invocationStepTime":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp for when the invocation step was created.</p>"
-        },
-        "sessionId":{
-          "shape":"Uuid",
-          "documentation":"<p>The unique identifier for the session associated with the invocation step.</p>"
         }
       },
       "documentation":"<p>Contains details about an invocation step within an invocation in a session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>"
@@ -4244,22 +4438,22 @@
     "InvocationSummary":{
       "type":"structure",
       "required":[
-        "createdAt",
+        "sessionId",
         "invocationId",
-        "sessionId"
+        "createdAt"
       ],
       "members":{
-        "createdAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp for when the invocation was created.</p>"
+        "sessionId":{
+          "shape":"Uuid",
+          "documentation":"<p>The unique identifier for the session associated with the invocation.</p>"
         },
         "invocationId":{
           "shape":"Uuid",
           "documentation":"<p>A unique identifier for the invocation in UUID format.</p>"
         },
-        "sessionId":{
-          "shape":"Uuid",
-          "documentation":"<p>The unique identifier for the session associated with the invocation.</p>"
+        "createdAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp for when the invocation was created.</p>"
         }
       },
       "documentation":"<p>Contains details about an invocation in a session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>"
@@ -4277,16 +4471,14 @@
     "InvokeAgentRequest":{
       "type":"structure",
       "required":[
-        "agentAliasId",
         "agentId",
+        "agentAliasId",
         "sessionId"
       ],
       "members":{
-        "agentAliasId":{
-          "shape":"AgentAliasId",
-          "documentation":"<p>The alias of the agent to use.</p>",
-          "location":"uri",
-          "locationName":"agentAliasId"
+        "sessionState":{
+          "shape":"SessionState",
+          "documentation":"<p>Contains parameters that specify various attributes of the session. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html\">Control session context</a>.</p> <note> <p>If you include <code>returnControlInvocationResults</code> in the <code>sessionState</code> field, the <code>inputText</code> field will be ignored.</p> </note>"
         },
         "agentId":{
           "shape":"AgentId",
@@ -4294,18 +4486,26 @@
           "location":"uri",
           "locationName":"agentId"
         },
-        "bedrockModelConfigurations":{
-          "shape":"BedrockModelConfigurations",
-          "documentation":"<p>Model performance settings for the request.</p>"
+        "agentAliasId":{
+          "shape":"AgentAliasId",
+          "documentation":"<p>The alias of the agent to use.</p>",
+          "location":"uri",
+          "locationName":"agentAliasId"
         },
-        "enableTrace":{
-          "shape":"Boolean",
-          "documentation":"<p>Specifies whether to turn on the trace or not to track the agent's reasoning process. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-test.html#trace-events\">Trace enablement</a>.</p>"
+        "sessionId":{
+          "shape":"SessionId",
+          "documentation":"<p>The unique identifier of the session. Use the same value across requests to continue the same conversation.</p>",
+          "location":"uri",
+          "locationName":"sessionId"
         },
         "endSession":{
           "shape":"Boolean",
           "documentation":"<p>Specifies whether to end the session with the agent or not.</p>"
         },
+        "enableTrace":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether to turn on the trace or not to track the agent's reasoning process. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-test.html#trace-events\">Trace enablement</a>.</p>"
+        },
         "inputText":{
           "shape":"InputText",
           "documentation":"<p>The prompt text to send the agent.</p> <note> <p>If you include <code>returnControlInvocationResults</code> in the <code>sessionState</code> field, the <code>inputText</code> field will be ignored.</p> </note>"
@@ -4314,29 +4514,23 @@
           "shape":"MemoryId",
           "documentation":"<p>The unique identifier of the agent memory.</p>"
         },
+        "bedrockModelConfigurations":{
+          "shape":"BedrockModelConfigurations",
+          "documentation":"<p>Model performance settings for the request.</p>"
+        },
+        "streamingConfigurations":{
+          "shape":"StreamingConfigurations",
+          "documentation":"<p> Specifies the configurations for streaming. </p> <note> <p>To use agent streaming, you need permissions to perform the <code>bedrock:InvokeModelWithResponseStream</code> action.</p> </note>"
+        },
         "promptCreationConfigurations":{
           "shape":"PromptCreationConfigurations",
           "documentation":"<p>Specifies parameters that control how the service populates the agent prompt for an <code>InvokeAgent</code> request. You can control which aspects of previous invocations in the same agent session the service uses to populate the agent prompt. This gives you more granular control over the contextual history that is used to process the current request.</p>"
         },
-        "sessionId":{
-          "shape":"SessionId",
-          "documentation":"<p>The unique identifier of the session. Use the same value across requests to continue the same conversation.</p>",
-          "location":"uri",
-          "locationName":"sessionId"
-        },
-        "sessionState":{
-          "shape":"SessionState",
-          "documentation":"<p>Contains parameters that specify various attributes of the session. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html\">Control session context</a>.</p> <note> <p>If you include <code>returnControlInvocationResults</code> in the <code>sessionState</code> field, the <code>inputText</code> field will be ignored.</p> </note>"
-        },
         "sourceArn":{
           "shape":"AWSResourceARN",
           "documentation":"<p>The ARN of the resource making the request.</p>",
           "location":"header",
           "locationName":"x-amz-source-arn"
-        },
-        "streamingConfigurations":{
-          "shape":"StreamingConfigurations",
-          "documentation":"<p> Specifies the configurations for streaming. </p> <note> <p>To use agent streaming, you need permissions to perform the <code>bedrock:InvokeModelWithResponseStream</code> action.</p> </note>"
         }
       }
     },
@@ -4358,17 +4552,17 @@
           "location":"header",
           "locationName":"x-amzn-bedrock-agent-content-type"
         },
-        "memoryId":{
-          "shape":"MemoryId",
-          "documentation":"<p>The unique identifier of the agent memory.</p>",
-          "location":"header",
-          "locationName":"x-amz-bedrock-agent-memory-id"
-        },
         "sessionId":{
           "shape":"SessionId",
           "documentation":"<p>The unique identifier of the session with the agent.</p>",
           "location":"header",
           "locationName":"x-amz-bedrock-agent-session-id"
+        },
+        "memoryId":{
+          "shape":"MemoryId",
+          "documentation":"<p>The unique identifier of the agent memory.</p>",
+          "location":"header",
+          "locationName":"x-amz-bedrock-agent-memory-id"
         }
       },
       "payload":"completion"
@@ -4376,18 +4570,16 @@
     "InvokeFlowRequest":{
       "type":"structure",
       "required":[
-        "flowAliasIdentifier",
         "flowIdentifier",
+        "flowAliasIdentifier",
         "inputs"
       ],
       "members":{
-        "enableTrace":{
-          "shape":"Boolean",
-          "documentation":"<p>Specifies whether to return the trace for the flow or not. Traces track inputs and outputs for nodes in the flow. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html\">Track each step in your prompt flow by viewing its trace in Amazon Bedrock</a>.</p>"
-        },
-        "executionId":{
-          "shape":"FlowExecutionId",
-          "documentation":"<p>The unique identifier for the current flow execution. If you don't provide a value, Amazon Bedrock creates the identifier for you. </p>"
+        "flowIdentifier":{
+          "shape":"FlowIdentifier",
+          "documentation":"<p>The unique identifier of the flow.</p>",
+          "location":"uri",
+          "locationName":"flowIdentifier"
         },
         "flowAliasIdentifier":{
           "shape":"FlowAliasIdentifier",
@@ -4395,19 +4587,21 @@
           "location":"uri",
           "locationName":"flowAliasIdentifier"
         },
-        "flowIdentifier":{
-          "shape":"FlowIdentifier",
-          "documentation":"<p>The unique identifier of the flow.</p>",
-          "location":"uri",
-          "locationName":"flowIdentifier"
-        },
         "inputs":{
           "shape":"FlowInputs",
           "documentation":"<p>A list of objects, each containing information about an input into the flow.</p>"
         },
+        "enableTrace":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether to return the trace for the flow or not. Traces track inputs and outputs for nodes in the flow. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-trace.html\">Track each step in your prompt flow by viewing its trace in Amazon Bedrock</a>.</p>"
+        },
         "modelPerformanceConfiguration":{
           "shape":"ModelPerformanceConfiguration",
           "documentation":"<p>Model performance settings for the request.</p>"
+        },
+        "executionId":{
+          "shape":"FlowExecutionId",
+          "documentation":"<p>The unique identifier for the current flow execution. If you don't provide a value, Amazon Bedrock creates the identifier for you. </p>"
         }
       }
     },
@@ -4415,15 +4609,15 @@
       "type":"structure",
       "required":["responseStream"],
       "members":{
+        "responseStream":{
+          "shape":"FlowResponseStream",
+          "documentation":"<p>The output of the flow, returned as a stream. If there's an error, the error is returned.</p>"
+        },
         "executionId":{
           "shape":"FlowExecutionId",
           "documentation":"<p>The unique identifier for the current flow execution.</p>",
           "location":"header",
           "locationName":"x-amz-bedrock-flow-execution-id"
-        },
-        "responseStream":{
-          "shape":"FlowResponseStream",
-          "documentation":"<p>The output of the flow, returned as a stream. If there's an error, the error is returned.</p>"
         }
       },
       "payload":"responseStream"
@@ -4436,95 +4630,95 @@
         "sessionId"
       ],
       "members":{
-        "actionGroups":{
-          "shape":"AgentActionGroups",
-          "documentation":"<p> A list of action groups with each action group defining the action the inline agent needs to carry out. </p>"
-        },
-        "agentCollaboration":{
-          "shape":"AgentCollaboration",
-          "documentation":"<p> Defines how the inline collaborator agent handles information across multiple collaborator agents to coordinate a final response. The inline collaborator agent can also be the supervisor. </p>"
-        },
-        "agentName":{
-          "shape":"Name",
-          "documentation":"<p>The name for the agent.</p>"
-        },
-        "bedrockModelConfigurations":{
-          "shape":"InlineBedrockModelConfigurations",
-          "documentation":"<p>Model settings for the request.</p>"
-        },
-        "collaboratorConfigurations":{
-          "shape":"CollaboratorConfigurations",
-          "documentation":"<p> Settings for an inline agent collaborator called with <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeInlineAgent.html\">InvokeInlineAgent</a>. </p>"
-        },
-        "collaborators":{
-          "shape":"Collaborators",
-          "documentation":"<p> List of collaborator inline agents. </p>"
-        },
-        "customOrchestration":{
-          "shape":"CustomOrchestration",
-          "documentation":"<p>Contains details of the custom orchestration configured for the agent. </p>"
-        },
         "customerEncryptionKeyArn":{
           "shape":"KmsKeyArn",
           "documentation":"<p> The Amazon Resource Name (ARN) of the Amazon Web Services KMS key to use to encrypt your inline agent. </p>"
         },
-        "enableTrace":{
-          "shape":"Boolean",
-          "documentation":"<p> Specifies whether to turn on the trace or not to track the agent's reasoning process. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/trace-events.html\">Using trace</a>. </p>"
-        },
-        "endSession":{
-          "shape":"Boolean",
-          "documentation":"<p> Specifies whether to end the session with the inline agent or not. </p>"
-        },
         "foundationModel":{
           "shape":"ModelIdentifier",
           "documentation":"<p> The <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html#model-ids-arns\">model identifier (ID)</a> of the model to use for orchestration by the inline agent. For example, <code>meta.llama3-1-70b-instruct-v1:0</code>. </p>"
         },
-        "guardrailConfiguration":{
-          "shape":"GuardrailConfigurationWithArn",
-          "documentation":"<p> The <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails.html\">guardrails</a> to assign to the inline agent. </p>"
+        "instruction":{
+          "shape":"Instruction",
+          "documentation":"<p> The instructions that tell the inline agent what it should do and how it should interact with users. </p>"
         },
         "idleSessionTTLInSeconds":{
           "shape":"SessionTTL",
           "documentation":"<p> The number of seconds for which the inline agent should maintain session information. After this time expires, the subsequent <code>InvokeInlineAgent</code> request begins a new session. </p> <p>A user interaction remains active for the amount of time specified. If no conversation occurs during this time, the session expires and the data provided before the timeout is deleted.</p>"
         },
-        "inlineSessionState":{
-          "shape":"InlineSessionState",
-          "documentation":"<p> Parameters that specify the various attributes of a sessions. You can include attributes for the session or prompt or, if you configured an action group to return control, results from invocation of the action group. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html\">Control session context</a>. </p> <note> <p>If you include <code>returnControlInvocationResults</code> in the <code>sessionState</code> field, the <code>inputText</code> field will be ignored.</p> </note>"
-        },
-        "inputText":{
-          "shape":"InputText",
-          "documentation":"<p> The prompt text to send to the agent. </p> <note> <p>If you include <code>returnControlInvocationResults</code> in the <code>sessionState</code> field, the <code>inputText</code> field will be ignored.</p> </note>"
-        },
-        "instruction":{
-          "shape":"Instruction",
-          "documentation":"<p> The instructions that tell the inline agent what it should do and how it should interact with users. </p>"
+        "actionGroups":{
+          "shape":"AgentActionGroups",
+          "documentation":"<p> A list of action groups with each action group defining the action the inline agent needs to carry out. </p>"
         },
         "knowledgeBases":{
           "shape":"KnowledgeBases",
           "documentation":"<p> Contains information of the knowledge bases to associate with. </p>"
         },
-        "orchestrationType":{
-          "shape":"OrchestrationType",
-          "documentation":"<p>Specifies the type of orchestration strategy for the agent. This is set to DEFAULT orchestration type, by default. </p>"
-        },
-        "promptCreationConfigurations":{
-          "shape":"PromptCreationConfigurations",
-          "documentation":"<p>Specifies parameters that control how the service populates the agent prompt for an <code>InvokeInlineAgent</code> request. You can control which aspects of previous invocations in the same agent session the service uses to populate the agent prompt. This gives you more granular control over the contextual history that is used to process the current request.</p>"
+        "guardrailConfiguration":{
+          "shape":"GuardrailConfigurationWithArn",
+          "documentation":"<p> The <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/guardrails.html\">guardrails</a> to assign to the inline agent. </p>"
         },
         "promptOverrideConfiguration":{
           "shape":"PromptOverrideConfiguration",
           "documentation":"<p> Configurations for advanced prompts used to override the default prompts to enhance the accuracy of the inline agent. </p>"
         },
+        "agentCollaboration":{
+          "shape":"AgentCollaboration",
+          "documentation":"<p> Defines how the inline collaborator agent handles information across multiple collaborator agents to coordinate a final response. The inline collaborator agent can also be the supervisor. </p>"
+        },
+        "collaboratorConfigurations":{
+          "shape":"CollaboratorConfigurations",
+          "documentation":"<p> Settings for an inline agent collaborator called with <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeInlineAgent.html\">InvokeInlineAgent</a>. </p>"
+        },
+        "agentName":{
+          "shape":"Name",
+          "documentation":"<p>The name for the agent.</p>"
+        },
         "sessionId":{
           "shape":"SessionId",
           "documentation":"<p> The unique identifier of the session. Use the same value across requests to continue the same conversation. </p>",
           "location":"uri",
           "locationName":"sessionId"
         },
+        "endSession":{
+          "shape":"Boolean",
+          "documentation":"<p> Specifies whether to end the session with the inline agent or not. </p>"
+        },
+        "enableTrace":{
+          "shape":"Boolean",
+          "documentation":"<p> Specifies whether to turn on the trace or not to track the agent's reasoning process. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/trace-events.html\">Using trace</a>. </p>"
+        },
+        "inputText":{
+          "shape":"InputText",
+          "documentation":"<p> The prompt text to send to the agent. </p> <note> <p>If you include <code>returnControlInvocationResults</code> in the <code>sessionState</code> field, the <code>inputText</code> field will be ignored.</p> </note>"
+        },
         "streamingConfigurations":{
           "shape":"StreamingConfigurations",
           "documentation":"<p> Specifies the configurations for streaming. </p> <note> <p>To use agent streaming, you need permissions to perform the <code>bedrock:InvokeModelWithResponseStream</code> action.</p> </note>"
+        },
+        "promptCreationConfigurations":{
+          "shape":"PromptCreationConfigurations",
+          "documentation":"<p>Specifies parameters that control how the service populates the agent prompt for an <code>InvokeInlineAgent</code> request. You can control which aspects of previous invocations in the same agent session the service uses to populate the agent prompt. This gives you more granular control over the contextual history that is used to process the current request.</p>"
+        },
+        "inlineSessionState":{
+          "shape":"InlineSessionState",
+          "documentation":"<p> Parameters that specify the various attributes of a sessions. You can include attributes for the session or prompt or, if you configured an action group to return control, results from invocation of the action group. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html\">Control session context</a>. </p> <note> <p>If you include <code>returnControlInvocationResults</code> in the <code>sessionState</code> field, the <code>inputText</code> field will be ignored.</p> </note>"
+        },
+        "collaborators":{
+          "shape":"Collaborators",
+          "documentation":"<p> List of collaborator inline agents. </p>"
+        },
+        "bedrockModelConfigurations":{
+          "shape":"InlineBedrockModelConfigurations",
+          "documentation":"<p>Model settings for the request.</p>"
+        },
+        "orchestrationType":{
+          "shape":"OrchestrationType",
+          "documentation":"<p>Specifies the type of orchestration strategy for the agent. This is set to DEFAULT orchestration type, by default. </p>"
+        },
+        "customOrchestration":{
+          "shape":"CustomOrchestration",
+          "documentation":"<p>Contains details of the custom orchestration configured for the agent. </p>"
         }
       }
     },
@@ -4559,23 +4753,23 @@
       "type":"string",
       "max":2048,
       "min":1,
-      "pattern":"^arn:aws(|-cn|-us-gov):kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}$"
+      "pattern":"arn:aws(|-cn|-us-gov):kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}"
     },
     "KnowledgeBase":{
       "type":"structure",
       "required":[
-        "description",
-        "knowledgeBaseId"
+        "knowledgeBaseId",
+        "description"
       ],
       "members":{
-        "description":{
-          "shape":"ResourceDescription",
-          "documentation":"<p> The description of the knowledge base associated with the inline agent. </p>"
-        },
         "knowledgeBaseId":{
           "shape":"KnowledgeBaseId",
           "documentation":"<p> The unique identifier for a knowledge base associated with the inline agent. </p>"
         },
+        "description":{
+          "shape":"ResourceDescription",
+          "documentation":"<p> The description of the knowledge base associated with the inline agent. </p>"
+        },
         "retrievalConfiguration":{
           "shape":"KnowledgeBaseRetrievalConfiguration",
           "documentation":"<p> The configurations to apply to the knowledge base during query. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html\">Query configurations</a>. </p>"
@@ -4587,7 +4781,7 @@
       "type":"string",
       "max":128,
       "min":0,
-      "pattern":"^arn:aws(|-cn|-us-gov):bedrock:[a-zA-Z0-9-]*:[0-9]{12}:knowledge-base/[0-9a-zA-Z]+$"
+      "pattern":"arn:aws(|-cn|-us-gov):bedrock:[a-zA-Z0-9-]*:[0-9]{12}:knowledge-base/[0-9a-zA-Z]+"
     },
     "KnowledgeBaseConfiguration":{
       "type":"structure",
@@ -4616,18 +4810,18 @@
       "type":"string",
       "max":10,
       "min":0,
-      "pattern":"^[0-9a-zA-Z]+$"
+      "pattern":"[0-9a-zA-Z]+"
     },
     "KnowledgeBaseLookupInput":{
       "type":"structure",
       "members":{
-        "knowledgeBaseId":{
-          "shape":"TraceKnowledgeBaseId",
-          "documentation":"<p>The unique identifier of the knowledge base to look up.</p>"
-        },
         "text":{
           "shape":"KnowledgeBaseLookupInputString",
           "documentation":"<p>The query made to the knowledge base.</p>"
+        },
+        "knowledgeBaseId":{
+          "shape":"TraceKnowledgeBaseId",
+          "documentation":"<p>The unique identifier of the knowledge base to look up.</p>"
         }
       },
       "documentation":"<p>Contains details about the knowledge base to look up and the query to be made.</p>"
@@ -4639,13 +4833,13 @@
     "KnowledgeBaseLookupOutput":{
       "type":"structure",
       "members":{
-        "metadata":{
-          "shape":"Metadata",
-          "documentation":"<p>Contains information about the knowledge base output.</p>"
-        },
         "retrievedReferences":{
           "shape":"RetrievedReferences",
           "documentation":"<p>Contains metadata about the sources cited for the generated response.</p>"
+        },
+        "metadata":{
+          "shape":"Metadata",
+          "documentation":"<p>Contains information about the knowledge base output.</p>"
         }
       },
       "documentation":"<p>Contains details about the results from looking up the knowledge base.</p>"
@@ -4690,13 +4884,13 @@
           "shape":"RetrievalResultLocation",
           "documentation":"<p>Contains information about the location of the data source.</p>"
         },
-        "metadata":{
-          "shape":"RetrievalResultMetadata",
-          "documentation":"<p>Contains metadata attributes and their values for the file in the data source. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/knowledge-base-ds.html#kb-ds-metadata\">Metadata and filtering</a>.</p>"
-        },
         "score":{
           "shape":"Double",
           "documentation":"<p>The level of relevance of the result to the query.</p>"
+        },
+        "metadata":{
+          "shape":"RetrievalResultMetadata",
+          "documentation":"<p>Contains metadata attributes and their values for the file in the data source. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/knowledge-base-ds.html#kb-ds-metadata\">Metadata and filtering</a>.</p>"
         }
       },
       "documentation":"<p>Details about a result from querying the knowledge base.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_ResponseSyntax\">Retrieve response</a> – in the <code>retrievalResults</code> field</p> </li> </ul>"
@@ -4713,10 +4907,6 @@
         "modelArn"
       ],
       "members":{
-        "generationConfiguration":{
-          "shape":"GenerationConfiguration",
-          "documentation":"<p>Contains configurations for response generation based on the knowledge base query results.</p>"
-        },
         "knowledgeBaseId":{
           "shape":"KnowledgeBaseId",
           "documentation":"<p>The unique identifier of the knowledge base that is queried.</p>"
@@ -4725,13 +4915,17 @@
           "shape":"BedrockModelArn",
           "documentation":"<p>The ARN of the foundation model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> used to generate a response.</p>"
         },
-        "orchestrationConfiguration":{
-          "shape":"OrchestrationConfiguration",
-          "documentation":"<p>Settings for how the model processes the prompt prior to retrieval and generation.</p>"
-        },
         "retrievalConfiguration":{
           "shape":"KnowledgeBaseRetrievalConfiguration",
           "documentation":"<p>Contains configurations for how to retrieve and return the knowledge base query.</p>"
+        },
+        "generationConfiguration":{
+          "shape":"GenerationConfiguration",
+          "documentation":"<p>Contains configurations for response generation based on the knowledge base query results.</p>"
+        },
+        "orchestrationConfiguration":{
+          "shape":"OrchestrationConfiguration",
+          "documentation":"<p>Settings for how the model processes the prompt prior to retrieval and generation.</p>"
         }
       },
       "documentation":"<p>Contains details about the resource being queried.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_RequestSyntax\">Retrieve request</a> – in the <code>knowledgeBaseConfiguration</code> field</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_RequestSyntax\">RetrieveAndGenerate request</a> – in the <code>knowledgeBaseConfiguration</code> field</p> </li> </ul>"
@@ -4739,14 +4933,6 @@
     "KnowledgeBaseVectorSearchConfiguration":{
       "type":"structure",
       "members":{
-        "filter":{
-          "shape":"RetrievalFilter",
-          "documentation":"<p>Specifies the filters to use on the metadata in the knowledge base data sources before returning results. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html\">Query configurations</a>.</p>"
-        },
-        "implicitFilterConfiguration":{
-          "shape":"ImplicitFilterConfiguration",
-          "documentation":"<p>Settings for implicit filtering.</p>"
-        },
         "numberOfResults":{
           "shape":"KnowledgeBaseVectorSearchConfigurationNumberOfResultsInteger",
           "documentation":"<p>The number of source chunks to retrieve.</p>",
@@ -4756,9 +4942,17 @@
           "shape":"SearchType",
           "documentation":"<p>By default, Amazon Bedrock decides a search strategy for you. If you're using an Amazon OpenSearch Serverless vector store that contains a filterable text field, you can specify whether to query the knowledge base with a <code>HYBRID</code> search using both vector embeddings and raw text, or <code>SEMANTIC</code> search using only vector embeddings. For other vector store configurations, only <code>SEMANTIC</code> search is available. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/knowledge-base-test.html\">Test a knowledge base</a>.</p>"
         },
+        "filter":{
+          "shape":"RetrievalFilter",
+          "documentation":"<p>Specifies the filters to use on the metadata in the knowledge base data sources before returning results. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html\">Query configurations</a>.</p>"
+        },
         "rerankingConfiguration":{
           "shape":"VectorSearchRerankingConfiguration",
           "documentation":"<p>Contains configurations for reranking the retrieved results. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/rerank.html\">Improve the relevance of query responses with a reranker model</a>.</p>"
+        },
+        "implicitFilterConfiguration":{
+          "shape":"ImplicitFilterConfiguration",
+          "documentation":"<p>Settings for implicit filtering.</p>"
         }
       },
       "documentation":"<p>Configurations for how to perform the search query and return results. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html\">Query configurations</a>.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_RequestSyntax\">Retrieve request</a> – in the <code>vectorSearchConfiguration</code> field</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_RequestSyntax\">RetrieveAndGenerate request</a> – in the <code>vectorSearchConfiguration</code> field</p> </li> </ul>"
@@ -4778,28 +4972,22 @@
       "type":"string",
       "max":2048,
       "min":0,
-      "pattern":"^arn:(aws[a-zA-Z-]*)?:lambda:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:function:[a-zA-Z0-9-_\\.]+(:(\\$LATEST|[a-zA-Z0-9-_]+))?$"
+      "pattern":"arn:(aws[a-zA-Z-]*)?:lambda:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:function:[a-zA-Z0-9-_\\.]+(:(\\$LATEST|[a-zA-Z0-9-_]+))?"
     },
     "ListFlowExecutionEventsRequest":{
       "type":"structure",
       "required":[
-        "eventType",
-        "executionIdentifier",
+        "flowIdentifier",
         "flowAliasIdentifier",
-        "flowIdentifier"
+        "executionIdentifier",
+        "eventType"
       ],
       "members":{
-        "eventType":{
-          "shape":"FlowExecutionEventType",
-          "documentation":"<p>The type of events to retrieve. Specify <code>Node</code> for node-level events or <code>Flow</code> for flow-level events.</p>",
-          "location":"querystring",
-          "locationName":"eventType"
-        },
-        "executionIdentifier":{
-          "shape":"FlowExecutionIdentifier",
-          "documentation":"<p>The unique identifier of the flow execution.</p>",
+        "flowIdentifier":{
+          "shape":"FlowIdentifier",
+          "documentation":"<p>The unique identifier of the flow.</p>",
           "location":"uri",
-          "locationName":"executionIdentifier"
+          "locationName":"flowIdentifier"
         },
         "flowAliasIdentifier":{
           "shape":"FlowAliasIdentifier",
@@ -4807,11 +4995,11 @@
           "location":"uri",
           "locationName":"flowAliasIdentifier"
         },
-        "flowIdentifier":{
-          "shape":"FlowIdentifier",
-          "documentation":"<p>The unique identifier of the flow.</p>",
+        "executionIdentifier":{
+          "shape":"FlowExecutionIdentifier",
+          "documentation":"<p>The unique identifier of the flow execution.</p>",
           "location":"uri",
-          "locationName":"flowIdentifier"
+          "locationName":"executionIdentifier"
         },
         "maxResults":{
           "shape":"MaxResults",
@@ -4824,6 +5012,12 @@
           "documentation":"<p>A token to retrieve the next set of results. This value is returned in the response if more results are available.</p>",
           "location":"querystring",
           "locationName":"nextToken"
+        },
+        "eventType":{
+          "shape":"FlowExecutionEventType",
+          "documentation":"<p>The type of events to retrieve. Specify <code>Node</code> for node-level events or <code>Flow</code> for flow-level events.</p>",
+          "location":"querystring",
+          "locationName":"eventType"
         }
       }
     },
@@ -4845,18 +5039,18 @@
       "type":"structure",
       "required":["flowIdentifier"],
       "members":{
-        "flowAliasIdentifier":{
-          "shape":"FlowAliasIdentifier",
-          "documentation":"<p>The unique identifier of the flow alias to list executions for.</p>",
-          "location":"querystring",
-          "locationName":"flowAliasIdentifier"
-        },
         "flowIdentifier":{
           "shape":"FlowIdentifier",
           "documentation":"<p>The unique identifier of the flow to list executions for.</p>",
           "location":"uri",
           "locationName":"flowIdentifier"
         },
+        "flowAliasIdentifier":{
+          "shape":"FlowAliasIdentifier",
+          "documentation":"<p>The unique identifier of the flow alias to list executions for.</p>",
+          "location":"querystring",
+          "locationName":"flowAliasIdentifier"
+        },
         "maxResults":{
           "shape":"MaxResults",
           "documentation":"<p>The maximum number of flow executions to return in a single response. If more executions exist than the specified <code>maxResults</code> value, a token is included in the response so that the remaining results can be retrieved.</p>",
@@ -4893,18 +5087,18 @@
           "shape":"InvocationIdentifier",
           "documentation":"<p>The unique identifier (in UUID format) for the invocation to list invocation steps for.</p>"
         },
-        "maxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return in the response. If the total number of results is greater than this value, use the token returned in the response in the <code>nextToken</code> field when making another request to return the next batch of results.</p>",
-          "location":"querystring",
-          "locationName":"maxResults"
-        },
         "nextToken":{
           "shape":"NextToken",
           "documentation":"<p>If the total number of results is greater than the <code>maxResults</code> value provided in the request, enter the token returned in the <code>nextToken</code> field in the response in this field to return the next batch of results. </p>",
           "location":"querystring",
           "locationName":"nextToken"
         },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return in the response. If the total number of results is greater than this value, use the token returned in the response in the <code>nextToken</code> field when making another request to return the next batch of results.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
         "sessionIdentifier":{
           "shape":"SessionIdentifier",
           "documentation":"<p>The unique identifier for the session associated with the invocation steps. You can specify either the session's <code>sessionId</code> or its Amazon Resource Name (ARN).</p>",
@@ -4931,18 +5125,18 @@
       "type":"structure",
       "required":["sessionIdentifier"],
       "members":{
-        "maxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return in the response. If the total number of results is greater than this value, use the token returned in the response in the <code>nextToken</code> field when making another request to return the next batch of results.</p>",
-          "location":"querystring",
-          "locationName":"maxResults"
-        },
         "nextToken":{
           "shape":"NextToken",
           "documentation":"<p>If the total number of results is greater than the <code>maxResults</code> value provided in the request, enter the token returned in the <code>nextToken</code> field in the response in this field to return the next batch of results. </p>",
           "location":"querystring",
           "locationName":"nextToken"
         },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return in the response. If the total number of results is greater than this value, use the token returned in the response in the <code>nextToken</code> field when making another request to return the next batch of results.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
         "sessionIdentifier":{
           "shape":"SessionIdentifier",
           "documentation":"<p>The unique identifier for the session to list invocations for. You can specify either the session's <code>sessionId</code> or its Amazon Resource Name (ARN).</p>",
@@ -4986,13 +5180,13 @@
       "type":"structure",
       "required":["sessionSummaries"],
       "members":{
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>If the total number of results is greater than the <code>maxResults</code> value provided in the request, use this token when making another request in the <code>nextToken</code> field to return the next batch of results.</p>"
-        },
         "sessionSummaries":{
           "shape":"SessionSummaries",
           "documentation":"<p>A list of summaries for each session in your Amazon Web Services account.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the total number of results is greater than the <code>maxResults</code> value provided in the request, use this token when making another request in the <code>nextToken</code> field to return the next batch of results.</p>"
         }
       }
     },
@@ -5059,7 +5253,7 @@
       "type":"string",
       "max":100,
       "min":2,
-      "pattern":"^[0-9a-zA-Z._:-]+$"
+      "pattern":"[0-9a-zA-Z._:-]+"
     },
     "MemorySessionSummary":{
       "type":"structure",
@@ -5068,10 +5262,6 @@
           "shape":"MemoryId",
           "documentation":"<p>The unique identifier of the memory where the session summary is stored.</p>"
         },
-        "sessionExpiryTime":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The time when the memory duration for the session is set to end.</p>"
-        },
         "sessionId":{
           "shape":"SessionId",
           "documentation":"<p>The identifier for this session.</p>"
@@ -5080,6 +5270,10 @@
           "shape":"DateTimestamp",
           "documentation":"<p>The start time for this session.</p>"
         },
+        "sessionExpiryTime":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The time when the memory duration for the session is set to end.</p>"
+        },
         "summaryText":{
           "shape":"SummaryText",
           "documentation":"<p>The summarized text for this session.</p>"
@@ -5094,17 +5288,17 @@
     "Message":{
       "type":"structure",
       "required":[
-        "content",
-        "role"
+        "role",
+        "content"
       ],
       "members":{
-        "content":{
-          "shape":"ContentBlocks",
-          "documentation":"<p>The message's content.</p>"
-        },
         "role":{
           "shape":"ConversationRole",
           "documentation":"<p>The message's role.</p>"
+        },
+        "content":{
+          "shape":"ContentBlocks",
+          "documentation":"<p>The message's content.</p>"
         }
       },
       "documentation":"<p>Details about a message.</p>"
@@ -5116,25 +5310,25 @@
     "Metadata":{
       "type":"structure",
       "members":{
-        "clientRequestId":{
-          "shape":"String",
-          "documentation":"<p>A unique identifier associated with the downstream invocation. This ID can be used for tracing, debugging, and identifying specific invocations in customer logs or systems.</p>"
+        "startTime":{
+          "shape":"SyntheticTimestamp_date_time",
+          "documentation":"<p>In the final response, <code>startTime</code> is the start time of the agent invocation operation.</p>"
         },
         "endTime":{
           "shape":"SyntheticTimestamp_date_time",
           "documentation":"<p>In the final response, <code>endTime</code> is the end time of the agent invocation operation.</p>"
         },
+        "totalTimeMs":{
+          "shape":"Long",
+          "documentation":"<p> The total execution time for the specific invocation being processed (model, knowledge base, guardrail, agent collaborator, or code interpreter). It represents how long the individual invocation took.</p>"
+        },
         "operationTotalTimeMs":{
           "shape":"Long",
           "documentation":"<p>The total time it took for the agent to complete execution. This field is only set for the final response.</p>"
         },
-        "startTime":{
-          "shape":"SyntheticTimestamp_date_time",
-          "documentation":"<p>In the final response, <code>startTime</code> is the start time of the agent invocation operation.</p>"
-        },
-        "totalTimeMs":{
-          "shape":"Long",
-          "documentation":"<p> The total execution time for the specific invocation being processed (model, knowledge base, guardrail, agent collaborator, or code interpreter). It represents how long the individual invocation took.</p>"
+        "clientRequestId":{
+          "shape":"String",
+          "documentation":"<p>A unique identifier associated with the downstream invocation. This ID can be used for tracing, debugging, and identifying specific invocations in customer logs or systems.</p>"
         },
         "usage":{
           "shape":"Usage",
@@ -5147,15 +5341,11 @@
     "MetadataAttributeSchema":{
       "type":"structure",
       "required":[
-        "description",
         "key",
-        "type"
+        "type",
+        "description"
       ],
       "members":{
-        "description":{
-          "shape":"MetadataAttributeSchemaDescriptionString",
-          "documentation":"<p>The attribute's description.</p>"
-        },
         "key":{
           "shape":"MetadataAttributeSchemaKeyString",
           "documentation":"<p>The attribute's key.</p>"
@@ -5163,6 +5353,10 @@
         "type":{
           "shape":"AttributeType",
           "documentation":"<p>The attribute's type.</p>"
+        },
+        "description":{
+          "shape":"MetadataAttributeSchemaDescriptionString",
+          "documentation":"<p>The attribute's description.</p>"
         }
       },
       "documentation":"<p>Details about a metadata attribute.</p>",
@@ -5172,13 +5366,13 @@
       "type":"string",
       "max":1024,
       "min":1,
-      "pattern":"^[\\s\\S]+$"
+      "pattern":"[\\s\\S]+"
     },
     "MetadataAttributeSchemaKeyString":{
       "type":"string",
       "max":256,
       "min":1,
-      "pattern":"^[\\s\\S]+$"
+      "pattern":"[\\s\\S]+"
     },
     "MetadataAttributeSchemaList":{
       "type":"list",
@@ -5206,42 +5400,42 @@
       "type":"string",
       "max":2048,
       "min":1,
-      "pattern":"(^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}(([:][a-z0-9-]{1,63}){0,2})?/[a-z0-9]{12})|(:foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})))|(([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2}))|(([0-9a-zA-Z][_-]?)+))$|(^arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)$"
+      "pattern":".*(^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}(([:][a-z0-9-]{1,63}){0,2})?/[a-z0-9]{12})|(:foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})))|(([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2}))|(([0-9a-zA-Z][_-]?)+))$|(^arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):inference-profile/[a-zA-Z0-9-:.]+)"
     },
     "ModelInvocationInput":{
       "type":"structure",
       "members":{
-        "foundationModel":{
-          "shape":"ModelIdentifier",
-          "documentation":"<p>The identifier of a foundation model.</p>"
+        "traceId":{
+          "shape":"TraceId",
+          "documentation":"<p>The unique identifier of the trace.</p>"
         },
-        "inferenceConfiguration":{
-          "shape":"InferenceConfiguration",
-          "documentation":"<p>Specifications about the inference parameters that were provided alongside the prompt. These are specified in the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_PromptOverrideConfiguration.html\">PromptOverrideConfiguration</a> object that was set when the agent was created or updated. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html\">Inference parameters for foundation models</a>.</p>"
+        "text":{
+          "shape":"PromptText",
+          "documentation":"<p>The text that prompted the agent at this step.</p>"
+        },
+        "type":{
+          "shape":"PromptType",
+          "documentation":"<p>The step in the agent sequence.</p>"
         },
         "overrideLambda":{
           "shape":"LambdaArn",
           "documentation":"<p>The ARN of the Lambda function to use when parsing the raw foundation model output in parts of the agent sequence.</p>"
         },
-        "parserMode":{
-          "shape":"CreationMode",
-          "documentation":"<p>Specifies whether to override the default parser Lambda function when parsing the raw foundation model output in the part of the agent sequence defined by the <code>promptType</code>.</p>"
-        },
         "promptCreationMode":{
           "shape":"CreationMode",
           "documentation":"<p>Specifies whether the default prompt template was <code>OVERRIDDEN</code>. If it was, the <code>basePromptTemplate</code> that was set in the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_PromptOverrideConfiguration.html\">PromptOverrideConfiguration</a> object when the agent was created or updated is used instead.</p>"
         },
-        "text":{
-          "shape":"PromptText",
-          "documentation":"<p>The text that prompted the agent at this step.</p>"
+        "inferenceConfiguration":{
+          "shape":"InferenceConfiguration",
+          "documentation":"<p>Specifications about the inference parameters that were provided alongside the prompt. These are specified in the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_PromptOverrideConfiguration.html\">PromptOverrideConfiguration</a> object that was set when the agent was created or updated. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html\">Inference parameters for foundation models</a>.</p>"
         },
-        "traceId":{
-          "shape":"TraceId",
-          "documentation":"<p>The unique identifier of the trace.</p>"
+        "parserMode":{
+          "shape":"CreationMode",
+          "documentation":"<p>Specifies whether to override the default parser Lambda function when parsing the raw foundation model output in the part of the agent sequence defined by the <code>promptType</code>.</p>"
         },
-        "type":{
-          "shape":"PromptType",
-          "documentation":"<p>The step in the agent sequence.</p>"
+        "foundationModel":{
+          "shape":"ModelIdentifier",
+          "documentation":"<p>The identifier of a foundation model.</p>"
         }
       },
       "documentation":"<p>The input for the pre-processing step.</p> <ul> <li> <p>The <code>type</code> matches the agent step.</p> </li> <li> <p>The <code>text</code> contains the prompt.</p> </li> <li> <p>The <code>inferenceConfiguration</code>, <code>parserMode</code>, and <code>overrideLambda</code> values are set in the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_PromptOverrideConfiguration.html\">PromptOverrideConfiguration</a> object that was set when the agent was created or updated.</p> </li> </ul>",
@@ -5271,14 +5465,80 @@
     },
     "Name":{
       "type":"string",
-      "pattern":"^([0-9a-zA-Z][_-]?){1,100}$",
+      "pattern":"([0-9a-zA-Z][_-]?){1,100}",
       "sensitive":true
     },
     "NextToken":{
       "type":"string",
       "max":2048,
       "min":1,
-      "pattern":"^\\S*$"
+      "pattern":"\\S*"
+    },
+    "NodeActionEvent":{
+      "type":"structure",
+      "required":[
+        "nodeName",
+        "timestamp",
+        "requestId",
+        "serviceName",
+        "operationName"
+      ],
+      "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the node that called the operation.</p>"
+        },
+        "timestamp":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The date and time that the operation was called.</p>"
+        },
+        "requestId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the request that the node made to the operation.</p>"
+        },
+        "serviceName":{
+          "shape":"String",
+          "documentation":"<p>The name of the service that the node called.</p>"
+        },
+        "operationName":{
+          "shape":"String",
+          "documentation":"<p>The name of the operation that the node called.</p>"
+        },
+        "operationRequest":{
+          "shape":"Document",
+          "documentation":"<p>The request payload sent to the downstream service.</p>"
+        },
+        "operationResponse":{
+          "shape":"Document",
+          "documentation":"<p>The response payload received from the downstream service.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about an action (operation) called by a node during execution.</p>",
+      "sensitive":true
+    },
+    "NodeDependencyEvent":{
+      "type":"structure",
+      "required":[
+        "nodeName",
+        "timestamp",
+        "traceElements"
+      ],
+      "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the node that generated the dependency trace.</p>"
+        },
+        "timestamp":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The date and time that the dependency trace was generated.</p>"
+        },
+        "traceElements":{
+          "shape":"NodeTraceElements",
+          "documentation":"<p>The trace elements containing detailed information about the node execution.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about an internal trace of a specific node during execution.</p>",
+      "sensitive":true
     },
     "NodeErrorCode":{
       "type":"string",
@@ -5304,12 +5564,20 @@
     "NodeFailureEvent":{
       "type":"structure",
       "required":[
-        "errorCode",
-        "errorMessage",
         "nodeName",
-        "timestamp"
+        "timestamp",
+        "errorCode",
+        "errorMessage"
       ],
       "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the node where the failure occurred.</p>"
+        },
+        "timestamp":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp when the node failure occurred.</p>"
+        },
         "errorCode":{
           "shape":"NodeErrorCode",
           "documentation":"<p>The error code that identifies the type of failure that occurred at the node.</p>"
@@ -5317,57 +5585,91 @@
         "errorMessage":{
           "shape":"String",
           "documentation":"<p>A descriptive message that provides details about the node failure.</p>"
-        },
+        }
+      },
+      "documentation":"<p>Contains information about a failure that occurred at a specific node during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
+      "sensitive":true
+    },
+    "NodeInputEvent":{
+      "type":"structure",
+      "required":[
+        "nodeName",
+        "timestamp",
+        "fields"
+      ],
+      "members":{
         "nodeName":{
           "shape":"NodeName",
-          "documentation":"<p>The name of the node where the failure occurred.</p>"
+          "documentation":"<p>The name of the node that received the inputs.</p>"
         },
         "timestamp":{
           "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the node failure occurred.</p>"
+          "documentation":"<p>The timestamp when the inputs were provided to the node.</p>"
+        },
+        "fields":{
+          "shape":"NodeInputFields",
+          "documentation":"<p>A list of input fields provided to the node.</p>"
         }
       },
-      "documentation":"<p>Contains information about a failure that occurred at a specific node during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
+      "documentation":"<p>Contains information about the inputs provided to a specific node during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
       "sensitive":true
     },
-    "NodeInputEvent":{
+    "NodeInputExecutionChain":{
+      "type":"list",
+      "member":{"shape":"NodeInputExecutionChainItem"}
+    },
+    "NodeInputExecutionChainItem":{
       "type":"structure",
       "required":[
-        "fields",
         "nodeName",
-        "timestamp"
+        "type"
       ],
       "members":{
-        "fields":{
-          "shape":"NodeInputFields",
-          "documentation":"<p>A list of input fields provided to the node.</p>"
-        },
         "nodeName":{
           "shape":"NodeName",
-          "documentation":"<p>The name of the node that received the inputs.</p>"
+          "documentation":"<p>The name of the node in the execution chain.</p>"
         },
-        "timestamp":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp when the inputs were provided to the node.</p>"
+        "index":{
+          "shape":"Integer",
+          "documentation":"<p>The index position of this item in the execution chain.</p>"
+        },
+        "type":{
+          "shape":"FlowControlNodeType",
+          "documentation":"<p>The type of execution chain item. Supported values are Iterator and Loop.</p>"
         }
       },
-      "documentation":"<p>Contains information about the inputs provided to a specific node during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
-      "sensitive":true
+      "documentation":"<p>Represents an item in the execution chain for node input tracking.</p>"
     },
     "NodeInputField":{
       "type":"structure",
       "required":[
-        "content",
-        "name"
+        "name",
+        "content"
       ],
       "members":{
+        "name":{
+          "shape":"NodeInputName",
+          "documentation":"<p>The name of the input field as defined in the node's input schema.</p>"
+        },
         "content":{
           "shape":"NodeExecutionContent",
           "documentation":"<p>The content of the input field, which can contain text or structured data.</p>"
         },
-        "name":{
-          "shape":"NodeInputName",
-          "documentation":"<p>The name of the input field as defined in the node's input schema.</p>"
+        "source":{
+          "shape":"NodeInputSource",
+          "documentation":"<p>The source node that provides input data to this field.</p>"
+        },
+        "type":{
+          "shape":"FlowNodeIODataType",
+          "documentation":"<p>The data type of the input field for compatibility validation.</p>"
+        },
+        "category":{
+          "shape":"FlowNodeInputCategory",
+          "documentation":"<p>The category of the input field.</p>"
+        },
+        "executionChain":{
+          "shape":"NodeInputExecutionChain",
+          "documentation":"<p>The execution path through nested nodes like iterators and loops.</p>"
         }
       },
       "documentation":"<p>Represents an input field provided to a node during a flow execution.</p>",
@@ -5381,24 +5683,43 @@
     },
     "NodeInputName":{
       "type":"string",
-      "pattern":"^[a-zA-Z]([_]?[0-9a-zA-Z]){0,99}$"
+      "pattern":"[a-zA-Z]([_]?[0-9a-zA-Z]){0,99}"
+    },
+    "NodeInputSource":{
+      "type":"structure",
+      "required":[
+        "nodeName",
+        "outputFieldName",
+        "expression"
+      ],
+      "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the source node that provides the input data.</p>"
+        },
+        "outputFieldName":{
+          "shape":"FlowNodeOutputName",
+          "documentation":"<p>The name of the output field from the source node.</p>"
+        },
+        "expression":{
+          "shape":"FlowNodeInputExpression",
+          "documentation":"<p>The expression used to extract data from the source.</p>"
+        }
+      },
+      "documentation":"<p>Represents the source of input data for a node field.</p>"
     },
     "NodeName":{
       "type":"string",
-      "pattern":"^[a-zA-Z]([_]?[0-9a-zA-Z]){0,99}$"
+      "pattern":"[a-zA-Z]([_]?[0-9a-zA-Z]){0,99}"
     },
     "NodeOutputEvent":{
       "type":"structure",
       "required":[
-        "fields",
         "nodeName",
-        "timestamp"
+        "timestamp",
+        "fields"
       ],
       "members":{
-        "fields":{
-          "shape":"NodeOutputFields",
-          "documentation":"<p>A list of output fields produced by the node.</p>"
-        },
         "nodeName":{
           "shape":"NodeName",
           "documentation":"<p>The name of the node that produced the outputs.</p>"
@@ -5406,6 +5727,10 @@
         "timestamp":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp when the outputs were produced by the node.</p>"
+        },
+        "fields":{
+          "shape":"NodeOutputFields",
+          "documentation":"<p>A list of output fields produced by the node.</p>"
         }
       },
       "documentation":"<p>Contains information about the outputs produced by a specific node during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
@@ -5414,17 +5739,25 @@
     "NodeOutputField":{
       "type":"structure",
       "required":[
-        "content",
-        "name"
+        "name",
+        "content"
       ],
       "members":{
+        "name":{
+          "shape":"NodeOutputName",
+          "documentation":"<p>The name of the output field as defined in the node's output schema.</p>"
+        },
         "content":{
           "shape":"NodeExecutionContent",
           "documentation":"<p>The content of the output field, which can contain text or structured data.</p>"
         },
-        "name":{
-          "shape":"NodeOutputName",
-          "documentation":"<p>The name of the output field as defined in the node's output schema.</p>"
+        "next":{
+          "shape":"NodeOutputNextList",
+          "documentation":"<p>The next node that receives output data from this field.</p>"
+        },
+        "type":{
+          "shape":"FlowNodeIODataType",
+          "documentation":"<p>The data type of the output field for compatibility validation.</p>"
         }
       },
       "documentation":"<p>Represents an output field produced by a node during a flow execution.</p> <note> <p>Flow executions is in preview release for Amazon Bedrock and is subject to change.</p> </note>",
@@ -5438,7 +5771,42 @@
     },
     "NodeOutputName":{
       "type":"string",
-      "pattern":"^[a-zA-Z]([_]?[0-9a-zA-Z]){0,99}$"
+      "pattern":"[a-zA-Z]([_]?[0-9a-zA-Z]){0,99}"
+    },
+    "NodeOutputNext":{
+      "type":"structure",
+      "required":[
+        "nodeName",
+        "inputFieldName"
+      ],
+      "members":{
+        "nodeName":{
+          "shape":"NodeName",
+          "documentation":"<p>The name of the next node that receives the output data.</p>"
+        },
+        "inputFieldName":{
+          "shape":"FlowNodeInputName",
+          "documentation":"<p>The name of the input field in the next node that receives the data.</p>"
+        }
+      },
+      "documentation":"<p>Represents the next node that receives output data.</p>",
+      "sensitive":true
+    },
+    "NodeOutputNextList":{
+      "type":"list",
+      "member":{"shape":"NodeOutputNext"}
+    },
+    "NodeTraceElements":{
+      "type":"structure",
+      "members":{
+        "agentTraces":{
+          "shape":"AgentTraces",
+          "documentation":"<p>Agent trace information for the node execution.</p>"
+        }
+      },
+      "documentation":"<p>Contains trace elements for node execution tracking.</p>",
+      "sensitive":true,
+      "union":true
     },
     "NodeType":{
       "type":"string",
@@ -5454,11 +5822,19 @@
     },
     "NonBlankString":{
       "type":"string",
-      "pattern":"^[\\s\\S]*$"
+      "pattern":"[\\s\\S]*"
     },
     "Observation":{
       "type":"structure",
       "members":{
+        "traceId":{
+          "shape":"TraceId",
+          "documentation":"<p>The unique identifier of the trace.</p>"
+        },
+        "type":{
+          "shape":"Type",
+          "documentation":"<p>Specifies what kind of information the agent returns in the observation. The following values are possible.</p> <ul> <li> <p> <code>ACTION_GROUP</code> – The agent returns the result of an action group.</p> </li> <li> <p> <code>KNOWLEDGE_BASE</code> – The agent returns information from a knowledge base.</p> </li> <li> <p> <code>FINISH</code> – The agent returns a final response to the user with no follow-up.</p> </li> <li> <p> <code>ASK_USER</code> – The agent asks the user a question.</p> </li> <li> <p> <code>REPROMPT</code> – The agent prompts the user again for the same information.</p> </li> </ul>"
+        },
         "actionGroupInvocationOutput":{
           "shape":"ActionGroupInvocationOutput",
           "documentation":"<p>Contains the JSON-formatted string returned by the API invoked by the action group.</p>"
@@ -5467,29 +5843,21 @@
           "shape":"AgentCollaboratorInvocationOutput",
           "documentation":"<p>A collaborator's invocation output.</p>"
         },
-        "codeInterpreterInvocationOutput":{
-          "shape":"CodeInterpreterInvocationOutput",
-          "documentation":"<p>Contains the JSON-formatted string returned by the API invoked by the code interpreter.</p>"
+        "knowledgeBaseLookupOutput":{
+          "shape":"KnowledgeBaseLookupOutput",
+          "documentation":"<p>Contains details about the results from looking up the knowledge base.</p>"
         },
         "finalResponse":{
           "shape":"FinalResponse",
           "documentation":"<p>Contains details about the response to the user.</p>"
         },
-        "knowledgeBaseLookupOutput":{
-          "shape":"KnowledgeBaseLookupOutput",
-          "documentation":"<p>Contains details about the results from looking up the knowledge base.</p>"
-        },
         "repromptResponse":{
           "shape":"RepromptResponse",
           "documentation":"<p>Contains details about the response to reprompt the input.</p>"
         },
-        "traceId":{
-          "shape":"TraceId",
-          "documentation":"<p>The unique identifier of the trace.</p>"
-        },
-        "type":{
-          "shape":"Type",
-          "documentation":"<p>Specifies what kind of information the agent returns in the observation. The following values are possible.</p> <ul> <li> <p> <code>ACTION_GROUP</code> – The agent returns the result of an action group.</p> </li> <li> <p> <code>KNOWLEDGE_BASE</code> – The agent returns information from a knowledge base.</p> </li> <li> <p> <code>FINISH</code> – The agent returns a final response to the user with no follow-up.</p> </li> <li> <p> <code>ASK_USER</code> – The agent asks the user a question.</p> </li> <li> <p> <code>REPROMPT</code> – The agent prompts the user again for the same information.</p> </li> </ul>"
+        "codeInterpreterInvocationOutput":{
+          "shape":"CodeInterpreterInvocationOutput",
+          "documentation":"<p>Contains the JSON-formatted string returned by the API invoked by the code interpreter.</p>"
         }
       },
       "documentation":"<p>Contains the result or output of an action group or knowledge base, or the response to the user.</p>",
@@ -5516,7 +5884,7 @@
       "type":"string",
       "max":2048,
       "min":1,
-      "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$"
+      "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)"
     },
     "OptimizePromptResponse":{
       "type":"structure",
@@ -5555,30 +5923,18 @@
     "OptimizedPromptStream":{
       "type":"structure",
       "members":{
-        "accessDeniedException":{
-          "shape":"AccessDeniedException",
-          "documentation":"<p>The request is denied because of missing access permissions. Check your permissions and retry your request.</p>"
+        "optimizedPromptEvent":{
+          "shape":"OptimizedPromptEvent",
+          "documentation":"<p>An event in which the prompt was optimized.</p>"
         },
         "analyzePromptEvent":{
           "shape":"AnalyzePromptEvent",
           "documentation":"<p>An event in which the prompt was analyzed in preparation for optimization.</p>"
         },
-        "badGatewayException":{
-          "shape":"BadGatewayException",
-          "documentation":"<p>There was an issue with a dependency due to a server issue. Retry your request.</p>"
-        },
-        "dependencyFailedException":{
-          "shape":"DependencyFailedException",
-          "documentation":"<p>There was an issue with a dependency. Check the resource configurations and retry the request.</p>"
-        },
         "internalServerException":{
           "shape":"InternalServerException",
           "documentation":"<p>An internal server error occurred. Retry your request.</p>"
         },
-        "optimizedPromptEvent":{
-          "shape":"OptimizedPromptEvent",
-          "documentation":"<p>An event in which the prompt was optimized.</p>"
-        },
         "throttlingException":{
           "shape":"ThrottlingException",
           "documentation":"<p>Your request was throttled because of service-wide limitations. Resubmit your request later or in a different region. You can also purchase <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prov-throughput.html\">Provisioned Throughput</a> to increase the rate or number of tokens you can process.</p>"
@@ -5586,6 +5942,18 @@
         "validationException":{
           "shape":"ValidationException",
           "documentation":"<p>Input validation failed. Check your request parameters and retry the request.</p>"
+        },
+        "dependencyFailedException":{
+          "shape":"DependencyFailedException",
+          "documentation":"<p>There was an issue with a dependency. Check the resource configurations and retry the request.</p>"
+        },
+        "accessDeniedException":{
+          "shape":"AccessDeniedException",
+          "documentation":"<p>The request is denied because of missing access permissions. Check your permissions and retry your request.</p>"
+        },
+        "badGatewayException":{
+          "shape":"BadGatewayException",
+          "documentation":"<p>There was an issue with a dependency due to a server issue. Retry your request.</p>"
         }
       },
       "documentation":"<p>The stream containing events in the prompt optimization process.</p>",
@@ -5594,25 +5962,25 @@
     "OrchestrationConfiguration":{
       "type":"structure",
       "members":{
-        "additionalModelRequestFields":{
-          "shape":"AdditionalModelRequestFields",
-          "documentation":"<p> Additional model parameters and corresponding values not included in the textInferenceConfig structure for a knowledge base. This allows users to provide custom model parameters specific to the language model being used. </p>"
+        "promptTemplate":{
+          "shape":"PromptTemplate",
+          "documentation":"<p>Contains the template for the prompt that's sent to the model. Orchestration prompts must include the <code>$conversation_history$</code> and <code>$output_format_instructions$</code> variables. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-placeholders.html\">Use placeholder variables</a> in the user guide.</p>"
         },
         "inferenceConfig":{
           "shape":"InferenceConfig",
           "documentation":"<p> Configuration settings for inference when using RetrieveAndGenerate to generate responses while using a knowledge base as a source. </p>"
         },
-        "performanceConfig":{
-          "shape":"PerformanceConfiguration",
-          "documentation":"<p>The latency configuration for the model.</p>"
-        },
-        "promptTemplate":{
-          "shape":"PromptTemplate",
-          "documentation":"<p>Contains the template for the prompt that's sent to the model. Orchestration prompts must include the <code>$conversation_history$</code> and <code>$output_format_instructions$</code> variables. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-placeholders.html\">Use placeholder variables</a> in the user guide.</p>"
+        "additionalModelRequestFields":{
+          "shape":"AdditionalModelRequestFields",
+          "documentation":"<p> Additional model parameters and corresponding values not included in the textInferenceConfig structure for a knowledge base. This allows users to provide custom model parameters specific to the language model being used. </p>"
         },
         "queryTransformationConfiguration":{
           "shape":"QueryTransformationConfiguration",
           "documentation":"<p>To split up the prompt and retrieve multiple sources, set the transformation type to <code>QUERY_DECOMPOSITION</code>.</p>"
+        },
+        "performanceConfig":{
+          "shape":"PerformanceConfiguration",
+          "documentation":"<p>The latency configuration for the model.</p>"
         }
       },
       "documentation":"<p>Settings for how the model processes the prompt prior to retrieval and generation.</p>"
@@ -5631,21 +5999,21 @@
     "OrchestrationModelInvocationOutput":{
       "type":"structure",
       "members":{
-        "metadata":{
-          "shape":"Metadata",
-          "documentation":"<p>Contains information about the foundation model output from the orchestration step.</p>"
+        "traceId":{
+          "shape":"TraceId",
+          "documentation":"<p>The unique identifier of the trace.</p>"
         },
         "rawResponse":{
           "shape":"RawResponse",
           "documentation":"<p>Contains details of the raw response from the foundation model output.</p>"
         },
+        "metadata":{
+          "shape":"Metadata",
+          "documentation":"<p>Contains information about the foundation model output from the orchestration step.</p>"
+        },
         "reasoningContent":{
           "shape":"ReasoningContentBlock",
           "documentation":"<p>Contains content about the reasoning that the model made during the orchestration step. </p>"
-        },
-        "traceId":{
-          "shape":"TraceId",
-          "documentation":"<p>The unique identifier of the trace.</p>"
         }
       },
       "documentation":"<p>The foundation model output from the orchestration step.</p>",
@@ -5654,10 +6022,18 @@
     "OrchestrationTrace":{
       "type":"structure",
       "members":{
+        "rationale":{
+          "shape":"Rationale",
+          "documentation":"<p>Details about the reasoning, based on the input, that the agent uses to justify carrying out an action group or getting information from a knowledge base.</p>"
+        },
         "invocationInput":{
           "shape":"InvocationInput",
           "documentation":"<p>Contains information pertaining to the action group or knowledge base that is being invoked.</p>"
         },
+        "observation":{
+          "shape":"Observation",
+          "documentation":"<p>Details about the observation (the output of the action group Lambda or knowledge base) made by the agent.</p>"
+        },
         "modelInvocationInput":{
           "shape":"ModelInvocationInput",
           "documentation":"<p>The input for the orchestration step.</p> <ul> <li> <p>The <code>type</code> is <code>ORCHESTRATION</code>.</p> </li> <li> <p>The <code>text</code> contains the prompt.</p> </li> <li> <p>The <code>inferenceConfiguration</code>, <code>parserMode</code>, and <code>overrideLambda</code> values are set in the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_PromptOverrideConfiguration.html\">PromptOverrideConfiguration</a> object that was set when the agent was created or updated.</p> </li> </ul>"
@@ -5665,14 +6041,6 @@
         "modelInvocationOutput":{
           "shape":"OrchestrationModelInvocationOutput",
           "documentation":"<p>Contains information pertaining to the output from the foundation model that is being invoked.</p>"
-        },
-        "observation":{
-          "shape":"Observation",
-          "documentation":"<p>Details about the observation (the output of the action group Lambda or knowledge base) made by the agent.</p>"
-        },
-        "rationale":{
-          "shape":"Rationale",
-          "documentation":"<p>Details about the reasoning, based on the input, that the agent uses to justify carrying out an action group or getting information from a knowledge base.</p>"
         }
       },
       "documentation":"<p>Details about the orchestration step, in which the agent determines the order in which actions are executed and which knowledge bases are retrieved.</p>",
@@ -5689,10 +6057,6 @@
     "OutputFile":{
       "type":"structure",
       "members":{
-        "bytes":{
-          "shape":"FileBody",
-          "documentation":"<p>The byte count of files that contains response from code interpreter.</p>"
-        },
         "name":{
           "shape":"String",
           "documentation":"<p>The name of the file containing response from code interpreter.</p>"
@@ -5700,6 +6064,10 @@
         "type":{
           "shape":"MimeType",
           "documentation":"<p>The type of file that contains response from the code interpreter.</p>"
+        },
+        "bytes":{
+          "shape":"FileBody",
+          "documentation":"<p>The byte count of files that contains response from code interpreter.</p>"
         }
       },
       "documentation":"<p>Contains details of the response from code interpreter.</p>",
@@ -5746,13 +6114,13 @@
           "shape":"ParameterDescription",
           "documentation":"<p> A description of the parameter. Helps the foundation model determine how to elicit the parameters from the user. </p>"
         },
-        "required":{
-          "shape":"Boolean",
-          "documentation":"<p> Whether the parameter is required for the agent to complete the function for action group invocation. </p>"
-        },
         "type":{
           "shape":"ParameterType",
           "documentation":"<p> The data type of the parameter. </p>"
+        },
+        "required":{
+          "shape":"Boolean",
+          "documentation":"<p> Whether the parameter is required for the agent to complete the function for action group invocation. </p>"
         }
       },
       "documentation":"<p> Contains details about a parameter in a function for an action group. </p>"
@@ -5768,7 +6136,7 @@
     },
     "ParameterName":{
       "type":"string",
-      "pattern":"^([0-9a-zA-Z][_-]?){1,100}$"
+      "pattern":"([0-9a-zA-Z][_-]?){1,100}"
     },
     "ParameterType":{
       "type":"string",
@@ -5797,13 +6165,13 @@
     "PayloadPart":{
       "type":"structure",
       "members":{
-        "attribution":{
-          "shape":"Attribution",
-          "documentation":"<p>Contains citations for a part of an agent response.</p>"
-        },
         "bytes":{
           "shape":"PartBody",
           "documentation":"<p>A part of the agent response in bytes.</p>"
+        },
+        "attribution":{
+          "shape":"Attribution",
+          "documentation":"<p>Contains citations for a part of an agent response.</p>"
         }
       },
       "documentation":"<p>Contains a part of an agent response and citations for it.</p>",
@@ -5837,9 +6205,9 @@
     "PostProcessingModelInvocationOutput":{
       "type":"structure",
       "members":{
-        "metadata":{
-          "shape":"Metadata",
-          "documentation":"<p> Contains information about the foundation model output from the post-processing step. </p>"
+        "traceId":{
+          "shape":"TraceId",
+          "documentation":"<p>The unique identifier of the trace.</p>"
         },
         "parsedResponse":{
           "shape":"PostProcessingParsedResponse",
@@ -5849,13 +6217,13 @@
           "shape":"RawResponse",
           "documentation":"<p> Details of the raw response from the foundation model output. </p>"
         },
+        "metadata":{
+          "shape":"Metadata",
+          "documentation":"<p> Contains information about the foundation model output from the post-processing step. </p>"
+        },
         "reasoningContent":{
           "shape":"ReasoningContentBlock",
           "documentation":"<p>Contains content about the reasoning that the model made during the post-processing step.</p>"
-        },
-        "traceId":{
-          "shape":"TraceId",
-          "documentation":"<p>The unique identifier of the trace.</p>"
         }
       },
       "documentation":"<p>The foundation model output from the post-processing step.</p>",
@@ -5891,9 +6259,9 @@
     "PreProcessingModelInvocationOutput":{
       "type":"structure",
       "members":{
-        "metadata":{
-          "shape":"Metadata",
-          "documentation":"<p> Contains information about the foundation model output from the pre-processing step. </p>"
+        "traceId":{
+          "shape":"TraceId",
+          "documentation":"<p>The unique identifier of the trace.</p>"
         },
         "parsedResponse":{
           "shape":"PreProcessingParsedResponse",
@@ -5903,28 +6271,28 @@
           "shape":"RawResponse",
           "documentation":"<p> Details of the raw response from the foundation model output. </p>"
         },
+        "metadata":{
+          "shape":"Metadata",
+          "documentation":"<p> Contains information about the foundation model output from the pre-processing step. </p>"
+        },
         "reasoningContent":{
           "shape":"ReasoningContentBlock",
           "documentation":"<p>Contains content about the reasoning that the model made during the pre-processing step. </p>"
-        },
-        "traceId":{
-          "shape":"TraceId",
-          "documentation":"<p>The unique identifier of the trace.</p>"
         }
       },
       "documentation":"<p>The foundation model output from the pre-processing step.</p>",
       "sensitive":true
     },
-    "PreProcessingParsedResponse":{
-      "type":"structure",
-      "members":{
-        "isValid":{
-          "shape":"Boolean",
-          "documentation":"<p>Whether the user input is valid or not. If <code>false</code>, the agent doesn't proceed to orchestration.</p>"
-        },
+    "PreProcessingParsedResponse":{
+      "type":"structure",
+      "members":{
         "rationale":{
           "shape":"RationaleString",
           "documentation":"<p>The text returned by the parsing of the pre-processing step, explaining the steps that the agent plans to take in orchestration, if the user input is valid.</p>"
+        },
+        "isValid":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether the user input is valid or not. If <code>false</code>, the agent doesn't proceed to orchestration.</p>"
         }
       },
       "documentation":"<p>Details about the response from the Lambda parsing of the output from the pre-processing step.</p>",
@@ -5949,18 +6317,22 @@
     "PromptConfiguration":{
       "type":"structure",
       "members":{
-        "additionalModelRequestFields":{
-          "shape":"Document",
-          "documentation":"<p>If the Converse or ConverseStream operations support the model, <code>additionalModelRequestFields</code> contains additional inference parameters, beyond the base set of inference parameters in the <code>inferenceConfiguration</code> field. </p> <p>For more information, see <i>Inference request parameters and response fields for foundation models</i> in the Amazon Bedrock user guide.</p>"
+        "promptType":{
+          "shape":"PromptType",
+          "documentation":"<p> The step in the agent sequence that this prompt configuration applies to. </p>"
+        },
+        "promptCreationMode":{
+          "shape":"CreationMode",
+          "documentation":"<p>Specifies whether to override the default prompt template for this <code>promptType</code>. Set this value to <code>OVERRIDDEN</code> to use the prompt that you provide in the <code>basePromptTemplate</code>. If you leave it as <code>DEFAULT</code>, the agent uses a default prompt template.</p>"
+        },
+        "promptState":{
+          "shape":"PromptState",
+          "documentation":"<p>Specifies whether to allow the inline agent to carry out the step specified in the <code>promptType</code>. If you set this value to <code>DISABLED</code>, the agent skips that step. The default state for each <code>promptType</code> is as follows.</p> <ul> <li> <p> <code>PRE_PROCESSING</code> – <code>ENABLED</code> </p> </li> <li> <p> <code>ORCHESTRATION</code> – <code>ENABLED</code> </p> </li> <li> <p> <code>KNOWLEDGE_BASE_RESPONSE_GENERATION</code> – <code>ENABLED</code> </p> </li> <li> <p> <code>POST_PROCESSING</code> – <code>DISABLED</code> </p> </li> </ul>"
         },
         "basePromptTemplate":{
           "shape":"BasePromptTemplate",
           "documentation":"<p>Defines the prompt template with which to replace the default prompt template. You can use placeholder variables in the base prompt template to customize the prompt. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-placeholders.html\">Prompt template placeholder variables</a>. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/advanced-prompts-configure.html\">Configure the prompt templates</a>.</p>"
         },
-        "foundationModel":{
-          "shape":"ModelIdentifier",
-          "documentation":"<p> The foundation model to use. </p>"
-        },
         "inferenceConfiguration":{
           "shape":"InferenceConfiguration",
           "documentation":"<p>Contains inference parameters to use when the agent invokes a foundation model in the part of the agent sequence defined by the <code>promptType</code>. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html\">Inference parameters for foundation models</a>.</p>"
@@ -5969,17 +6341,13 @@
           "shape":"CreationMode",
           "documentation":"<p>Specifies whether to override the default parser Lambda function when parsing the raw foundation model output in the part of the agent sequence defined by the <code>promptType</code>. If you set the field as <code>OVERRIDDEN</code>, the <code>overrideLambda</code> field in the <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent_PromptOverrideConfiguration.html\">PromptOverrideConfiguration</a> must be specified with the ARN of a Lambda function.</p>"
         },
-        "promptCreationMode":{
-          "shape":"CreationMode",
-          "documentation":"<p>Specifies whether to override the default prompt template for this <code>promptType</code>. Set this value to <code>OVERRIDDEN</code> to use the prompt that you provide in the <code>basePromptTemplate</code>. If you leave it as <code>DEFAULT</code>, the agent uses a default prompt template.</p>"
-        },
-        "promptState":{
-          "shape":"PromptState",
-          "documentation":"<p>Specifies whether to allow the inline agent to carry out the step specified in the <code>promptType</code>. If you set this value to <code>DISABLED</code>, the agent skips that step. The default state for each <code>promptType</code> is as follows.</p> <ul> <li> <p> <code>PRE_PROCESSING</code> – <code>ENABLED</code> </p> </li> <li> <p> <code>ORCHESTRATION</code> – <code>ENABLED</code> </p> </li> <li> <p> <code>KNOWLEDGE_BASE_RESPONSE_GENERATION</code> – <code>ENABLED</code> </p> </li> <li> <p> <code>POST_PROCESSING</code> – <code>DISABLED</code> </p> </li> </ul>"
+        "foundationModel":{
+          "shape":"ModelIdentifier",
+          "documentation":"<p> The foundation model to use. </p>"
         },
-        "promptType":{
-          "shape":"PromptType",
-          "documentation":"<p> The step in the agent sequence that this prompt configuration applies to. </p>"
+        "additionalModelRequestFields":{
+          "shape":"Document",
+          "documentation":"<p>If the Converse or ConverseStream operations support the model, <code>additionalModelRequestFields</code> contains additional inference parameters, beyond the base set of inference parameters in the <code>inferenceConfiguration</code> field. </p> <p>For more information, see <i>Inference request parameters and response fields for foundation models</i> in the Amazon Bedrock user guide.</p>"
         }
       },
       "documentation":"<p> Contains configurations to override a prompt template in one part of an agent sequence. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/advanced-prompts.html\">Advanced prompts</a>. </p>"
@@ -5993,13 +6361,13 @@
     "PromptCreationConfigurations":{
       "type":"structure",
       "members":{
-        "excludePreviousThinkingSteps":{
-          "shape":"Boolean",
-          "documentation":"<p>If <code>true</code>, the service removes any content between <code>&lt;thinking&gt;</code> tags from previous conversations in an agent session. The service will only remove content from already processed turns. This helps you remove content which might not be useful for current and subsequent invocations. This can reduce the input token count and potentially save costs. The default value is <code>false</code>.</p>"
-        },
         "previousConversationTurnsToInclude":{
           "shape":"PromptCreationConfigurationsPreviousConversationTurnsToIncludeInteger",
           "documentation":"<p>The number of previous conversations from the ongoing agent session to include in the conversation history of the agent prompt, during the current invocation. This gives you more granular control over the context that the model is made aware of, and helps the model remove older context which is no longer useful during the ongoing agent session.</p>"
+        },
+        "excludePreviousThinkingSteps":{
+          "shape":"Boolean",
+          "documentation":"<p>If <code>true</code>, the service removes any content between <code>&lt;thinking&gt;</code> tags from previous conversations in an agent session. The service will only remove content from already processed turns. This helps you remove content which might not be useful for current and subsequent invocations. This can reduce the input token count and potentially save costs. The default value is <code>false</code>.</p>"
         }
       },
       "documentation":"<p>Specifies parameters that control how the service populates the agent prompt for an <code>InvokeAgent</code> or <code>InvokeInlineAgent</code> request. You can control which aspects of previous invocations in the same agent session the service uses to populate the agent prompt. This gives you more granular control over the contextual history that is used to process the current request.</p>"
@@ -6013,13 +6381,13 @@
       "type":"structure",
       "required":["promptConfigurations"],
       "members":{
-        "overrideLambda":{
-          "shape":"LambdaResourceArn",
-          "documentation":"<p>The ARN of the Lambda function to use when parsing the raw foundation model output in parts of the agent sequence. If you specify this field, at least one of the <code>promptConfigurations</code> must contain a <code>parserMode</code> value that is set to <code>OVERRIDDEN</code>. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/lambda-parser.html\">Parser Lambda function in Amazon Bedrock Agents</a>. </p>"
-        },
         "promptConfigurations":{
           "shape":"PromptConfigurations",
           "documentation":"<p>Contains configurations to override a prompt template in one part of an agent sequence. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/advanced-prompts.html\">Advanced prompts</a>. </p>"
+        },
+        "overrideLambda":{
+          "shape":"LambdaResourceArn",
+          "documentation":"<p>The ARN of the Lambda function to use when parsing the raw foundation model output in parts of the agent sequence. If you specify this field, at least one of the <code>promptConfigurations</code> must contain a <code>parserMode</code> value that is set to <code>OVERRIDDEN</code>. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/lambda-parser.html\">Parser Lambda function in Amazon Bedrock Agents</a>. </p>"
         }
       },
       "documentation":"<p>Contains configurations to override prompts in different parts of an agent sequence. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/advanced-prompts.html\">Advanced prompts</a>. </p>",
@@ -6074,20 +6442,22 @@
     "PutInvocationStepRequest":{
       "type":"structure",
       "required":[
+        "sessionIdentifier",
         "invocationIdentifier",
         "invocationStepTime",
-        "payload",
-        "sessionIdentifier"
+        "payload"
       ],
       "members":{
+        "sessionIdentifier":{
+          "shape":"SessionIdentifier",
+          "documentation":"<p>The unique identifier for the session to add the invocation step to. You can specify either the session's <code>sessionId</code> or its Amazon Resource Name (ARN).</p>",
+          "location":"uri",
+          "locationName":"sessionIdentifier"
+        },
         "invocationIdentifier":{
           "shape":"InvocationIdentifier",
           "documentation":"<p>The unique identifier (in UUID format) of the invocation to add the invocation step to.</p>"
         },
-        "invocationStepId":{
-          "shape":"Uuid",
-          "documentation":"<p>The unique identifier of the invocation step in UUID format.</p>"
-        },
         "invocationStepTime":{
           "shape":"DateTimestamp",
           "documentation":"<p>The timestamp for when the invocation step occurred.</p>"
@@ -6096,11 +6466,9 @@
           "shape":"InvocationStepPayload",
           "documentation":"<p>The payload for the invocation step, including text and images for the interaction.</p>"
         },
-        "sessionIdentifier":{
-          "shape":"SessionIdentifier",
-          "documentation":"<p>The unique identifier for the session to add the invocation step to. You can specify either the session's <code>sessionId</code> or its Amazon Resource Name (ARN).</p>",
-          "location":"uri",
-          "locationName":"sessionIdentifier"
+        "invocationStepId":{
+          "shape":"Uuid",
+          "documentation":"<p>The unique identifier of the invocation step in UUID format.</p>"
         }
       }
     },
@@ -6117,17 +6485,17 @@
     "QueryGenerationInput":{
       "type":"structure",
       "required":[
-        "text",
-        "type"
+        "type",
+        "text"
       ],
       "members":{
-        "text":{
-          "shape":"QueryGenerationInputTextString",
-          "documentation":"<p>The text of the query.</p>"
-        },
         "type":{
           "shape":"InputQueryType",
           "documentation":"<p>The type of the query.</p>"
+        },
+        "text":{
+          "shape":"QueryGenerationInputTextString",
+          "documentation":"<p>The text of the query.</p>"
         }
       },
       "documentation":"<p>Contains information about a natural language query to transform into SQL.</p>",
@@ -6171,13 +6539,13 @@
     "Rationale":{
       "type":"structure",
       "members":{
-        "text":{
-          "shape":"RationaleString",
-          "documentation":"<p>The reasoning or thought process of the agent, based on the input.</p>"
-        },
         "traceId":{
           "shape":"TraceId",
           "documentation":"<p>The unique identifier of the trace step.</p>"
+        },
+        "text":{
+          "shape":"RationaleString",
+          "documentation":"<p>The reasoning or thought process of the agent, based on the input.</p>"
         }
       },
       "documentation":"<p>Contains the reasoning, based on the input, that the agent uses to justify carrying out an action group or getting information from a knowledge base.</p>",
@@ -6218,13 +6586,13 @@
       "type":"structure",
       "required":["text"],
       "members":{
-        "signature":{
-          "shape":"String",
-          "documentation":"<p>A hash of all the messages in the conversation to ensure that the content in the reasoning text block isn't tampered with. You must submit the signature in subsequent <code>Converse</code> requests, in addition to the previous messages. If the previous messages are tampered with, the response throws an error.</p>"
-        },
         "text":{
           "shape":"String",
           "documentation":"<p>Text describing the reasoning that the model used to return the content in the content block.</p>"
+        },
+        "signature":{
+          "shape":"String",
+          "documentation":"<p>A hash of all the messages in the conversation to ensure that the content in the reasoning text block isn't tampered with. You must submit the signature in subsequent <code>Converse</code> requests, in addition to the previous messages. If the previous messages are tampered with, the response throws an error.</p>"
         }
       },
       "documentation":"<p>Contains information about the reasoning that the model used to return the content in the content block.</p>",
@@ -6240,13 +6608,13 @@
     "RepromptResponse":{
       "type":"structure",
       "members":{
-        "source":{
-          "shape":"Source",
-          "documentation":"<p>Specifies what output is prompting the agent to reprompt the input.</p>"
-        },
         "text":{
           "shape":"String",
           "documentation":"<p>The text reprompting the input.</p>"
+        },
+        "source":{
+          "shape":"Source",
+          "documentation":"<p>Specifies what output is prompting the agent to reprompt the input.</p>"
         }
       },
       "documentation":"<p>Contains details about the agent's response to reprompt the input.</p>",
@@ -6273,17 +6641,17 @@
       "type":"structure",
       "required":["type"],
       "members":{
-        "jsonDocument":{
-          "shape":"Document",
-          "documentation":"<p>Contains a JSON document to rerank.</p>"
+        "type":{
+          "shape":"RerankDocumentType",
+          "documentation":"<p>The type of document to rerank.</p>"
         },
         "textDocument":{
           "shape":"RerankTextDocument",
           "documentation":"<p>Contains information about a text document to rerank.</p>"
         },
-        "type":{
-          "shape":"RerankDocumentType",
-          "documentation":"<p>The type of document to rerank.</p>"
+        "jsonDocument":{
+          "shape":"Document",
+          "documentation":"<p>Contains a JSON document to rerank.</p>"
         }
       },
       "documentation":"<p>Contains information about a document to rerank. Choose the <code>type</code> to define and include the field that corresponds to the type.</p>",
@@ -6306,17 +6674,17 @@
     "RerankQuery":{
       "type":"structure",
       "required":[
-        "textQuery",
-        "type"
+        "type",
+        "textQuery"
       ],
       "members":{
-        "textQuery":{
-          "shape":"RerankTextDocument",
-          "documentation":"<p>Contains information about a text query.</p>"
-        },
         "type":{
           "shape":"RerankQueryContentType",
           "documentation":"<p>The type of the query.</p>"
+        },
+        "textQuery":{
+          "shape":"RerankTextDocument",
+          "documentation":"<p>Contains information about a text query.</p>"
         }
       },
       "documentation":"<p>Contains information about a query to submit to the reranker model.</p>",
@@ -6330,25 +6698,25 @@
       "type":"structure",
       "required":[
         "queries",
-        "rerankingConfiguration",
-        "sources"
+        "sources",
+        "rerankingConfiguration"
       ],
       "members":{
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>If the total number of results was greater than could fit in a response, a token is returned in the <code>nextToken</code> field. You can enter that token in this field to return the next batch of results.</p>"
-        },
         "queries":{
           "shape":"RerankQueriesList",
           "documentation":"<p>An array of objects, each of which contains information about a query to submit to the reranker model.</p>"
         },
+        "sources":{
+          "shape":"RerankSourcesList",
+          "documentation":"<p>An array of objects, each of which contains information about the sources to rerank.</p>"
+        },
         "rerankingConfiguration":{
           "shape":"RerankingConfiguration",
           "documentation":"<p>Contains configurations for reranking.</p>"
         },
-        "sources":{
-          "shape":"RerankSourcesList",
-          "documentation":"<p>An array of objects, each of which contains information about the sources to rerank.</p>"
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the total number of results was greater than could fit in a response, a token is returned in the <code>nextToken</code> field. You can enter that token in this field to return the next batch of results.</p>"
         }
       }
     },
@@ -6356,13 +6724,13 @@
       "type":"structure",
       "required":["results"],
       "members":{
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>If the total number of results is greater than can fit in the response, use this token in the <code>nextToken</code> field when making another request to return the next batch of results.</p>"
-        },
         "results":{
           "shape":"RerankResultsList",
           "documentation":"<p>An array of objects, each of which contains information about the results of reranking.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the total number of results is greater than can fit in the response, use this token in the <code>nextToken</code> field when making another request to return the next batch of results.</p>"
         }
       }
     },
@@ -6373,10 +6741,6 @@
         "relevanceScore"
       ],
       "members":{
-        "document":{
-          "shape":"RerankDocument",
-          "documentation":"<p>Contains information about the document.</p>"
-        },
         "index":{
           "shape":"RerankResultIndexInteger",
           "documentation":"<p>The ranking of the document. The lower a number, the higher the document is ranked.</p>"
@@ -6384,6 +6748,10 @@
         "relevanceScore":{
           "shape":"Float",
           "documentation":"<p>The relevance score of the document.</p>"
+        },
+        "document":{
+          "shape":"RerankDocument",
+          "documentation":"<p>Contains information about the document.</p>"
         }
       },
       "documentation":"<p>Contains information about a document that was reranked.</p>"
@@ -6401,17 +6769,17 @@
     "RerankSource":{
       "type":"structure",
       "required":[
-        "inlineDocumentSource",
-        "type"
+        "type",
+        "inlineDocumentSource"
       ],
       "members":{
-        "inlineDocumentSource":{
-          "shape":"RerankDocument",
-          "documentation":"<p>Contains an inline definition of a source for reranking.</p>"
-        },
         "type":{
           "shape":"RerankSourceType",
           "documentation":"<p>The type of the source.</p>"
+        },
+        "inlineDocumentSource":{
+          "shape":"RerankDocument",
+          "documentation":"<p>Contains an inline definition of a source for reranking.</p>"
         }
       },
       "documentation":"<p>Contains information about a source for reranking.</p>",
@@ -6447,17 +6815,17 @@
     "RerankingConfiguration":{
       "type":"structure",
       "required":[
-        "bedrockRerankingConfiguration",
-        "type"
+        "type",
+        "bedrockRerankingConfiguration"
       ],
       "members":{
-        "bedrockRerankingConfiguration":{
-          "shape":"BedrockRerankingConfiguration",
-          "documentation":"<p>Contains configurations for an Amazon Bedrock reranker.</p>"
-        },
         "type":{
           "shape":"RerankingConfigurationType",
           "documentation":"<p>The type of reranker that the configurations apply to.</p>"
+        },
+        "bedrockRerankingConfiguration":{
+          "shape":"BedrockRerankingConfiguration",
+          "documentation":"<p>Contains configurations for an Amazon Bedrock reranker.</p>"
         }
       },
       "documentation":"<p>Contains configurations for reranking.</p>"
@@ -6476,13 +6844,13 @@
     "RerankingMetadataSelectiveModeConfiguration":{
       "type":"structure",
       "members":{
-        "fieldsToExclude":{
-          "shape":"FieldsForReranking",
-          "documentation":"<p>An array of objects, each of which specifies a metadata field to exclude from consideration when reranking.</p>"
-        },
         "fieldsToInclude":{
           "shape":"FieldsForReranking",
           "documentation":"<p>An array of objects, each of which specifies a metadata field to include in consideration when reranking. The remaining metadata fields are ignored.</p>"
+        },
+        "fieldsToExclude":{
+          "shape":"FieldsForReranking",
+          "documentation":"<p>An array of objects, each of which specifies a metadata field to exclude from consideration when reranking.</p>"
         }
       },
       "documentation":"<p>Contains configurations for the metadata fields to include or exclude when considering reranking. If you include the <code>fieldsToExclude</code> field, the reranker ignores all the metadata fields that you specify. If you include the <code>fieldsToInclude</code> field, the reranker uses only the metadata fields that you specify and ignores all others. You can include only one of these fields.</p>",
@@ -6497,7 +6865,7 @@
     },
     "ResourceName":{
       "type":"string",
-      "pattern":"^([0-9a-zA-Z][_-]?){1,100}$",
+      "pattern":"([0-9a-zA-Z][_-]?){1,100}",
       "sensitive":true
     },
     "ResourceNotFoundException":{
@@ -6527,46 +6895,30 @@
     "ResponseStream":{
       "type":"structure",
       "members":{
-        "accessDeniedException":{
-          "shape":"AccessDeniedException",
-          "documentation":"<p>The request is denied because of missing access permissions. Check your permissions and retry your request.</p>"
-        },
-        "badGatewayException":{
-          "shape":"BadGatewayException",
-          "documentation":"<p>There was an issue with a dependency due to a server issue. Retry your request.</p>"
-        },
         "chunk":{
           "shape":"PayloadPart",
           "documentation":"<p>Contains a part of an agent response and citations for it.</p>"
         },
-        "conflictException":{
-          "shape":"ConflictException",
-          "documentation":"<p>There was a conflict performing an operation. Resolve the conflict and retry your request.</p>"
-        },
-        "dependencyFailedException":{
-          "shape":"DependencyFailedException",
-          "documentation":"<p>There was an issue with a dependency. Check the resource configurations and retry the request.</p>"
+        "trace":{
+          "shape":"TracePart",
+          "documentation":"<p>Contains information about the agent and session, alongside the agent's reasoning process and results from calling actions and querying knowledge bases and metadata about the trace. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/trace-events.html\">Trace events</a>.</p>"
         },
-        "files":{
-          "shape":"FilePart",
-          "documentation":"<p>Contains intermediate response for code interpreter if any files have been generated.</p>"
+        "returnControl":{
+          "shape":"ReturnControlPayload",
+          "documentation":"<p>Contains the parameters and information that the agent elicited from the customer to carry out an action. This information is returned to the system and can be used in your own setup for fulfilling the action.</p>"
         },
         "internalServerException":{
           "shape":"InternalServerException",
           "documentation":"<p>An internal server error occurred. Retry your request.</p>"
         },
-        "modelNotReadyException":{
-          "shape":"ModelNotReadyException",
-          "documentation":"<p> The model specified in the request is not ready to serve Inference requests. The AWS SDK will automatically retry the operation up to 5 times. For information about configuring automatic retries, see <a href=\"https://docs.aws.amazon.com/sdkref/latest/guide/feature-retry-behavior.html\">Retry behavior</a> in the <i>AWS SDKs and Tools</i> reference guide. </p>"
+        "validationException":{
+          "shape":"ValidationException",
+          "documentation":"<p>Input validation failed. Check your request parameters and retry the request.</p>"
         },
         "resourceNotFoundException":{
           "shape":"ResourceNotFoundException",
           "documentation":"<p>The specified resource Amazon Resource Name (ARN) was not found. Check the Amazon Resource Name (ARN) and try your request again.</p>"
         },
-        "returnControl":{
-          "shape":"ReturnControlPayload",
-          "documentation":"<p>Contains the parameters and information that the agent elicited from the customer to carry out an action. This information is returned to the system and can be used in your own setup for fulfilling the action.</p>"
-        },
         "serviceQuotaExceededException":{
           "shape":"ServiceQuotaExceededException",
           "documentation":"<p>The number of requests exceeds the service quota. Resubmit your request later.</p>"
@@ -6575,13 +6927,29 @@
           "shape":"ThrottlingException",
           "documentation":"<p>The number of requests exceeds the limit. Resubmit your request later.</p>"
         },
-        "trace":{
-          "shape":"TracePart",
-          "documentation":"<p>Contains information about the agent and session, alongside the agent's reasoning process and results from calling actions and querying knowledge bases and metadata about the trace. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/trace-events.html\">Trace events</a>.</p>"
+        "accessDeniedException":{
+          "shape":"AccessDeniedException",
+          "documentation":"<p>The request is denied because of missing access permissions. Check your permissions and retry your request.</p>"
         },
-        "validationException":{
-          "shape":"ValidationException",
-          "documentation":"<p>Input validation failed. Check your request parameters and retry the request.</p>"
+        "conflictException":{
+          "shape":"ConflictException",
+          "documentation":"<p>There was a conflict performing an operation. Resolve the conflict and retry your request.</p>"
+        },
+        "dependencyFailedException":{
+          "shape":"DependencyFailedException",
+          "documentation":"<p>There was an issue with a dependency. Check the resource configurations and retry the request.</p>"
+        },
+        "badGatewayException":{
+          "shape":"BadGatewayException",
+          "documentation":"<p>There was an issue with a dependency due to a server issue. Retry your request.</p>"
+        },
+        "modelNotReadyException":{
+          "shape":"ModelNotReadyException",
+          "documentation":"<p> The model specified in the request is not ready to serve Inference requests. The AWS SDK will automatically retry the operation up to 5 times. For information about configuring automatic retries, see <a href=\"https://docs.aws.amazon.com/sdkref/latest/guide/feature-retry-behavior.html\">Retry behavior</a> in the <i>AWS SDKs and Tools</i> reference guide. </p>"
+        },
+        "files":{
+          "shape":"FilePart",
+          "documentation":"<p>Contains intermediate response for code interpreter if any files have been generated.</p>"
         }
       },
       "documentation":"<p>The response from invoking the agent and associated citations and trace information.</p>",
@@ -6590,14 +6958,14 @@
     "RetrievalFilter":{
       "type":"structure",
       "members":{
-        "andAll":{
-          "shape":"RetrievalFilterList",
-          "documentation":"<p>Knowledge base data sources are returned if their metadata attributes fulfill all the filter conditions inside this list.</p>"
-        },
         "equals":{
           "shape":"FilterAttribute",
           "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value matches the <code>value</code> in this object.</p> <p>The following example would return data sources with an <code>animal</code> attribute whose value is <code>cat</code>:</p> <p> <code>\"equals\": { \"key\": \"animal\", \"value\": \"cat\" }</code> </p>"
         },
+        "notEquals":{
+          "shape":"FilterAttribute",
+          "documentation":"<p>Knowledge base data sources are returned when:</p> <ul> <li> <p>It contains a metadata attribute whose name matches the <code>key</code> and whose value doesn't match the <code>value</code> in this object.</p> </li> <li> <p>The key is not present in the document.</p> </li> </ul> <p>The following example would return data sources that don't contain an <code>animal</code> attribute whose value is <code>cat</code>.</p> <p> <code>\"notEquals\": { \"key\": \"animal\", \"value\": \"cat\" }</code> </p>"
+        },
         "greaterThan":{
           "shape":"FilterAttribute",
           "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value is greater than the <code>value</code> in this object.</p> <p>The following example would return data sources with an <code>year</code> attribute whose value is greater than <code>1989</code>:</p> <p> <code>\"greaterThan\": { \"key\": \"year\", \"value\": 1989 }</code> </p>"
@@ -6606,10 +6974,6 @@
           "shape":"FilterAttribute",
           "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value is greater than or equal to the <code>value</code> in this object.</p> <p>The following example would return data sources with an <code>year</code> attribute whose value is greater than or equal to <code>1989</code>:</p> <p> <code>\"greaterThanOrEquals\": { \"key\": \"year\", \"value\": 1989 }</code> </p>"
         },
-        "in":{
-          "shape":"FilterAttribute",
-          "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value is in the list specified in the <code>value</code> in this object.</p> <p>The following example would return data sources with an <code>animal</code> attribute that is either <code>cat</code> or <code>dog</code>:</p> <p> <code>\"in\": { \"key\": \"animal\", \"value\": [\"cat\", \"dog\"] }</code> </p>"
-        },
         "lessThan":{
           "shape":"FilterAttribute",
           "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value is less than the <code>value</code> in this object.</p> <p>The following example would return data sources with an <code>year</code> attribute whose value is less than to <code>1989</code>.</p> <p> <code>\"lessThan\": { \"key\": \"year\", \"value\": 1989 }</code> </p>"
@@ -6618,29 +6982,33 @@
           "shape":"FilterAttribute",
           "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value is less than or equal to the <code>value</code> in this object.</p> <p>The following example would return data sources with an <code>year</code> attribute whose value is less than or equal to <code>1989</code>.</p> <p> <code>\"lessThanOrEquals\": { \"key\": \"year\", \"value\": 1989 }</code> </p>"
         },
-        "listContains":{
-          "shape":"FilterAttribute",
-          "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value is a list that contains the <code>value</code> as one of its members.</p> <p>The following example would return data sources with an <code>animals</code> attribute that is a list containing a <code>cat</code> member (for example <code>[\"dog\", \"cat\"]</code>).</p> <p> <code>\"listContains\": { \"key\": \"animals\", \"value\": \"cat\" }</code> </p>"
-        },
-        "notEquals":{
+        "in":{
           "shape":"FilterAttribute",
-          "documentation":"<p>Knowledge base data sources are returned when:</p> <ul> <li> <p>It contains a metadata attribute whose name matches the <code>key</code> and whose value doesn't match the <code>value</code> in this object.</p> </li> <li> <p>The key is not present in the document.</p> </li> </ul> <p>The following example would return data sources that don't contain an <code>animal</code> attribute whose value is <code>cat</code>.</p> <p> <code>\"notEquals\": { \"key\": \"animal\", \"value\": \"cat\" }</code> </p>"
+          "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value is in the list specified in the <code>value</code> in this object.</p> <p>The following example would return data sources with an <code>animal</code> attribute that is either <code>cat</code> or <code>dog</code>:</p> <p> <code>\"in\": { \"key\": \"animal\", \"value\": [\"cat\", \"dog\"] }</code> </p>"
         },
         "notIn":{
           "shape":"FilterAttribute",
           "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value isn't in the list specified in the <code>value</code> in this object.</p> <p>The following example would return data sources whose <code>animal</code> attribute is neither <code>cat</code> nor <code>dog</code>.</p> <p> <code>\"notIn\": { \"key\": \"animal\", \"value\": [\"cat\", \"dog\"] }</code> </p>"
         },
-        "orAll":{
-          "shape":"RetrievalFilterList",
-          "documentation":"<p>Knowledge base data sources are returned if their metadata attributes fulfill at least one of the filter conditions inside this list.</p>"
-        },
         "startsWith":{
           "shape":"FilterAttribute",
           "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value starts with the <code>value</code> in this object. This filter is currently only supported for Amazon OpenSearch Serverless vector stores.</p> <p>The following example would return data sources with an <code>animal</code> attribute starts with <code>ca</code> (for example, <code>cat</code> or <code>camel</code>).</p> <p> <code>\"startsWith\": { \"key\": \"animal\", \"value\": \"ca\" }</code> </p>"
         },
+        "listContains":{
+          "shape":"FilterAttribute",
+          "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value is a list that contains the <code>value</code> as one of its members.</p> <p>The following example would return data sources with an <code>animals</code> attribute that is a list containing a <code>cat</code> member (for example <code>[\"dog\", \"cat\"]</code>).</p> <p> <code>\"listContains\": { \"key\": \"animals\", \"value\": \"cat\" }</code> </p>"
+        },
         "stringContains":{
           "shape":"FilterAttribute",
           "documentation":"<p>Knowledge base data sources are returned if they contain a metadata attribute whose name matches the <code>key</code> and whose value is one of the following:</p> <ul> <li> <p>A string that contains the <code>value</code> as a substring. The following example would return data sources with an <code>animal</code> attribute that contains the substring <code>at</code> (for example <code>cat</code>).</p> <p> <code>\"stringContains\": { \"key\": \"animal\", \"value\": \"at\" }</code> </p> </li> <li> <p>A list with a member that contains the <code>value</code> as a substring. The following example would return data sources with an <code>animals</code> attribute that is a list containing a member that contains the substring <code>at</code> (for example <code>[\"dog\", \"cat\"]</code>).</p> <p> <code>\"stringContains\": { \"key\": \"animals\", \"value\": \"at\" }</code> </p> </li> </ul>"
+        },
+        "andAll":{
+          "shape":"RetrievalFilterList",
+          "documentation":"<p>Knowledge base data sources are returned if their metadata attributes fulfill all the filter conditions inside this list.</p>"
+        },
+        "orAll":{
+          "shape":"RetrievalFilterList",
+          "documentation":"<p>Knowledge base data sources are returned if their metadata attributes fulfill at least one of the filter conditions inside this list.</p>"
         }
       },
       "documentation":"<p>Specifies the filters to use on the metadata attributes in the knowledge base data sources before returning results. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html\">Query configurations</a>. See the examples below to see how to use these filters.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_RequestSyntax\">Retrieve request</a> – in the <code>filter</code> field</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_RequestSyntax\">RetrieveAndGenerate request</a> – in the <code>filter</code> field</p> </li> </ul>",
@@ -6665,6 +7033,14 @@
     "RetrievalResultContent":{
       "type":"structure",
       "members":{
+        "type":{
+          "shape":"RetrievalResultContentType",
+          "documentation":"<p>The type of content in the retrieval result.</p>"
+        },
+        "text":{
+          "shape":"String",
+          "documentation":"<p>The cited text from the data source.</p>"
+        },
         "byteContent":{
           "shape":"String",
           "documentation":"<p>A data URI with base64-encoded content from the data source. The URI is in the following format: returned in the following format: <code>data:image/jpeg;base64,${base64-encoded string}</code>.</p>"
@@ -6672,14 +7048,6 @@
         "row":{
           "shape":"RetrievalResultContentRow",
           "documentation":"<p>Specifies information about the rows with the cells to return in retrieval.</p>"
-        },
-        "text":{
-          "shape":"String",
-          "documentation":"<p>The cited text from the data source.</p>"
-        },
-        "type":{
-          "shape":"RetrievalResultContentType",
-          "documentation":"<p>The type of content in the retrieval result.</p>"
         }
       },
       "documentation":"<p>Contains information about a chunk of text from a data source in the knowledge base. If the result is from a structured data source, the cell in the database and the type of the value is also identified.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_ResponseSyntax\">Retrieve response</a> – in the <code>content</code> field</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_ResponseSyntax\">RetrieveAndGenerate response</a> – in the <code>content</code> field</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_ResponseSyntax\">InvokeAgent response</a> – in the <code>content</code> field</p> </li> </ul>",
@@ -6752,22 +7120,22 @@
       "type":"structure",
       "required":["type"],
       "members":{
-        "confluenceLocation":{
-          "shape":"RetrievalResultConfluenceLocation",
-          "documentation":"<p>The Confluence data source location.</p>"
-        },
-        "customDocumentLocation":{
-          "shape":"RetrievalResultCustomDocumentLocation",
-          "documentation":"<p>Specifies the location of a document in a custom data source.</p>"
-        },
-        "kendraDocumentLocation":{
-          "shape":"RetrievalResultKendraDocumentLocation",
-          "documentation":"<p>The location of a document in Amazon Kendra.</p>"
+        "type":{
+          "shape":"RetrievalResultLocationType",
+          "documentation":"<p>The type of data source location.</p>"
         },
         "s3Location":{
           "shape":"RetrievalResultS3Location",
           "documentation":"<p>The S3 data source location.</p>"
         },
+        "webLocation":{
+          "shape":"RetrievalResultWebLocation",
+          "documentation":"<p>The web URL/URLs data source location.</p>"
+        },
+        "confluenceLocation":{
+          "shape":"RetrievalResultConfluenceLocation",
+          "documentation":"<p>The Confluence data source location.</p>"
+        },
         "salesforceLocation":{
           "shape":"RetrievalResultSalesforceLocation",
           "documentation":"<p>The Salesforce data source location.</p>"
@@ -6776,17 +7144,17 @@
           "shape":"RetrievalResultSharePointLocation",
           "documentation":"<p>The SharePoint data source location.</p>"
         },
+        "customDocumentLocation":{
+          "shape":"RetrievalResultCustomDocumentLocation",
+          "documentation":"<p>Specifies the location of a document in a custom data source.</p>"
+        },
+        "kendraDocumentLocation":{
+          "shape":"RetrievalResultKendraDocumentLocation",
+          "documentation":"<p>The location of a document in Amazon Kendra.</p>"
+        },
         "sqlLocation":{
           "shape":"RetrievalResultSqlLocation",
           "documentation":"<p>Specifies information about the SQL query used to retrieve the result.</p>"
-        },
-        "type":{
-          "shape":"RetrievalResultLocationType",
-          "documentation":"<p>The type of data source location.</p>"
-        },
-        "webLocation":{
-          "shape":"RetrievalResultWebLocation",
-          "documentation":"<p>The web URL/URLs data source location.</p>"
         }
       },
       "documentation":"<p>Contains information about the data source location.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_Retrieve.html#API_agent-runtime_Retrieve_ResponseSyntax\">Retrieve response</a> – in the <code>location</code> field</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_ResponseSyntax\">RetrieveAndGenerate response</a> – in the <code>location</code> field</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_ResponseSyntax\">InvokeAgent response</a> – in the <code>location</code> field</p> </li> </ul>",
@@ -6819,8 +7187,7 @@
     },
     "RetrievalResultMetadataValue":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "document":true
     },
     "RetrievalResultS3Location":{
@@ -6877,17 +7244,17 @@
       "type":"structure",
       "required":["type"],
       "members":{
-        "externalSourcesConfiguration":{
-          "shape":"ExternalSourcesRetrieveAndGenerateConfiguration",
-          "documentation":"<p>The configuration for the external source wrapper object in the <code>retrieveAndGenerate</code> function.</p>"
+        "type":{
+          "shape":"RetrieveAndGenerateType",
+          "documentation":"<p>The type of resource that contains your data for retrieving information and generating responses.</p> <note> <p>If you choose to use <code>EXTERNAL_SOURCES</code>, then currently only Anthropic Claude 3 Sonnet models for knowledge bases are supported.</p> </note>"
         },
         "knowledgeBaseConfiguration":{
           "shape":"KnowledgeBaseRetrieveAndGenerateConfiguration",
           "documentation":"<p>Contains details about the knowledge base for retrieving information and generating responses.</p>"
         },
-        "type":{
-          "shape":"RetrieveAndGenerateType",
-          "documentation":"<p>The type of resource that contains your data for retrieving information and generating responses.</p> <note> <p>If you choose to use <code>EXTERNAL_SOURCES</code>, then currently only Anthropic Claude 3 Sonnet models for knowledge bases are supported.</p> </note>"
+        "externalSourcesConfiguration":{
+          "shape":"ExternalSourcesRetrieveAndGenerateConfiguration",
+          "documentation":"<p>The configuration for the external source wrapper object in the <code>retrieveAndGenerate</code> function.</p>"
         }
       },
       "documentation":"<p>Contains details about the resource being queried.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_RequestSyntax\">RetrieveAndGenerate request</a> – in the <code>retrieveAndGenerateConfiguration</code> field</p> </li> </ul>"
@@ -6938,6 +7305,10 @@
       "type":"structure",
       "required":["input"],
       "members":{
+        "sessionId":{
+          "shape":"SessionId",
+          "documentation":"<p>The unique identifier of the session. When you first make a <code>RetrieveAndGenerate</code> request, Amazon Bedrock automatically generates this value. You must reuse this value for all subsequent requests in the same conversational session. This value allows Amazon Bedrock to maintain context and knowledge from previous interactions. You can't explicitly set the <code>sessionId</code> yourself.</p>"
+        },
         "input":{
           "shape":"RetrieveAndGenerateInput",
           "documentation":"<p>Contains the query to be made to the knowledge base.</p>"
@@ -6949,20 +7320,24 @@
         "sessionConfiguration":{
           "shape":"RetrieveAndGenerateSessionConfiguration",
           "documentation":"<p>Contains details about the session with the knowledge base.</p>"
-        },
-        "sessionId":{
-          "shape":"SessionId",
-          "documentation":"<p>The unique identifier of the session. When you first make a <code>RetrieveAndGenerate</code> request, Amazon Bedrock automatically generates this value. You must reuse this value for all subsequent requests in the same conversational session. This value allows Amazon Bedrock to maintain context and knowledge from previous interactions. You can't explicitly set the <code>sessionId</code> yourself.</p>"
         }
       }
     },
     "RetrieveAndGenerateResponse":{
       "type":"structure",
       "required":[
-        "output",
-        "sessionId"
+        "sessionId",
+        "output"
       ],
       "members":{
+        "sessionId":{
+          "shape":"SessionId",
+          "documentation":"<p>The unique identifier of the session. When you first make a <code>RetrieveAndGenerate</code> request, Amazon Bedrock automatically generates this value. You must reuse this value for all subsequent requests in the same conversational session. This value allows Amazon Bedrock to maintain context and knowledge from previous interactions. You can't explicitly set the <code>sessionId</code> yourself.</p>"
+        },
+        "output":{
+          "shape":"RetrieveAndGenerateOutput",
+          "documentation":"<p>Contains the response generated from querying the knowledge base.</p>"
+        },
         "citations":{
           "shape":"Citations",
           "documentation":"<p>A list of segments of the generated response that are based on sources in the knowledge base, alongside information about the sources.</p>"
@@ -6970,14 +7345,6 @@
         "guardrailAction":{
           "shape":"GuadrailAction",
           "documentation":"<p>Specifies if there is a guardrail intervention in the response.</p>"
-        },
-        "output":{
-          "shape":"RetrieveAndGenerateOutput",
-          "documentation":"<p>Contains the response generated from querying the knowledge base.</p>"
-        },
-        "sessionId":{
-          "shape":"SessionId",
-          "documentation":"<p>The unique identifier of the session. When you first make a <code>RetrieveAndGenerate</code> request, Amazon Bedrock automatically generates this value. You must reuse this value for all subsequent requests in the same conversational session. This value allows Amazon Bedrock to maintain context and knowledge from previous interactions. You can't explicitly set the <code>sessionId</code> yourself.</p>"
         }
       }
     },
@@ -6996,6 +7363,10 @@
       "type":"structure",
       "required":["input"],
       "members":{
+        "sessionId":{
+          "shape":"SessionId",
+          "documentation":"<p>The unique identifier of the session. When you first make a <code>RetrieveAndGenerate</code> request, Amazon Bedrock automatically generates this value. You must reuse this value for all subsequent requests in the same conversational session. This value allows Amazon Bedrock to maintain context and knowledge from previous interactions. You can't explicitly set the <code>sessionId</code> yourself.</p>"
+        },
         "input":{
           "shape":"RetrieveAndGenerateInput",
           "documentation":"<p>Contains the query to be made to the knowledge base.</p>"
@@ -7007,29 +7378,25 @@
         "sessionConfiguration":{
           "shape":"RetrieveAndGenerateSessionConfiguration",
           "documentation":"<p>Contains details about the session with the knowledge base.</p>"
-        },
-        "sessionId":{
-          "shape":"SessionId",
-          "documentation":"<p>The unique identifier of the session. When you first make a <code>RetrieveAndGenerate</code> request, Amazon Bedrock automatically generates this value. You must reuse this value for all subsequent requests in the same conversational session. This value allows Amazon Bedrock to maintain context and knowledge from previous interactions. You can't explicitly set the <code>sessionId</code> yourself.</p>"
         }
       }
     },
     "RetrieveAndGenerateStreamResponse":{
       "type":"structure",
       "required":[
-        "sessionId",
-        "stream"
+        "stream",
+        "sessionId"
       ],
       "members":{
+        "stream":{
+          "shape":"RetrieveAndGenerateStreamResponseOutput",
+          "documentation":"<p>A stream of events from the model.</p>"
+        },
         "sessionId":{
           "shape":"SessionId",
           "documentation":"<p>The session ID.</p>",
           "location":"header",
           "locationName":"x-amzn-bedrock-knowledge-base-session-id"
-        },
-        "stream":{
-          "shape":"RetrieveAndGenerateStreamResponseOutput",
-          "documentation":"<p>A stream of events from the model.</p>"
         }
       },
       "payload":"stream"
@@ -7037,26 +7404,14 @@
     "RetrieveAndGenerateStreamResponseOutput":{
       "type":"structure",
       "members":{
-        "accessDeniedException":{
-          "shape":"AccessDeniedException",
-          "documentation":"<p>The request is denied because you do not have sufficient permissions to perform the requested action. For troubleshooting this error, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/troubleshooting-api-error-codes.html#ts-access-denied\">AccessDeniedException</a> in the Amazon Bedrock User Guide.</p>"
-        },
-        "badGatewayException":{
-          "shape":"BadGatewayException",
-          "documentation":"<p>The request failed due to a bad gateway error.</p>"
+        "output":{
+          "shape":"RetrieveAndGenerateOutputEvent",
+          "documentation":"<p>An output event.</p>"
         },
         "citation":{
           "shape":"CitationEvent",
           "documentation":"<p>A citation event.</p>"
         },
-        "conflictException":{
-          "shape":"ConflictException",
-          "documentation":"<p>Error occurred because of a conflict while performing an operation.</p>"
-        },
-        "dependencyFailedException":{
-          "shape":"DependencyFailedException",
-          "documentation":"<p>The request failed due to a dependency error.</p>"
-        },
         "guardrail":{
           "shape":"GuardrailEvent",
           "documentation":"<p>A guardrail event.</p>"
@@ -7065,9 +7420,9 @@
           "shape":"InternalServerException",
           "documentation":"<p>An internal server error occurred. Retry your request.</p>"
         },
-        "output":{
-          "shape":"RetrieveAndGenerateOutputEvent",
-          "documentation":"<p>An output event.</p>"
+        "validationException":{
+          "shape":"ValidationException",
+          "documentation":"<p>The input fails to satisfy the constraints specified by <i>Amazon Bedrock</i>. For troubleshooting this error, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/troubleshooting-api-error-codes.html#ts-validation-error\">ValidationError</a> in the Amazon Bedrock User Guide.</p>"
         },
         "resourceNotFoundException":{
           "shape":"ResourceNotFoundException",
@@ -7081,9 +7436,21 @@
           "shape":"ThrottlingException",
           "documentation":"<p>Your request was denied due to exceeding the account quotas for <i>Amazon Bedrock</i>. For troubleshooting this error, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/troubleshooting-api-error-codes.html#ts-throttling-exception\">ThrottlingException</a> in the Amazon Bedrock User Guide.</p>"
         },
-        "validationException":{
-          "shape":"ValidationException",
-          "documentation":"<p>The input fails to satisfy the constraints specified by <i>Amazon Bedrock</i>. For troubleshooting this error, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/troubleshooting-api-error-codes.html#ts-validation-error\">ValidationError</a> in the Amazon Bedrock User Guide.</p>"
+        "accessDeniedException":{
+          "shape":"AccessDeniedException",
+          "documentation":"<p>The request is denied because you do not have sufficient permissions to perform the requested action. For troubleshooting this error, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/troubleshooting-api-error-codes.html#ts-access-denied\">AccessDeniedException</a> in the Amazon Bedrock User Guide.</p>"
+        },
+        "conflictException":{
+          "shape":"ConflictException",
+          "documentation":"<p>Error occurred because of a conflict while performing an operation.</p>"
+        },
+        "dependencyFailedException":{
+          "shape":"DependencyFailedException",
+          "documentation":"<p>The request failed due to a dependency error.</p>"
+        },
+        "badGatewayException":{
+          "shape":"BadGatewayException",
+          "documentation":"<p>The request failed due to a bad gateway error.</p>"
         }
       },
       "documentation":"<p>A retrieve and generate stream response output.</p>",
@@ -7103,27 +7470,27 @@
         "retrievalQuery"
       ],
       "members":{
-        "guardrailConfiguration":{
-          "shape":"GuardrailConfiguration",
-          "documentation":"<p>Guardrail settings.</p>"
-        },
         "knowledgeBaseId":{
           "shape":"KnowledgeBaseId",
           "documentation":"<p>The unique identifier of the knowledge base to query.</p>",
           "location":"uri",
           "locationName":"knowledgeBaseId"
         },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>If there are more results than can fit in the response, the response returns a <code>nextToken</code>. Use this token in the <code>nextToken</code> field of another request to retrieve the next batch of results.</p>"
+        "retrievalQuery":{
+          "shape":"KnowledgeBaseQuery",
+          "documentation":"<p>Contains the query to send the knowledge base.</p>"
         },
         "retrievalConfiguration":{
           "shape":"KnowledgeBaseRetrievalConfiguration",
           "documentation":"<p>Contains configurations for the knowledge base query and retrieval process. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/kb-test-config.html\">Query configurations</a>.</p>"
         },
-        "retrievalQuery":{
-          "shape":"KnowledgeBaseQuery",
-          "documentation":"<p>Contains the query to send the knowledge base.</p>"
+        "guardrailConfiguration":{
+          "shape":"GuardrailConfiguration",
+          "documentation":"<p>Guardrail settings.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If there are more results than can fit in the response, the response returns a <code>nextToken</code>. Use this token in the <code>nextToken</code> field of another request to retrieve the next batch of results.</p>"
         }
       }
     },
@@ -7131,6 +7498,10 @@
       "type":"structure",
       "required":["retrievalResults"],
       "members":{
+        "retrievalResults":{
+          "shape":"KnowledgeBaseRetrievalResults",
+          "documentation":"<p>A list of results from querying the knowledge base.</p>"
+        },
         "guardrailAction":{
           "shape":"GuadrailAction",
           "documentation":"<p>Specifies if there is a guardrail intervention in the response.</p>"
@@ -7138,10 +7509,6 @@
         "nextToken":{
           "shape":"NextToken",
           "documentation":"<p>If there are more results than can fit in the response, the response returns a <code>nextToken</code>. Use this token in the <code>nextToken</code> field of another request to retrieve the next batch of results.</p>"
-        },
-        "retrievalResults":{
-          "shape":"KnowledgeBaseRetrievalResults",
-          "documentation":"<p>A list of results from querying the knowledge base.</p>"
         }
       }
     },
@@ -7176,13 +7543,13 @@
     "ReturnControlPayload":{
       "type":"structure",
       "members":{
-        "invocationId":{
-          "shape":"String",
-          "documentation":"<p>The identifier of the action group invocation.</p>"
-        },
         "invocationInputs":{
           "shape":"InvocationInputs",
           "documentation":"<p>A list of objects that contain information about the parameters and inputs that need to be sent into the API operation or function, based on what the agent determines from its session with the user.</p>"
+        },
+        "invocationId":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the action group invocation.</p>"
         }
       },
       "documentation":"<p>Contains information to return from the action group that the agent has predicted to invoke.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_ResponseSyntax\">InvokeAgent response</a> </p> </li> </ul>",
@@ -7206,17 +7573,17 @@
     "RoutingClassifierModelInvocationOutput":{
       "type":"structure",
       "members":{
-        "metadata":{
-          "shape":"Metadata",
-          "documentation":"<p>The invocation's metadata.</p>"
+        "traceId":{
+          "shape":"TraceId",
+          "documentation":"<p>The invocation's trace ID.</p>"
         },
         "rawResponse":{
           "shape":"RawResponse",
           "documentation":"<p>The invocation's raw response.</p>"
         },
-        "traceId":{
-          "shape":"TraceId",
-          "documentation":"<p>The invocation's trace ID.</p>"
+        "metadata":{
+          "shape":"Metadata",
+          "documentation":"<p>The invocation's metadata.</p>"
         }
       },
       "documentation":"<p>Invocation output from a routing classifier model.</p>",
@@ -7229,6 +7596,10 @@
           "shape":"InvocationInput",
           "documentation":"<p>The classifier's invocation input.</p>"
         },
+        "observation":{
+          "shape":"Observation",
+          "documentation":"<p>The classifier's observation.</p>"
+        },
         "modelInvocationInput":{
           "shape":"ModelInvocationInput",
           "documentation":"<p>The classifier's model invocation input.</p>"
@@ -7236,10 +7607,6 @@
         "modelInvocationOutput":{
           "shape":"RoutingClassifierModelInvocationOutput",
           "documentation":"<p>The classifier's model invocation output.</p>"
-        },
-        "observation":{
-          "shape":"Observation",
-          "documentation":"<p>The classifier's observation.</p>"
         }
       },
       "documentation":"<p>A trace for a routing classifier.</p>",
@@ -7250,7 +7617,7 @@
       "type":"string",
       "max":63,
       "min":3,
-      "pattern":"^[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]$"
+      "pattern":"[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]"
     },
     "S3Identifier":{
       "type":"structure",
@@ -7303,13 +7670,13 @@
       "type":"string",
       "max":1024,
       "min":1,
-      "pattern":"^[\\.\\-\\!\\*\\_\\'\\(\\)a-zA-Z0-9][\\.\\-\\!\\*\\_\\'\\(\\)\\/a-zA-Z0-9]*$"
+      "pattern":"[\\.\\-\\!\\*\\_\\'\\(\\)a-zA-Z0-9][\\.\\-\\!\\*\\_\\'\\(\\)\\/a-zA-Z0-9]*"
     },
     "S3Uri":{
       "type":"string",
       "max":1024,
       "min":1,
-      "pattern":"^s3://[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]/.{1,1024}$"
+      "pattern":"s3://[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]/.{1,1024}"
     },
     "SatisfiedCondition":{
       "type":"structure",
@@ -7350,7 +7717,7 @@
     },
     "SessionArn":{
       "type":"string",
-      "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]+:[0-9]{12}:session/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
+      "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]+:[0-9]{12}:session/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"
     },
     "SessionAttributesMap":{
       "type":"map",
@@ -7361,11 +7728,11 @@
       "type":"string",
       "max":100,
       "min":2,
-      "pattern":"^[0-9a-zA-Z._:-]+$"
+      "pattern":"[0-9a-zA-Z._:-]+"
     },
     "SessionIdentifier":{
       "type":"string",
-      "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]+:[0-9]{12}:session/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})|([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})$"
+      "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]+:[0-9]{12}:session/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})|([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})"
     },
     "SessionMetadataKey":{
       "type":"string",
@@ -7387,33 +7754,33 @@
     "SessionState":{
       "type":"structure",
       "members":{
-        "conversationHistory":{
-          "shape":"ConversationHistory",
-          "documentation":"<p>The state's conversation history.</p>"
+        "sessionAttributes":{
+          "shape":"SessionAttributesMap",
+          "documentation":"<p>Contains attributes that persist across a session and the values of those attributes. If <code>sessionAttributes</code> are passed to a supervisor agent in <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-multi-agent-collaboration.html\">multi-agent collaboration</a>, it will be forwarded to all agent collaborators.</p>"
         },
-        "files":{
-          "shape":"InputFiles",
-          "documentation":"<p>Contains information about the files used by code interpreter.</p>"
+        "promptSessionAttributes":{
+          "shape":"PromptSessionAttributesMap",
+          "documentation":"<p>Contains attributes that persist across a prompt and the values of those attributes. </p> <ul> <li> <p>In orchestration prompt template, these attributes replace the $prompt_session_attributes$ placeholder variable. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-placeholders.html\">Prompt template placeholder variables</a>.</p> </li> <li> <p>In <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-multi-agent-collaboration.html\">multi-agent collaboration</a>, the <code>promptSessionAttributes</code> will only be used by supervisor agent when $prompt_session_attributes$ is present in prompt template. </p> </li> </ul>"
+        },
+        "returnControlInvocationResults":{
+          "shape":"ReturnControlInvocationResults",
+          "documentation":"<p>Contains information about the results from the action group invocation. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-returncontrol.html\">Return control to the agent developer</a> and <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html\">Control session context</a>.</p> <note> <p>If you include this field, the <code>inputText</code> field will be ignored.</p> </note>"
         },
         "invocationId":{
           "shape":"String",
           "documentation":"<p>The identifier of the invocation of an action. This value must match the <code>invocationId</code> returned in the <code>InvokeAgent</code> response for the action whose results are provided in the <code>returnControlInvocationResults</code> field. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-returncontrol.html\">Return control to the agent developer</a> and <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html\">Control session context</a>.</p>"
         },
+        "files":{
+          "shape":"InputFiles",
+          "documentation":"<p>Contains information about the files used by code interpreter.</p>"
+        },
         "knowledgeBaseConfigurations":{
           "shape":"KnowledgeBaseConfigurations",
           "documentation":"<p>An array of configurations, each of which applies to a knowledge base attached to the agent.</p>"
         },
-        "promptSessionAttributes":{
-          "shape":"PromptSessionAttributesMap",
-          "documentation":"<p>Contains attributes that persist across a prompt and the values of those attributes. </p> <ul> <li> <p>In orchestration prompt template, these attributes replace the $prompt_session_attributes$ placeholder variable. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-placeholders.html\">Prompt template placeholder variables</a>.</p> </li> <li> <p>In <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-multi-agent-collaboration.html\">multi-agent collaboration</a>, the <code>promptSessionAttributes</code> will only be used by supervisor agent when $prompt_session_attributes$ is present in prompt template. </p> </li> </ul>"
-        },
-        "returnControlInvocationResults":{
-          "shape":"ReturnControlInvocationResults",
-          "documentation":"<p>Contains information about the results from the action group invocation. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-returncontrol.html\">Return control to the agent developer</a> and <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html\">Control session context</a>.</p> <note> <p>If you include this field, the <code>inputText</code> field will be ignored.</p> </note>"
-        },
-        "sessionAttributes":{
-          "shape":"SessionAttributesMap",
-          "documentation":"<p>Contains attributes that persist across a session and the values of those attributes. If <code>sessionAttributes</code> are passed to a supervisor agent in <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-multi-agent-collaboration.html\">multi-agent collaboration</a>, it will be forwarded to all agent collaborators.</p>"
+        "conversationHistory":{
+          "shape":"ConversationHistory",
+          "documentation":"<p>The state's conversation history.</p>"
         }
       },
       "documentation":"<p>Contains parameters that specify various attributes that persist across a session or prompt. You can define session state attributes as key-value pairs when writing a <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-lambda.html\">Lambda function</a> for an action group or pass them when making an <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html\">InvokeAgent</a> request. Use session state attributes to control and provide conversational context for your agent and to help customize your agent's behavior. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-session-state.html\">Control session context</a>.</p>"
@@ -7433,32 +7800,32 @@
     "SessionSummary":{
       "type":"structure",
       "required":[
-        "createdAt",
-        "lastUpdatedAt",
-        "sessionArn",
         "sessionId",
-        "sessionStatus"
+        "sessionArn",
+        "sessionStatus",
+        "createdAt",
+        "lastUpdatedAt"
       ],
       "members":{
-        "createdAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp for when the session was created.</p>"
-        },
-        "lastUpdatedAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp for when the session was last modified.</p>"
+        "sessionId":{
+          "shape":"Uuid",
+          "documentation":"<p>The unique identifier for the session.</p>"
         },
         "sessionArn":{
           "shape":"SessionArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the session.</p>"
         },
-        "sessionId":{
-          "shape":"Uuid",
-          "documentation":"<p>The unique identifier for the session.</p>"
-        },
         "sessionStatus":{
           "shape":"SessionStatus",
           "documentation":"<p>The current status of the session.</p>"
+        },
+        "createdAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp for when the session was created.</p>"
+        },
+        "lastUpdatedAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp for when the session was last modified.</p>"
         }
       },
       "documentation":"<p>Contains details about a session. For more information about sessions, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/sessions.html\">Store and retrieve conversation history and context with Amazon Bedrock sessions</a>.</p>"
@@ -7481,13 +7848,13 @@
     "Span":{
       "type":"structure",
       "members":{
-        "end":{
-          "shape":"SpanEndInteger",
-          "documentation":"<p>Where the text with a citation ends in the generated output.</p>"
-        },
         "start":{
           "shape":"SpanStartInteger",
           "documentation":"<p>Where the text with a citation starts in the generated output.</p>"
+        },
+        "end":{
+          "shape":"SpanEndInteger",
+          "documentation":"<p>Where the text with a citation ends in the generated output.</p>"
         }
       },
       "documentation":"<p>Contains information about where the text with a citation begins and ends in the generated output.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_ResponseSyntax\">RetrieveAndGenerate response</a> – in the <code>span</code> field</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_ResponseSyntax\">InvokeAgent response</a> – in the <code>span</code> field</p> </li> </ul>"
@@ -7505,11 +7872,17 @@
     "StartFlowExecutionRequest":{
       "type":"structure",
       "required":[
-        "flowAliasIdentifier",
         "flowIdentifier",
+        "flowAliasIdentifier",
         "inputs"
       ],
       "members":{
+        "flowIdentifier":{
+          "shape":"FlowIdentifier",
+          "documentation":"<p>The unique identifier of the flow to execute.</p>",
+          "location":"uri",
+          "locationName":"flowIdentifier"
+        },
         "flowAliasIdentifier":{
           "shape":"FlowAliasIdentifier",
           "documentation":"<p>The unique identifier of the flow alias to use for the flow execution.</p>",
@@ -7520,12 +7893,6 @@
           "shape":"FlowExecutionName",
           "documentation":"<p>The unique name for the flow execution. If you don't provide one, a system-generated name is used.</p>"
         },
-        "flowIdentifier":{
-          "shape":"FlowIdentifier",
-          "documentation":"<p>The unique identifier of the flow to execute.</p>",
-          "location":"uri",
-          "locationName":"flowIdentifier"
-        },
         "inputs":{
           "shape":"FlowInputs",
           "documentation":"<p>The input data required for the flow execution. This must match the input schema defined in the flow.</p>"
@@ -7548,16 +7915,16 @@
     "StopFlowExecutionRequest":{
       "type":"structure",
       "required":[
-        "executionIdentifier",
+        "flowIdentifier",
         "flowAliasIdentifier",
-        "flowIdentifier"
+        "executionIdentifier"
       ],
       "members":{
-        "executionIdentifier":{
-          "shape":"FlowExecutionIdentifier",
-          "documentation":"<p>The unique identifier of the flow execution to stop.</p>",
+        "flowIdentifier":{
+          "shape":"FlowIdentifier",
+          "documentation":"<p>The unique identifier of the flow.</p>",
           "location":"uri",
-          "locationName":"executionIdentifier"
+          "locationName":"flowIdentifier"
         },
         "flowAliasIdentifier":{
           "shape":"FlowAliasIdentifier",
@@ -7565,11 +7932,11 @@
           "location":"uri",
           "locationName":"flowAliasIdentifier"
         },
-        "flowIdentifier":{
-          "shape":"FlowIdentifier",
-          "documentation":"<p>The unique identifier of the flow.</p>",
+        "executionIdentifier":{
+          "shape":"FlowExecutionIdentifier",
+          "documentation":"<p>The unique identifier of the flow execution to stop.</p>",
           "location":"uri",
-          "locationName":"flowIdentifier"
+          "locationName":"executionIdentifier"
         }
       }
     },
@@ -7596,13 +7963,13 @@
     "StreamingConfigurations":{
       "type":"structure",
       "members":{
-        "applyGuardrailInterval":{
-          "shape":"StreamingConfigurationsApplyGuardrailIntervalInteger",
-          "documentation":"<p> The guardrail interval to apply as response is generated. By default, the guardrail interval is set to 50 characters. If a larger interval is specified, the response will be generated in larger chunks with fewer <code>ApplyGuardrail</code> calls. The following examples show the response generated for <i>Hello, I am an agent</i> input string.</p> <p> <b>Example response in chunks: Interval set to 3 characters</b> </p> <p> <code>'Hel', 'lo, ','I am', ' an', ' Age', 'nt'</code> </p> <p>Each chunk has at least 3 characters except for the last chunk</p> <p> <b>Example response in chunks: Interval set to 20 or more characters</b> </p> <p> <code>Hello, I am an Agent</code> </p>"
-        },
         "streamFinalResponse":{
           "shape":"Boolean",
           "documentation":"<p> Specifies whether to enable streaming for the final response. This is set to <code>false</code> by default. </p>"
+        },
+        "applyGuardrailInterval":{
+          "shape":"StreamingConfigurationsApplyGuardrailIntervalInteger",
+          "documentation":"<p> The guardrail interval to apply as response is generated. By default, the guardrail interval is set to 50 characters. If a larger interval is specified, the response will be generated in larger chunks with fewer <code>ApplyGuardrail</code> calls. The following examples show the response generated for <i>Hello, I am an agent</i> input string.</p> <p> <b>Example response in chunks: Interval set to 3 characters</b> </p> <p> <code>'Hel', 'lo, ','I am', ' an', ' Age', 'nt'</code> </p> <p>Each chunk has at least 3 characters except for the last chunk</p> <p> <b>Example response in chunks: Interval set to 20 or more characters</b> </p> <p> <code>Hello, I am an Agent</code> </p>"
         }
       },
       "documentation":"<p>Configurations for streaming.</p>"
@@ -7627,7 +7994,7 @@
       "documentation":"<p>Key of a tag</p>",
       "max":128,
       "min":1,
-      "pattern":"^[a-zA-Z0-9\\s._:/=+@-]*$"
+      "pattern":"[a-zA-Z0-9\\s._:/=+@-]*"
     },
     "TagKeyList":{
       "type":"list",
@@ -7657,22 +8024,21 @@
     },
     "TagResourceResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "TagValue":{
       "type":"string",
       "documentation":"<p>Value of a tag</p>",
       "max":256,
       "min":0,
-      "pattern":"^[a-zA-Z0-9\\s._:/=+@-]*$"
+      "pattern":"[a-zA-Z0-9\\s._:/=+@-]*"
     },
     "TaggableResourcesArn":{
       "type":"string",
       "documentation":"<p>ARN of Taggable resources: [session]</p>",
       "max":1011,
       "min":20,
-      "pattern":"(^arn:aws(-[^:]+)?:bedrock:[a-zA-Z0-9-]+:[0-9]{12}:(session)/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$)"
+      "pattern":".*(^arn:aws(-[^:]+)?:bedrock:[a-zA-Z0-9-]+:[0-9]{12}:(session)/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$).*"
     },
     "TagsMap":{
       "type":"map",
@@ -7691,14 +8057,6 @@
     "TextInferenceConfig":{
       "type":"structure",
       "members":{
-        "maxTokens":{
-          "shape":"MaxTokens",
-          "documentation":"<p>The maximum number of tokens to generate in the output text. Do not use the minimum of 0 or the maximum of 65536. The limit values described here are arbitary values, for actual values consult the limits defined by your specific model.</p>"
-        },
-        "stopSequences":{
-          "shape":"RAGStopSequences",
-          "documentation":"<p>A list of sequences of characters that, if generated, will cause the model to stop generating further tokens. Do not use a minimum length of 1 or a maximum length of 1000. The limit values described here are arbitary values, for actual values consult the limits defined by your specific model.</p>"
-        },
         "temperature":{
           "shape":"Temperature",
           "documentation":"<p> Controls the random-ness of text generated by the language model, influencing how much the model sticks to the most predictable next words versus exploring more surprising options. A lower temperature value (e.g. 0.2 or 0.3) makes model outputs more deterministic or predictable, while a higher temperature (e.g. 0.8 or 0.9) makes the outputs more creative or unpredictable. </p>"
@@ -7706,6 +8064,14 @@
         "topP":{
           "shape":"TopP",
           "documentation":"<p> A probability distribution threshold which controls what the model considers for the set of possible next tokens. The model will only consider the top p% of the probability distribution when generating the next token. </p>"
+        },
+        "maxTokens":{
+          "shape":"MaxTokens",
+          "documentation":"<p>The maximum number of tokens to generate in the output text. Do not use the minimum of 0 or the maximum of 65536. The limit values described here are arbitary values, for actual values consult the limits defined by your specific model.</p>"
+        },
+        "stopSequences":{
+          "shape":"RAGStopSequences",
+          "documentation":"<p>A list of sequences of characters that, if generated, will cause the model to stop generating further tokens. Do not use a minimum length of 1 or a maximum length of 1000. The limit values described here are arbitary values, for actual values consult the limits defined by your specific model.</p>"
         }
       },
       "documentation":"<p>Configuration settings for text generation using a language model via the RetrieveAndGenerate operation. Includes parameters like temperature, top-p, maximum token count, and stop sequences. </p> <note> <p>The valid range of <code>maxTokens</code> depends on the accepted values for your chosen model's inference parameters. To see the inference parameters for your model, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters.html\">Inference parameters for foundation models.</a> </p> </note>"
@@ -7736,13 +8102,13 @@
     "TextResponsePart":{
       "type":"structure",
       "members":{
-        "span":{
-          "shape":"Span",
-          "documentation":"<p>Contains information about where the text with a citation begins and ends in the generated output.</p>"
-        },
         "text":{
           "shape":"String",
           "documentation":"<p>The part of the generated text that contains a citation.</p>"
+        },
+        "span":{
+          "shape":"Span",
+          "documentation":"<p>Contains information about where the text with a citation begins and ends in the generated output.</p>"
         }
       },
       "documentation":"<p>Contains the part of the generated text that contains a citation, alongside where it begins and ends.</p> <p>This data type is used in the following API operations:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_RetrieveAndGenerate.html#API_agent-runtime_RetrieveAndGenerate_ResponseSyntax\">RetrieveAndGenerate response</a> – in the <code>textResponsePart</code> field</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_agent-runtime_InvokeAgent.html#API_agent-runtime_InvokeAgent_ResponseSyntax\">InvokeAgent response</a> – in the <code>textResponsePart</code> field</p> </li> </ul>",
@@ -7752,13 +8118,13 @@
       "type":"structure",
       "required":["type"],
       "members":{
-        "knowledgeBaseConfiguration":{
-          "shape":"TextToSqlKnowledgeBaseConfiguration",
-          "documentation":"<p>Specifies configurations for a knowledge base to use in transformation.</p>"
-        },
         "type":{
           "shape":"TextToSqlConfigurationType",
           "documentation":"<p>The type of resource to use in transformation.</p>"
+        },
+        "knowledgeBaseConfiguration":{
+          "shape":"TextToSqlKnowledgeBaseConfiguration",
+          "documentation":"<p>Specifies configurations for a knowledge base to use in transformation.</p>"
         }
       },
       "documentation":"<p>Contains configurations for transforming text to SQL.</p>"
@@ -7805,18 +8171,14 @@
     "Trace":{
       "type":"structure",
       "members":{
-        "customOrchestrationTrace":{
-          "shape":"CustomOrchestrationTrace",
-          "documentation":"<p> Details about the custom orchestration step in which the agent determines the order in which actions are executed. </p>"
-        },
-        "failureTrace":{
-          "shape":"FailureTrace",
-          "documentation":"<p>Contains information about the failure of the interaction.</p>"
-        },
         "guardrailTrace":{
           "shape":"GuardrailTrace",
           "documentation":"<p>The trace details for a trace defined in the Guardrail filter.</p>"
         },
+        "preProcessingTrace":{
+          "shape":"PreProcessingTrace",
+          "documentation":"<p>Details about the pre-processing step, in which the agent contextualizes and categorizes user inputs.</p>"
+        },
         "orchestrationTrace":{
           "shape":"OrchestrationTrace",
           "documentation":"<p>Details about the orchestration step, in which the agent determines the order in which actions are executed and which knowledge bases are retrieved.</p>"
@@ -7825,19 +8187,35 @@
           "shape":"PostProcessingTrace",
           "documentation":"<p>Details about the post-processing step, in which the agent shapes the response..</p>"
         },
-        "preProcessingTrace":{
-          "shape":"PreProcessingTrace",
-          "documentation":"<p>Details about the pre-processing step, in which the agent contextualizes and categorizes user inputs.</p>"
-        },
         "routingClassifierTrace":{
           "shape":"RoutingClassifierTrace",
           "documentation":"<p>A routing classifier's trace.</p>"
+        },
+        "failureTrace":{
+          "shape":"FailureTrace",
+          "documentation":"<p>Contains information about the failure of the interaction.</p>"
+        },
+        "customOrchestrationTrace":{
+          "shape":"CustomOrchestrationTrace",
+          "documentation":"<p> Details about the custom orchestration step in which the agent determines the order in which actions are executed. </p>"
         }
       },
       "documentation":"<p>Contains one part of the agent's reasoning process and results from calling API actions and querying knowledge bases. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-test.html#trace-enablement\">Trace enablement</a>.</p>",
       "sensitive":true,
       "union":true
     },
+    "TraceElements":{
+      "type":"structure",
+      "members":{
+        "agentTraces":{
+          "shape":"AgentTraces",
+          "documentation":"<p>Agent trace information for the flow execution.</p>"
+        }
+      },
+      "documentation":"<p>Contains trace elements for flow execution tracking.</p>",
+      "sensitive":true,
+      "union":true
+    },
     "TraceId":{
       "type":"string",
       "max":16,
@@ -7850,37 +8228,37 @@
     "TracePart":{
       "type":"structure",
       "members":{
-        "agentAliasId":{
-          "shape":"AgentAliasId",
-          "documentation":"<p>The unique identifier of the alias of the agent.</p>"
-        },
-        "agentId":{
-          "shape":"AgentId",
-          "documentation":"<p>The unique identifier of the agent.</p>"
+        "sessionId":{
+          "shape":"SessionId",
+          "documentation":"<p>The unique identifier of the session with the agent.</p>"
         },
-        "agentVersion":{
-          "shape":"AgentVersion",
-          "documentation":"<p>The version of the agent.</p>"
+        "trace":{
+          "shape":"Trace",
+          "documentation":"<p>Contains one part of the agent's reasoning process and results from calling API actions and querying knowledge bases. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-test.html#trace-enablement\">Trace enablement</a>.</p>"
         },
         "callerChain":{
           "shape":"CallerChain",
           "documentation":"<p>The part's caller chain.</p>"
         },
+        "eventTime":{
+          "shape":"SyntheticTimestamp_date_time",
+          "documentation":"<p> The time of the trace. </p>"
+        },
         "collaboratorName":{
           "shape":"Name",
           "documentation":"<p>The part's collaborator name.</p>"
         },
-        "eventTime":{
-          "shape":"SyntheticTimestamp_date_time",
-          "documentation":"<p> The time of the trace. </p>"
+        "agentId":{
+          "shape":"AgentId",
+          "documentation":"<p>The unique identifier of the agent.</p>"
         },
-        "sessionId":{
-          "shape":"SessionId",
-          "documentation":"<p>The unique identifier of the session with the agent.</p>"
+        "agentAliasId":{
+          "shape":"AgentAliasId",
+          "documentation":"<p>The unique identifier of the alias of the agent.</p>"
         },
-        "trace":{
-          "shape":"Trace",
-          "documentation":"<p>Contains one part of the agent's reasoning process and results from calling API actions and querying knowledge bases. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-test.html#trace-enablement\">Trace enablement</a>.</p>"
+        "agentVersion":{
+          "shape":"AgentVersion",
+          "documentation":"<p>The version of the agent.</p>"
         }
       },
       "documentation":"<p>Contains information about the agent and session, alongside the agent's reasoning process and results from calling API actions and querying knowledge bases and metadata about the trace. You can use the trace to understand how the agent arrived at the response it provided the customer. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/agents-test.html#trace-enablement\">Trace enablement</a>.</p>",
@@ -7936,54 +8314,53 @@
     },
     "UntagResourceResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "UpdateSessionRequest":{
       "type":"structure",
       "required":["sessionIdentifier"],
       "members":{
+        "sessionMetadata":{
+          "shape":"SessionMetadataMap",
+          "documentation":"<p>A map of key-value pairs containing attributes to be persisted across the session. For example the user's ID, their language preference, and the type of device they are using.</p>"
+        },
         "sessionIdentifier":{
           "shape":"SessionIdentifier",
           "documentation":"<p>The unique identifier of the session to modify. You can specify either the session's <code>sessionId</code> or its Amazon Resource Name (ARN).</p>",
           "location":"uri",
           "locationName":"sessionIdentifier"
-        },
-        "sessionMetadata":{
-          "shape":"SessionMetadataMap",
-          "documentation":"<p>A map of key-value pairs containing attributes to be persisted across the session. For example the user's ID, their language preference, and the type of device they are using.</p>"
         }
       }
     },
     "UpdateSessionResponse":{
       "type":"structure",
       "required":[
-        "createdAt",
-        "lastUpdatedAt",
-        "sessionArn",
         "sessionId",
-        "sessionStatus"
+        "sessionArn",
+        "sessionStatus",
+        "createdAt",
+        "lastUpdatedAt"
       ],
       "members":{
-        "createdAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp for when the session was created.</p>"
-        },
-        "lastUpdatedAt":{
-          "shape":"DateTimestamp",
-          "documentation":"<p>The timestamp for when the session was last modified.</p>"
+        "sessionId":{
+          "shape":"Uuid",
+          "documentation":"<p>The unique identifier of the session you updated.</p>"
         },
         "sessionArn":{
           "shape":"SessionArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the session that was updated.</p>"
         },
-        "sessionId":{
-          "shape":"Uuid",
-          "documentation":"<p>The unique identifier of the session you updated.</p>"
-        },
         "sessionStatus":{
           "shape":"SessionStatus",
           "documentation":"<p>The status of the session you updated.</p>"
+        },
+        "createdAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp for when the session was created.</p>"
+        },
+        "lastUpdatedAt":{
+          "shape":"DateTimestamp",
+          "documentation":"<p>The timestamp for when the session was last modified.</p>"
         }
       }
     },
@@ -8004,7 +8381,7 @@
     },
     "Uuid":{
       "type":"string",
-      "pattern":"^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
+      "pattern":"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"
     },
     "ValidationException":{
       "type":"structure",
@@ -8022,10 +8399,6 @@
       "type":"structure",
       "required":["modelConfiguration"],
       "members":{
-        "metadataConfiguration":{
-          "shape":"MetadataConfigurationForReranking",
-          "documentation":"<p>Contains configurations for the metadata to use in reranking.</p>"
-        },
         "modelConfiguration":{
           "shape":"VectorSearchBedrockRerankingModelConfiguration",
           "documentation":"<p>Contains configurations for the reranker model.</p>"
@@ -8033,6 +8406,10 @@
         "numberOfRerankedResults":{
           "shape":"VectorSearchBedrockRerankingConfigurationNumberOfRerankedResultsInteger",
           "documentation":"<p>The number of results to return after reranking.</p>"
+        },
+        "metadataConfiguration":{
+          "shape":"MetadataConfigurationForReranking",
+          "documentation":"<p>Contains configurations for the metadata to use in reranking.</p>"
         }
       },
       "documentation":"<p>Contains configurations for reranking with an Amazon Bedrock reranker model.</p>"
@@ -8047,13 +8424,13 @@
       "type":"structure",
       "required":["modelArn"],
       "members":{
-        "additionalModelRequestFields":{
-          "shape":"AdditionalModelRequestFields",
-          "documentation":"<p>A JSON object whose keys are request fields for the model and whose values are values for those fields.</p>"
-        },
         "modelArn":{
           "shape":"BedrockRerankingModelArn",
           "documentation":"<p>The ARN of the reranker model to use.</p>"
+        },
+        "additionalModelRequestFields":{
+          "shape":"AdditionalModelRequestFields",
+          "documentation":"<p>A JSON object whose keys are request fields for the model and whose values are values for those fields.</p>"
         }
       },
       "documentation":"<p>Contains configurations for an Amazon Bedrock reranker model.</p>"
@@ -8062,13 +8439,13 @@
       "type":"structure",
       "required":["type"],
       "members":{
-        "bedrockRerankingConfiguration":{
-          "shape":"VectorSearchBedrockRerankingConfiguration",
-          "documentation":"<p>Contains configurations for an Amazon Bedrock reranker model.</p>"
-        },
         "type":{
           "shape":"VectorSearchRerankingConfigurationType",
           "documentation":"<p>The type of reranker model.</p>"
+        },
+        "bedrockRerankingConfiguration":{
+          "shape":"VectorSearchBedrockRerankingConfiguration",
+          "documentation":"<p>Contains configurations for an Amazon Bedrock reranker model.</p>"
         }
       },
       "documentation":"<p>Contains configurations for reranking the retrieved results.</p>"
@@ -8085,7 +8462,7 @@
       "type":"string",
       "max":5,
       "min":1,
-      "pattern":"^(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})$"
+      "pattern":"(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})"
     }
   },
   "documentation":"<p>Contains APIs related to model invocation and querying of knowledge bases.</p>"
diff --git a/services/bedrockagentruntime/src/main/resources/codegen-resources/waiters-2.json b/services/bedrockagentruntime/src/main/resources/codegen-resources/waiters-2.json
new file mode 100644
index 000000000000..13f60ee66be6
--- /dev/null
+++ b/services/bedrockagentruntime/src/main/resources/codegen-resources/waiters-2.json
@@ -0,0 +1,5 @@
+{
+  "version": 2,
+  "waiters": {
+  }
+}
diff --git a/services/bedrockdataautomation/pom.xml b/services/bedrockdataautomation/pom.xml
index a6114816ba19..a2b9a413fd18 100644
--- a/services/bedrockdataautomation/pom.xml
+++ b/services/bedrockdataautomation/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bedrockdataautomation</artifactId>
     <name>AWS Java SDK :: Services :: Bedrock Data Automation</name>
diff --git a/services/bedrockdataautomation/src/main/resources/codegen-resources/service-2.json b/services/bedrockdataautomation/src/main/resources/codegen-resources/service-2.json
index 5324676bac64..4e7ee19e2698 100644
--- a/services/bedrockdataautomation/src/main/resources/codegen-resources/service-2.json
+++ b/services/bedrockdataautomation/src/main/resources/codegen-resources/service-2.json
@@ -298,7 +298,8 @@
       "required":["state"],
       "members":{
         "state":{"shape":"State"},
-        "types":{"shape":"AudioExtractionCategoryTypes"}
+        "types":{"shape":"AudioExtractionCategoryTypes"},
+        "typeConfiguration":{"shape":"AudioExtractionCategoryTypeConfiguration"}
       },
       "documentation":"<p>Category of Audio Extraction</p>"
     },
@@ -310,6 +311,13 @@
         "TOPIC_CONTENT_MODERATION"
       ]
     },
+    "AudioExtractionCategoryTypeConfiguration":{
+      "type":"structure",
+      "members":{
+        "transcript":{"shape":"TranscriptConfiguration"}
+      },
+      "documentation":"<p>Configuration for different audio extraction category types</p>"
+    },
     "AudioExtractionCategoryTypes":{
       "type":"list",
       "member":{"shape":"AudioExtractionCategoryType"},
@@ -476,6 +484,14 @@
       "member":{"shape":"BlueprintSummary"},
       "documentation":"<p>List of Blueprints</p>"
     },
+    "ChannelLabelingConfiguration":{
+      "type":"structure",
+      "required":["state"],
+      "members":{
+        "state":{"shape":"State"}
+      },
+      "documentation":"<p>Channel labeling configuration</p>"
+    },
     "ClientToken":{
       "type":"string",
       "documentation":"<p>Client specified token used for idempotency checks</p>",
@@ -715,8 +731,7 @@
     },
     "DeleteBlueprintResponse":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "documentation":"<p>Delete Blueprint Response</p>"
     },
     "DeleteDataAutomationProjectRequest":{
@@ -1171,6 +1186,14 @@
       },
       "exception":true
     },
+    "SpeakerLabelingConfiguration":{
+      "type":"structure",
+      "required":["state"],
+      "members":{
+        "state":{"shape":"State"}
+      },
+      "documentation":"<p>Speaker labeling configuration</p>"
+    },
     "SplitterConfiguration":{
       "type":"structure",
       "members":{
@@ -1241,8 +1264,7 @@
     },
     "TagResourceResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "TagValue":{
       "type":"string",
@@ -1269,6 +1291,14 @@
       },
       "exception":true
     },
+    "TranscriptConfiguration":{
+      "type":"structure",
+      "members":{
+        "speakerLabeling":{"shape":"SpeakerLabelingConfiguration"},
+        "channelLabeling":{"shape":"ChannelLabelingConfiguration"}
+      },
+      "documentation":"<p>Configuration for transcript related features</p>"
+    },
     "Type":{
       "type":"string",
       "documentation":"<p>Type</p>",
@@ -1292,8 +1322,7 @@
     },
     "UntagResourceResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "UpdateBlueprintRequest":{
       "type":"structure",
diff --git a/services/bedrockdataautomationruntime/pom.xml b/services/bedrockdataautomationruntime/pom.xml
index f2e23cd8a3cd..08e6bb023938 100644
--- a/services/bedrockdataautomationruntime/pom.xml
+++ b/services/bedrockdataautomationruntime/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bedrockdataautomationruntime</artifactId>
     <name>AWS Java SDK :: Services :: Bedrock Data Automation Runtime</name>
diff --git a/services/bedrockruntime/pom.xml b/services/bedrockruntime/pom.xml
index 7ad8643bec3a..4a9d90e78582 100644
--- a/services/bedrockruntime/pom.xml
+++ b/services/bedrockruntime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>bedrockruntime</artifactId>
     <name>AWS Java SDK :: Services :: Bedrock Runtime</name>
diff --git a/services/billing/pom.xml b/services/billing/pom.xml
index 98590d214e8b..bd944ef0b80f 100644
--- a/services/billing/pom.xml
+++ b/services/billing/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>billing</artifactId>
     <name>AWS Java SDK :: Services :: Billing</name>
diff --git a/services/billing/src/main/resources/codegen-resources/service-2.json b/services/billing/src/main/resources/codegen-resources/service-2.json
index 96dc616bb655..3b6d27447b25 100644
--- a/services/billing/src/main/resources/codegen-resources/service-2.json
+++ b/services/billing/src/main/resources/codegen-resources/service-2.json
@@ -15,6 +15,27 @@
     "uid":"billing-2023-09-07"
   },
   "operations":{
+    "AssociateSourceViews":{
+      "name":"AssociateSourceViews",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AssociateSourceViewsRequest"},
+      "output":{"shape":"AssociateSourceViewsResponse"},
+      "errors":[
+        {"shape":"BillingViewHealthStatusException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p> Associates one or more source billing views with an existing billing view. This allows creating aggregate billing views that combine data from multiple sources. </p>",
+      "idempotent":true
+    },
     "CreateBillingView":{
       "name":"CreateBillingView",
       "http":{
@@ -24,8 +45,10 @@
       "input":{"shape":"CreateBillingViewRequest"},
       "output":{"shape":"CreateBillingViewResponse"},
       "errors":[
+        {"shape":"BillingViewHealthStatusException"},
         {"shape":"ServiceQuotaExceededException"},
         {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
         {"shape":"AccessDeniedException"},
         {"shape":"ConflictException"},
         {"shape":"ValidationException"},
@@ -52,6 +75,26 @@
       "documentation":"<p>Deletes the specified billing view.</p>",
       "idempotent":true
     },
+    "DisassociateSourceViews":{
+      "name":"DisassociateSourceViews",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisassociateSourceViewsRequest"},
+      "output":{"shape":"DisassociateSourceViewsResponse"},
+      "errors":[
+        {"shape":"BillingViewHealthStatusException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p> Removes the association between one or more source billing views and an existing billing view. This allows modifying the composition of aggregate billing views. </p>",
+      "idempotent":true
+    },
     "GetBillingView":{
       "name":"GetBillingView",
       "http":{
@@ -67,7 +110,8 @@
         {"shape":"ValidationException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Returns the metadata associated to the specified billing view ARN. </p>"
+      "documentation":"<p>Returns the metadata associated to the specified billing view ARN. </p>",
+      "readonly":true
     },
     "GetResourcePolicy":{
       "name":"GetResourcePolicy",
@@ -84,7 +128,8 @@
         {"shape":"ValidationException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Returns the resource-based policy document attached to the resource in <code>JSON</code> format. </p>"
+      "documentation":"<p>Returns the resource-based policy document attached to the resource in <code>JSON</code> format. </p>",
+      "readonly":true
     },
     "ListBillingViews":{
       "name":"ListBillingViews",
@@ -100,7 +145,8 @@
         {"shape":"ValidationException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists the billing views available for a given time period. </p> <p>Every Amazon Web Services account has a unique <code>PRIMARY</code> billing view that represents the billing data available by default. Accounts that use Billing Conductor also have <code>BILLING_GROUP</code> billing views representing pro forma costs associated with each created billing group.</p>"
+      "documentation":"<p>Lists the billing views available for a given time period. </p> <p>Every Amazon Web Services account has a unique <code>PRIMARY</code> billing view that represents the billing data available by default. Accounts that use Billing Conductor also have <code>BILLING_GROUP</code> billing views representing pro forma costs associated with each created billing group.</p>",
+      "readonly":true
     },
     "ListSourceViewsForBillingView":{
       "name":"ListSourceViewsForBillingView",
@@ -117,7 +163,8 @@
         {"shape":"ValidationException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists the source views (managed Amazon Web Services billing views) associated with the billing view. </p>"
+      "documentation":"<p>Lists the source views (managed Amazon Web Services billing views) associated with the billing view. </p>",
+      "readonly":true
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -134,7 +181,8 @@
         {"shape":"ValidationException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists tags associated with the billing view resource. </p>"
+      "documentation":"<p>Lists tags associated with the billing view resource. </p>",
+      "readonly":true
     },
     "TagResource":{
       "name":"TagResource",
@@ -179,6 +227,7 @@
       "input":{"shape":"UpdateBillingViewRequest"},
       "output":{"shape":"UpdateBillingViewResponse"},
       "errors":[
+        {"shape":"BillingViewHealthStatusException"},
         {"shape":"ServiceQuotaExceededException"},
         {"shape":"ThrottlingException"},
         {"shape":"ResourceNotFoundException"},
@@ -223,9 +272,36 @@
       },
       "documentation":"<p>A time range with a start and end time.</p>"
     },
+    "AssociateSourceViewsRequest":{
+      "type":"structure",
+      "required":[
+        "arn",
+        "sourceViews"
+      ],
+      "members":{
+        "arn":{
+          "shape":"BillingViewArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the billing view to associate source views with. </p>"
+        },
+        "sourceViews":{
+          "shape":"BillingViewSourceViewsList",
+          "documentation":"<p> A list of ARNs of the source billing views to associate. </p>"
+        }
+      }
+    },
+    "AssociateSourceViewsResponse":{
+      "type":"structure",
+      "required":["arn"],
+      "members":{
+        "arn":{
+          "shape":"BillingViewArn",
+          "documentation":"<p> The ARN of the billing view that the source views were associated with. </p>"
+        }
+      }
+    },
     "BillingViewArn":{
       "type":"string",
-      "pattern":"arn:aws[a-z-]*:(billing)::[0-9]{12}:billingview/[a-zA-Z0-9/:_\\+=\\.\\-@]{0,59}[a-zA-Z0-9]"
+      "pattern":"arn:aws[a-z-]*:(billing)::[0-9]{12}:billingview/[a-zA-Z0-9/:_\\+=\\.\\-@]{0,75}[a-zA-Z0-9]"
     },
     "BillingViewArnList":{
       "type":"list",
@@ -263,6 +339,10 @@
           "shape":"AccountId",
           "documentation":"<p>The account owner of the billing view. </p>"
         },
+        "sourceAccountId":{
+          "shape":"AccountId",
+          "documentation":"<p> The Amazon Web Services account ID that owns the source billing view, if this is a derived billing view. </p>"
+        },
         "dataFilterExpression":{
           "shape":"Expression",
           "documentation":"<p> See <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_billing_Expression.html\">Expression</a>. Billing view only supports <code>LINKED_ACCOUNT</code> and <code>Tags</code>. </p>"
@@ -274,10 +354,49 @@
         "updatedAt":{
           "shape":"Timestamp",
           "documentation":"<p>The time when the billing view was last updated. </p>"
+        },
+        "derivedViewCount":{
+          "shape":"Integer",
+          "documentation":"<p> The number of billing views that use this billing view as a source. </p>"
+        },
+        "sourceViewCount":{
+          "shape":"Integer",
+          "documentation":"<p> The number of source views associated with this billing view. </p>"
+        },
+        "viewDefinitionLastUpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p> The timestamp of when the billing view definition was last updated. </p>"
+        },
+        "healthStatus":{
+          "shape":"BillingViewHealthStatus",
+          "documentation":"<p> The current health status of the billing view. </p>"
         }
       },
       "documentation":"<p>The metadata associated to the billing view. </p>"
     },
+    "BillingViewHealthStatus":{
+      "type":"structure",
+      "members":{
+        "statusCode":{
+          "shape":"BillingViewStatus",
+          "documentation":"<p>The current health status code of the billing view.</p>"
+        },
+        "statusReasons":{
+          "shape":"BillingViewStatusReasons",
+          "documentation":"<p>A list of reasons explaining the current health status, if applicable.</p>"
+        }
+      },
+      "documentation":"<p> Represents the health status of a billing view, including a status code and optional reasons for the status. </p>"
+    },
+    "BillingViewHealthStatusException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p> Exception thrown when a billing view's health status prevents an operation from being performed. This may occur if the billing view is in a state other than <code>HEALTHY</code>.</p>",
+      "exception":true
+    },
     "BillingViewList":{
       "type":"list",
       "member":{"shape":"BillingViewListElement"}
@@ -301,9 +420,17 @@
           "shape":"AccountId",
           "documentation":"<p> The list of owners of the Billing view. </p>"
         },
+        "sourceAccountId":{
+          "shape":"AccountId",
+          "documentation":"<p> The Amazon Web Services account ID that owns the source billing view, if this is a derived billing view. </p>"
+        },
         "billingViewType":{
           "shape":"BillingViewType",
           "documentation":"<p>The type of billing view.</p>"
+        },
+        "healthStatus":{
+          "shape":"BillingViewHealthStatus",
+          "documentation":"<p> The current health status of the billing view. </p>"
         }
       },
       "documentation":"<p>A representation of a billing view.</p>"
@@ -318,9 +445,35 @@
     "BillingViewSourceViewsList":{
       "type":"list",
       "member":{"shape":"BillingViewArn"},
-      "max":1,
+      "max":10,
       "min":1
     },
+    "BillingViewStatus":{
+      "type":"string",
+      "enum":[
+        "HEALTHY",
+        "UNHEALTHY",
+        "CREATING",
+        "UPDATING"
+      ]
+    },
+    "BillingViewStatusReason":{
+      "type":"string",
+      "enum":[
+        "SOURCE_VIEW_UNHEALTHY",
+        "SOURCE_VIEW_UPDATING",
+        "SOURCE_VIEW_ACCESS_DENIED",
+        "SOURCE_VIEW_NOT_FOUND",
+        "CYCLIC_DEPENDENCY",
+        "SOURCE_VIEW_DEPTH_EXCEEDED",
+        "AGGREGATE_SOURCE",
+        "VIEW_OWNER_NOT_MANAGEMENT_ACCOUNT"
+      ]
+    },
+    "BillingViewStatusReasons":{
+      "type":"list",
+      "member":{"shape":"BillingViewStatusReason"}
+    },
     "BillingViewType":{
       "type":"string",
       "enum":[
@@ -339,6 +492,10 @@
       "max":100,
       "min":1
     },
+    "Boolean":{
+      "type":"boolean",
+      "box":true
+    },
     "ClientToken":{
       "type":"string",
       "pattern":"[a-zA-Z0-9-]+"
@@ -419,6 +576,10 @@
         "arn":{
           "shape":"BillingViewArn",
           "documentation":"<p> The Amazon Resource Name (ARN) that can be used to uniquely identify the billing view. </p>"
+        },
+        "force":{
+          "shape":"Boolean",
+          "documentation":"<p> If set to true, forces deletion of the billing view even if it has derived resources (e.g. other billing views or budgets). Use with caution as this may break dependent resources. </p>"
         }
       }
     },
@@ -454,6 +615,33 @@
       },
       "documentation":"<p> The metadata that you can use to filter and group your results. </p>"
     },
+    "DisassociateSourceViewsRequest":{
+      "type":"structure",
+      "required":[
+        "arn",
+        "sourceViews"
+      ],
+      "members":{
+        "arn":{
+          "shape":"BillingViewArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the billing view to disassociate source views from. </p>"
+        },
+        "sourceViews":{
+          "shape":"BillingViewSourceViewsList",
+          "documentation":"<p> A list of ARNs of the source billing views to disassociate. </p>"
+        }
+      }
+    },
+    "DisassociateSourceViewsResponse":{
+      "type":"structure",
+      "required":["arn"],
+      "members":{
+        "arn":{
+          "shape":"BillingViewArn",
+          "documentation":"<p> The ARN of the billing view that the source views were disassociated from. </p>"
+        }
+      }
+    },
     "ErrorMessage":{
       "type":"string",
       "max":1024,
@@ -469,6 +657,10 @@
         "tags":{
           "shape":"TagValues",
           "documentation":"<p> The specific <code>Tag</code> to use for <code>Expression</code>. </p>"
+        },
+        "timeRange":{
+          "shape":"TimeRange",
+          "documentation":"<p> Specifies a time range filter for the billing view data. </p>"
         }
       },
       "documentation":"<p> See <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_billing_Expression.html\">Expression</a>. Billing view only supports <code>LINKED_ACCOUNT</code> and <code>Tags</code>. </p>"
@@ -522,6 +714,10 @@
         }
       }
     },
+    "Integer":{
+      "type":"integer",
+      "box":true
+    },
     "InternalServerException":{
       "type":"structure",
       "required":["message"],
@@ -551,6 +747,10 @@
           "shape":"AccountId",
           "documentation":"<p> The list of owners of the billing view. </p>"
         },
+        "sourceAccountId":{
+          "shape":"AccountId",
+          "documentation":"<p> Filters the results to include only billing views that use the specified account as a source. </p>"
+        },
         "maxResults":{
           "shape":"BillingViewsMaxResults",
           "documentation":"<p>The maximum number of billing views to retrieve. Default is 100. </p>"
@@ -799,6 +999,20 @@
       "documentation":"<p>The request was denied due to request throttling. </p>",
       "exception":true
     },
+    "TimeRange":{
+      "type":"structure",
+      "members":{
+        "beginDateInclusive":{
+          "shape":"Timestamp",
+          "documentation":"<p> The inclusive start date of the time range. </p>"
+        },
+        "endDateInclusive":{
+          "shape":"Timestamp",
+          "documentation":"<p> The inclusive end date of the time range. </p>"
+        }
+      },
+      "documentation":"<p> Specifies a time range with inclusive begin and end dates. </p>"
+    },
     "Timestamp":{"type":"timestamp"},
     "UntagResourceRequest":{
       "type":"structure",
diff --git a/services/billingconductor/pom.xml b/services/billingconductor/pom.xml
index bbdb27d35d91..22641ed778aa 100644
--- a/services/billingconductor/pom.xml
+++ b/services/billingconductor/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>billingconductor</artifactId>
     <name>AWS Java SDK :: Services :: Billingconductor</name>
diff --git a/services/braket/pom.xml b/services/braket/pom.xml
index fce76519f81e..3831fbfe0adc 100644
--- a/services/braket/pom.xml
+++ b/services/braket/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>braket</artifactId>
     <name>AWS Java SDK :: Services :: Braket</name>
diff --git a/services/budgets/pom.xml b/services/budgets/pom.xml
index 24fdbe7fba45..4ae3c07bbd99 100644
--- a/services/budgets/pom.xml
+++ b/services/budgets/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>budgets</artifactId>
     <name>AWS Java SDK :: Services :: AWS Budgets</name>
diff --git a/services/budgets/src/main/resources/codegen-resources/service-2.json b/services/budgets/src/main/resources/codegen-resources/service-2.json
index 5b6f1f23decb..1b1c9337596d 100644
--- a/services/budgets/src/main/resources/codegen-resources/service-2.json
+++ b/services/budgets/src/main/resources/codegen-resources/service-2.json
@@ -25,6 +25,7 @@
       "output":{"shape":"CreateBudgetResponse"},
       "errors":[
         {"shape":"InvalidParameterException"},
+        {"shape":"BillingViewHealthStatusException"},
         {"shape":"InternalErrorException"},
         {"shape":"CreationLimitExceededException"},
         {"shape":"DuplicateRecordException"},
@@ -425,6 +426,7 @@
       "errors":[
         {"shape":"InternalErrorException"},
         {"shape":"InvalidParameterException"},
+        {"shape":"BillingViewHealthStatusException"},
         {"shape":"NotFoundException"},
         {"shape":"AccessDeniedException"},
         {"shape":"ThrottlingException"}
@@ -699,7 +701,15 @@
       "type":"string",
       "max":2048,
       "min":20,
-      "pattern":"^arn:aws[a-z-]*:(billing)::[0-9]{12}:billingview/[a-zA-Z0-9/:_+=.\\-@]{0,75}[a-zA-Z0-9]$"
+      "pattern":"^arn:aws[a-z-]*:(billing)::[0-9]{12}:billingview/[a-zA-Z0-9/:_\\+=\\.\\-@]{0,75}[a-zA-Z0-9]$"
+    },
+    "BillingViewHealthStatusException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"errorMessage"}
+      },
+      "documentation":"<p> The billing view status must be HEALTHY to perform this action. Try again when the status is HEALTHY. </p>",
+      "exception":true
     },
     "Budget":{
       "type":"structure",
@@ -741,7 +751,7 @@
         },
         "TimePeriod":{
           "shape":"TimePeriod",
-          "documentation":"<p>The period of time that's covered by a budget. You set the start date and end date. The start date must come before the end date. The end date must come before <code>06/15/87 00:00 UTC</code>. </p> <p>If you create your budget and don't specify a start date, Amazon Web Services defaults to the start of your chosen time period (DAILY, MONTHLY, QUARTERLY, or ANNUALLY). For example, if you created your budget on January 24, 2018, chose <code>DAILY</code>, and didn't set a start date, Amazon Web Services set your start date to <code>01/24/18 00:00 UTC</code>. If you chose <code>MONTHLY</code>, Amazon Web Services set your start date to <code>01/01/18 00:00 UTC</code>. If you didn't specify an end date, Amazon Web Services set your end date to <code>06/15/87 00:00 UTC</code>. The defaults are the same for the Billing and Cost Management console and the API. </p> <p>You can change either date with the <code>UpdateBudget</code> operation.</p> <p>After the end date, Amazon Web Services deletes the budget and all the associated notifications and subscribers.</p>"
+          "documentation":"<p>The period of time that's covered by a budget. You set the start date and end date. The start date must come before the end date. The end date must come before <code>06/15/87 00:00 UTC</code>. </p> <p>If you create your budget and don't specify a start date, Amazon Web Services defaults to the start of your chosen time period (DAILY, MONTHLY, QUARTERLY, ANNUALLY, or CUSTOM). For example, if you created your budget on January 24, 2018, chose <code>DAILY</code>, and didn't set a start date, Amazon Web Services set your start date to <code>01/24/18 00:00 UTC</code>. If you chose <code>MONTHLY</code>, Amazon Web Services set your start date to <code>01/01/18 00:00 UTC</code>. If you didn't specify an end date, Amazon Web Services set your end date to <code>06/15/87 00:00 UTC</code>. The defaults are the same for the Billing and Cost Management console and the API. </p> <p>You can change either date with the <code>UpdateBudget</code> operation.</p> <p>After the end date, Amazon Web Services deletes the budget and all the associated notifications and subscribers.</p>"
         },
         "CalculatedSpend":{
           "shape":"CalculatedSpend",
@@ -1773,7 +1783,7 @@
         },
         "StatusReason":{
           "shape":"HealthStatusReason",
-          "documentation":"<p>The reason for the current status.</p> <ul> <li> <p> <code>BILLING_VIEW_NO_ACCESS</code>: The billing view resource does not grant <code>billing:GetBillingViewData</code> permission to this account.</p> </li> <li> <p> <code>BILLING_VIEW_UNHEALTHY</code>: The billing view associated with the budget is unhealthy.</p> </li> <li> <p> <code>FILTER_INVALID</code>: The filter contains reference to an account you do not have access to.</p> </li> </ul>"
+          "documentation":"<p>The reason for the current status.</p> <ul> <li> <p> <code>BILLING_VIEW_NO_ACCESS</code>: The billing view resource does not grant <code>billing:GetBillingViewData</code> permission to this account.</p> </li> <li> <p> <code>BILLING_VIEW_UNHEALTHY</code>: The billing view associated with the budget is unhealthy.</p> </li> <li> <p> <code>FILTER_INVALID</code>: The filter contains reference to an account you do not have access to.</p> </li> <li> <p> <code>MULTI_YEAR_HISTORICAL_DATA_DISABLED</code>: The budget is not being updated. Enable multi-year historical data in your Cost Management preferences.</p> </li> </ul>"
         },
         "LastUpdatedTime":{"shape":"GenericTimestamp"}
       },
@@ -1784,7 +1794,8 @@
       "enum":[
         "BILLING_VIEW_NO_ACCESS",
         "BILLING_VIEW_UNHEALTHY",
-        "FILTER_INVALID"
+        "FILTER_INVALID",
+        "MULTI_YEAR_HISTORICAL_DATA_DISABLED"
       ]
     },
     "HealthStatusValue":{
@@ -2316,7 +2327,7 @@
       "members":{
         "Start":{
           "shape":"GenericTimestamp",
-          "documentation":"<p>The start date for a budget. If you created your budget and didn't specify a start date, Amazon Web Services defaults to the start of your chosen time period (DAILY, MONTHLY, QUARTERLY, or ANNUALLY). For example, if you created your budget on January 24, 2018, chose <code>DAILY</code>, and didn't set a start date, Amazon Web Services set your start date to <code>01/24/18 00:00 UTC</code>. If you chose <code>MONTHLY</code>, Amazon Web Services set your start date to <code>01/01/18 00:00 UTC</code>. The defaults are the same for the Billing and Cost Management console and the API.</p> <p>You can change your start date with the <code>UpdateBudget</code> operation.</p>"
+          "documentation":"<p>The start date for a budget. If you created your budget and didn't specify a start date, Amazon Web Services defaults to the start of your chosen time period (DAILY, MONTHLY, QUARTERLY, ANNUALLY, or CUSTOM). For example, if you created your budget on January 24, 2018, chose <code>DAILY</code>, and didn't set a start date, Amazon Web Services set your start date to <code>01/24/18 00:00 UTC</code>. If you chose <code>MONTHLY</code>, Amazon Web Services set your start date to <code>01/01/18 00:00 UTC</code>. The defaults are the same for the Billing and Cost Management console and the API.</p> <p>You can change your start date with the <code>UpdateBudget</code> operation.</p>"
         },
         "End":{
           "shape":"GenericTimestamp",
@@ -2332,7 +2343,8 @@
         "DAILY",
         "MONTHLY",
         "QUARTERLY",
-        "ANNUALLY"
+        "ANNUALLY",
+        "CUSTOM"
       ]
     },
     "UnitValue":{
diff --git a/services/chatbot/pom.xml b/services/chatbot/pom.xml
index 0d594f644844..ca89a0fa47ac 100644
--- a/services/chatbot/pom.xml
+++ b/services/chatbot/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>chatbot</artifactId>
     <name>AWS Java SDK :: Services :: Chatbot</name>
diff --git a/services/chime/pom.xml b/services/chime/pom.xml
index e7f3f868893c..0826db0cf7ae 100644
--- a/services/chime/pom.xml
+++ b/services/chime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>chime</artifactId>
     <name>AWS Java SDK :: Services :: Chime</name>
diff --git a/services/chimesdkidentity/pom.xml b/services/chimesdkidentity/pom.xml
index a63800b643ba..2c2edb26d9d1 100644
--- a/services/chimesdkidentity/pom.xml
+++ b/services/chimesdkidentity/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>chimesdkidentity</artifactId>
     <name>AWS Java SDK :: Services :: Chime SDK Identity</name>
diff --git a/services/chimesdkmediapipelines/pom.xml b/services/chimesdkmediapipelines/pom.xml
index 8e2c7774576f..b5ce52ab65b3 100644
--- a/services/chimesdkmediapipelines/pom.xml
+++ b/services/chimesdkmediapipelines/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>chimesdkmediapipelines</artifactId>
     <name>AWS Java SDK :: Services :: Chime SDK Media Pipelines</name>
diff --git a/services/chimesdkmeetings/pom.xml b/services/chimesdkmeetings/pom.xml
index 042eca706d1d..1bd1dac20911 100644
--- a/services/chimesdkmeetings/pom.xml
+++ b/services/chimesdkmeetings/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>chimesdkmeetings</artifactId>
     <name>AWS Java SDK :: Services :: Chime SDK Meetings</name>
diff --git a/services/chimesdkmessaging/pom.xml b/services/chimesdkmessaging/pom.xml
index 4f947596c6fa..aed02a4b0a68 100644
--- a/services/chimesdkmessaging/pom.xml
+++ b/services/chimesdkmessaging/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>chimesdkmessaging</artifactId>
     <name>AWS Java SDK :: Services :: Chime SDK Messaging</name>
diff --git a/services/chimesdkmessaging/src/main/resources/codegen-resources/service-2.json b/services/chimesdkmessaging/src/main/resources/codegen-resources/service-2.json
index 922ffe8b2a6a..82cb0e2ca1e9 100644
--- a/services/chimesdkmessaging/src/main/resources/codegen-resources/service-2.json
+++ b/services/chimesdkmessaging/src/main/resources/codegen-resources/service-2.json
@@ -135,7 +135,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Creates a channel flow, a container for processors. Processors are AWS Lambda functions that perform actions on chat messages, such as stripping out profanity. You can associate channel flows with channels, and the processors in the channel flow then take action on all messages sent to that channel. This is a developer API.</p> <p>Channel flows process the following items:</p> <ol> <li> <p>New and updated messages</p> </li> <li> <p>Persistent and non-persistent messages</p> </li> <li> <p>The Standard message type</p> </li> </ol> <note> <p>Channel flows don't process Control or System messages. For more information about the message types provided by Chime SDK messaging, refer to <a href=\"https://docs.aws.amazon.com/chime/latest/dg/using-the-messaging-sdk.html#msg-types\">Message types</a> in the <i>Amazon Chime developer guide</i>.</p> </note>"
+      "documentation":"<p>Creates a channel flow, a container for processors. Processors are AWS Lambda functions that perform actions on chat messages, such as stripping out profanity. You can associate channel flows with channels, and the processors in the channel flow then take action on all messages sent to that channel. This is a developer API.</p> <p>Channel flows process the following items:</p> <ol> <li> <p>New and updated messages</p> </li> <li> <p>Persistent and non-persistent messages</p> </li> <li> <p>The Standard message type</p> </li> </ol> <note> <p>Channel flows don't process Control or System messages. For more information about the message types provided by Chime SDK messaging, refer to <a href=\"https://docs.aws.amazon.com/chime-sdk/latest/dg/using-the-messaging-sdk.html#msg-types\">Message types</a> in the <i>Amazon Chime developer guide</i>.</p> </note>"
     },
     "CreateChannelMembership":{
       "name":"CreateChannelMembership",
@@ -616,7 +616,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Lists all channel memberships in a channel.</p> <note> <p>The <code>x-amz-chime-bearer</code> request header is mandatory. Use the ARN of the <code>AppInstanceUser</code> or <code>AppInstanceBot</code> that makes the API call as the value in the header.</p> </note> <p>If you want to list the channels to which a specific app instance user belongs, see the <a href=\"https://docs.aws.amazon.com/chime/latest/APIReference/API_messaging-chime_ListChannelMembershipsForAppInstanceUser.html\">ListChannelMembershipsForAppInstanceUser</a> API.</p>"
+      "documentation":"<p>Lists all channel memberships in a channel.</p> <note> <p>The <code>x-amz-chime-bearer</code> request header is mandatory. Use the ARN of the <code>AppInstanceUser</code> or <code>AppInstanceBot</code> that makes the API call as the value in the header.</p> </note> <p>If you want to list the channels to which a specific app instance user belongs, see the <a href=\"https://docs.aws.amazon.com/chime-sdk/latest/APIReference/API_messaging-chime_ListChannelMembershipsForAppInstanceUser.html\">ListChannelMembershipsForAppInstanceUser</a> API.</p>"
     },
     "ListChannelMembershipsForAppInstanceUser":{
       "name":"ListChannelMembershipsForAppInstanceUser",
@@ -849,7 +849,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Redacts message content, but not metadata. The message exists in the back end, but the action returns null content, and the state shows as redacted.</p> <note> <p>The <code>x-amz-chime-bearer</code> request header is mandatory. Use the ARN of the <code>AppInstanceUser</code> or <code>AppInstanceBot</code> that makes the API call as the value in the header.</p> </note>"
+      "documentation":"<p>Redacts message content and metadata. The message exists in the back end, but the action returns null content, and the state shows as redacted.</p> <note> <p>The <code>x-amz-chime-bearer</code> request header is mandatory. Use the ARN of the <code>AppInstanceUser</code> or <code>AppInstanceBot</code> that makes the API call as the value in the header.</p> </note>"
     },
     "SearchChannels":{
       "name":"SearchChannels",
@@ -868,7 +868,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Allows the <code>ChimeBearer</code> to search channels by channel members. Users or bots can search across the channels that they belong to. Users in the <code>AppInstanceAdmin</code> role can search across all channels.</p> <p>The <code>x-amz-chime-bearer</code> request header is mandatory. Use the ARN of the <code>AppInstanceUser</code> or <code>AppInstanceBot</code> that makes the API call as the value in the header.</p>"
+      "documentation":"<p>Allows the <code>ChimeBearer</code> to search channels by channel members. Users or bots can search across the channels that they belong to. Users in the <code>AppInstanceAdmin</code> role can search across all channels.</p> <p>The <code>x-amz-chime-bearer</code> request header is mandatory. Use the ARN of the <code>AppInstanceUser</code> or <code>AppInstanceBot</code> that makes the API call as the value in the header.</p> <note> <p>This operation isn't supported for <code>AppInstanceUsers</code> with a large number of memberships.</p> </note>"
     },
     "SendChannelMessage":{
       "name":"SendChannelMessage",
@@ -2044,7 +2044,7 @@
         },
         "ChannelId":{
           "shape":"ChannelId",
-          "documentation":"<p>The ID of the channel in the request.</p>"
+          "documentation":"<p>An ID for the channel being created. If you do not specify an ID, a UUID will be created for the channel.</p>"
         },
         "MemberArns":{
           "shape":"ChannelMemberArns",
@@ -2741,7 +2741,14 @@
     },
     "GetMessagingSessionEndpointRequest":{
       "type":"structure",
-      "members":{}
+      "members":{
+        "NetworkType":{
+          "shape":"NetworkType",
+          "documentation":"<p>The type of network for the messaging session endpoint. Either IPv4 only or dual-stack (IPv4 and IPv6).</p>",
+          "location":"querystring",
+          "locationName":"network-type"
+        }
+      }
     },
     "GetMessagingSessionEndpointResponse":{
       "type":"structure",
@@ -3426,6 +3433,13 @@
       "max":40,
       "min":1
     },
+    "NetworkType":{
+      "type":"string",
+      "enum":[
+        "IPV4_ONLY",
+        "DUAL_STACK"
+      ]
+    },
     "NextToken":{
       "type":"string",
       "max":2048,
@@ -3790,14 +3804,14 @@
         },
         "Values":{
           "shape":"SearchFieldValues",
-          "documentation":"<p>The values that you want to search for, a list of strings. The values must be <code>AppInstanceUserArns</code> specified as a list of strings.</p> <note> <p>This operation isn't supported for <code>AppInstanceUsers</code> with large number of memberships.</p> </note>"
+          "documentation":"<p>The values that you want to search for, a list of strings. The values must be <code>AppInstanceUserArns</code> specified as a list of strings.</p> <note> <p>This operation isn't supported for <code>AppInstanceUsers</code> with a large number of memberships.</p> </note>"
         },
         "Operator":{
           "shape":"SearchFieldOperator",
           "documentation":"<p>The operator used to compare field values, currently <code>EQUALS</code> or <code>INCLUDES</code>. Use the <code>EQUALS</code> operator to find channels whose memberships equal the specified values. Use the <code>INCLUDES</code> operator to find channels whose memberships include the specified values.</p>"
         }
       },
-      "documentation":"<p>A <code>Field</code> of the channel that you want to search.</p>"
+      "documentation":"<p>A <code>Field</code> of the channel that you want to search.</p> <note> <p>This operation isn't supported for <code>AppInstanceUsers</code> with a large number of memberships.</p> </note>"
     },
     "SearchFieldKey":{
       "type":"string",
@@ -4292,5 +4306,5 @@
       "max":4096
     }
   },
-  "documentation":"<p>The Amazon Chime SDK messaging APIs in this section allow software developers to send and receive messages in custom messaging applications. These APIs depend on the frameworks provided by the Amazon Chime SDK identity APIs. For more information about the messaging APIs, see <a href=\"https://docs.aws.amazon.com/chime/latest/APIReference/API_Operations_Amazon_Chime_SDK_Messaging.html\">Amazon Chime SDK messaging</a>.</p>"
+  "documentation":"<p>The Amazon Chime SDK messaging APIs in this section allow software developers to send and receive messages in custom messaging applications. These APIs depend on the frameworks provided by the Amazon Chime SDK identity APIs. For more information about the messaging APIs, see <a href=\"https://docs.aws.amazon.com/chime-sdk/latest/APIReference/API_Operations_Amazon_Chime_SDK_Messaging.html\">Amazon Chime SDK messaging</a>.</p>"
 }
diff --git a/services/chimesdkvoice/pom.xml b/services/chimesdkvoice/pom.xml
index 985faced8ea9..65a82c312d2b 100644
--- a/services/chimesdkvoice/pom.xml
+++ b/services/chimesdkvoice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>chimesdkvoice</artifactId>
     <name>AWS Java SDK :: Services :: Chime SDK Voice</name>
diff --git a/services/cleanrooms/pom.xml b/services/cleanrooms/pom.xml
index d339ec8530f3..f6fa93930525 100644
--- a/services/cleanrooms/pom.xml
+++ b/services/cleanrooms/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cleanrooms</artifactId>
     <name>AWS Java SDK :: Services :: Clean Rooms</name>
diff --git a/services/cleanrooms/src/main/resources/codegen-resources/service-2.json b/services/cleanrooms/src/main/resources/codegen-resources/service-2.json
index 3cd577a58113..86a4d6483ef3 100644
--- a/services/cleanrooms/src/main/resources/codegen-resources/service-2.json
+++ b/services/cleanrooms/src/main/resources/codegen-resources/service-2.json
@@ -29,7 +29,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves multiple analysis templates within a collaboration by their Amazon Resource Names (ARNs).</p>"
+      "documentation":"<p>Retrieves multiple analysis templates within a collaboration by their Amazon Resource Names (ARNs).</p>",
+      "readonly":true
     },
     "BatchGetSchema":{
       "name":"BatchGetSchema",
@@ -47,7 +48,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves multiple schemas by their identifiers.</p>"
+      "documentation":"<p>Retrieves multiple schemas by their identifiers.</p>",
+      "readonly":true
     },
     "BatchGetSchemaAnalysisRule":{
       "name":"BatchGetSchemaAnalysisRule",
@@ -65,7 +67,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves multiple analysis rule schemas.</p>"
+      "documentation":"<p>Retrieves multiple analysis rule schemas.</p>",
+      "readonly":true
     },
     "CreateAnalysisTemplate":{
       "name":"CreateAnalysisTemplate",
@@ -298,6 +301,7 @@
       "output":{"shape":"CreatePrivacyBudgetTemplateOutput"},
       "errors":[
         {"shape":"ConflictException"},
+        {"shape":"ServiceQuotaExceededException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalServerException"},
         {"shape":"ValidationException"},
@@ -555,7 +559,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves an analysis template.</p>"
+      "documentation":"<p>Retrieves an analysis template.</p>",
+      "readonly":true
     },
     "GetCollaboration":{
       "name":"GetCollaboration",
@@ -572,7 +577,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns metadata about a collaboration.</p>"
+      "documentation":"<p>Returns metadata about a collaboration.</p>",
+      "readonly":true
     },
     "GetCollaborationAnalysisTemplate":{
       "name":"GetCollaborationAnalysisTemplate",
@@ -590,7 +596,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves an analysis template within a collaboration.</p>"
+      "documentation":"<p>Retrieves an analysis template within a collaboration.</p>",
+      "readonly":true
     },
     "GetCollaborationChangeRequest":{
       "name":"GetCollaborationChangeRequest",
@@ -608,7 +615,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves detailed information about a specific collaboration change request.</p>"
+      "documentation":"<p>Retrieves detailed information about a specific collaboration change request.</p>",
+      "readonly":true
     },
     "GetCollaborationConfiguredAudienceModelAssociation":{
       "name":"GetCollaborationConfiguredAudienceModelAssociation",
@@ -626,7 +634,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves a configured audience model association within a collaboration.</p>"
+      "documentation":"<p>Retrieves a configured audience model association within a collaboration.</p>",
+      "readonly":true
     },
     "GetCollaborationIdNamespaceAssociation":{
       "name":"GetCollaborationIdNamespaceAssociation",
@@ -644,7 +653,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves an ID namespace association from a specific collaboration.</p>"
+      "documentation":"<p>Retrieves an ID namespace association from a specific collaboration.</p>",
+      "readonly":true
     },
     "GetCollaborationPrivacyBudgetTemplate":{
       "name":"GetCollaborationPrivacyBudgetTemplate",
@@ -662,7 +672,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns details about a specified privacy budget template.</p>"
+      "documentation":"<p>Returns details about a specified privacy budget template.</p>",
+      "readonly":true
     },
     "GetConfiguredAudienceModelAssociation":{
       "name":"GetConfiguredAudienceModelAssociation",
@@ -680,7 +691,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns information about a configured audience model association.</p>"
+      "documentation":"<p>Returns information about a configured audience model association.</p>",
+      "readonly":true
     },
     "GetConfiguredTable":{
       "name":"GetConfiguredTable",
@@ -698,7 +710,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves a configured table.</p>"
+      "documentation":"<p>Retrieves a configured table.</p>",
+      "readonly":true
     },
     "GetConfiguredTableAnalysisRule":{
       "name":"GetConfiguredTableAnalysisRule",
@@ -716,7 +729,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves a configured table analysis rule.</p>"
+      "documentation":"<p>Retrieves a configured table analysis rule.</p>",
+      "readonly":true
     },
     "GetConfiguredTableAssociation":{
       "name":"GetConfiguredTableAssociation",
@@ -734,7 +748,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves a configured table association.</p>"
+      "documentation":"<p>Retrieves a configured table association.</p>",
+      "readonly":true
     },
     "GetConfiguredTableAssociationAnalysisRule":{
       "name":"GetConfiguredTableAssociationAnalysisRule",
@@ -752,7 +767,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p> Retrieves the analysis rule for a configured table association.</p>"
+      "documentation":"<p> Retrieves the analysis rule for a configured table association.</p>",
+      "readonly":true
     },
     "GetIdMappingTable":{
       "name":"GetIdMappingTable",
@@ -770,7 +786,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves an ID mapping table.</p>"
+      "documentation":"<p>Retrieves an ID mapping table.</p>",
+      "readonly":true
     },
     "GetIdNamespaceAssociation":{
       "name":"GetIdNamespaceAssociation",
@@ -788,7 +805,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves an ID namespace association.</p>"
+      "documentation":"<p>Retrieves an ID namespace association.</p>",
+      "readonly":true
     },
     "GetMembership":{
       "name":"GetMembership",
@@ -806,7 +824,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves a specified membership for an identifier.</p>"
+      "documentation":"<p>Retrieves a specified membership for an identifier.</p>",
+      "readonly":true
     },
     "GetPrivacyBudgetTemplate":{
       "name":"GetPrivacyBudgetTemplate",
@@ -824,7 +843,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns details for a specified privacy budget template.</p>"
+      "documentation":"<p>Returns details for a specified privacy budget template.</p>",
+      "readonly":true
     },
     "GetProtectedJob":{
       "name":"GetProtectedJob",
@@ -842,7 +862,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns job processing metadata.</p>"
+      "documentation":"<p>Returns job processing metadata.</p>",
+      "readonly":true
     },
     "GetProtectedQuery":{
       "name":"GetProtectedQuery",
@@ -860,7 +881,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns query processing metadata.</p>"
+      "documentation":"<p>Returns query processing metadata.</p>",
+      "readonly":true
     },
     "GetSchema":{
       "name":"GetSchema",
@@ -878,7 +900,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves the schema for a relation within a collaboration.</p>"
+      "documentation":"<p>Retrieves the schema for a relation within a collaboration.</p>",
+      "readonly":true
     },
     "GetSchemaAnalysisRule":{
       "name":"GetSchemaAnalysisRule",
@@ -896,7 +919,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves a schema analysis rule.</p>"
+      "documentation":"<p>Retrieves a schema analysis rule.</p>",
+      "readonly":true
     },
     "ListAnalysisTemplates":{
       "name":"ListAnalysisTemplates",
@@ -914,7 +938,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists analysis templates that the caller owns.</p>"
+      "documentation":"<p>Lists analysis templates that the caller owns.</p>",
+      "readonly":true
     },
     "ListCollaborationAnalysisTemplates":{
       "name":"ListCollaborationAnalysisTemplates",
@@ -932,7 +957,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists analysis templates within a collaboration.</p>"
+      "documentation":"<p>Lists analysis templates within a collaboration.</p>",
+      "readonly":true
     },
     "ListCollaborationChangeRequests":{
       "name":"ListCollaborationChangeRequests",
@@ -950,7 +976,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists all change requests for a collaboration with pagination support. Returns change requests sorted by creation time.</p>"
+      "documentation":"<p>Lists all change requests for a collaboration with pagination support. Returns change requests sorted by creation time.</p>",
+      "readonly":true
     },
     "ListCollaborationConfiguredAudienceModelAssociations":{
       "name":"ListCollaborationConfiguredAudienceModelAssociations",
@@ -968,7 +995,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists configured audience model associations within a collaboration.</p>"
+      "documentation":"<p>Lists configured audience model associations within a collaboration.</p>",
+      "readonly":true
     },
     "ListCollaborationIdNamespaceAssociations":{
       "name":"ListCollaborationIdNamespaceAssociations",
@@ -986,7 +1014,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns a list of the ID namespace associations in a collaboration.</p>"
+      "documentation":"<p>Returns a list of the ID namespace associations in a collaboration.</p>",
+      "readonly":true
     },
     "ListCollaborationPrivacyBudgetTemplates":{
       "name":"ListCollaborationPrivacyBudgetTemplates",
@@ -1004,7 +1033,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns an array that summarizes each privacy budget template in a specified collaboration.</p>"
+      "documentation":"<p>Returns an array that summarizes each privacy budget template in a specified collaboration.</p>",
+      "readonly":true
     },
     "ListCollaborationPrivacyBudgets":{
       "name":"ListCollaborationPrivacyBudgets",
@@ -1022,7 +1052,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns an array that summarizes each privacy budget in a specified collaboration. The summary includes the collaboration ARN, creation time, creating account, and privacy budget details.</p>"
+      "documentation":"<p>Returns an array that summarizes each privacy budget in a specified collaboration. The summary includes the collaboration ARN, creation time, creating account, and privacy budget details.</p>",
+      "readonly":true
     },
     "ListCollaborations":{
       "name":"ListCollaborations",
@@ -1039,7 +1070,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists collaborations the caller owns, is active in, or has been invited to.</p>"
+      "documentation":"<p>Lists collaborations the caller owns, is active in, or has been invited to.</p>",
+      "readonly":true
     },
     "ListConfiguredAudienceModelAssociations":{
       "name":"ListConfiguredAudienceModelAssociations",
@@ -1057,7 +1089,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists information about requested configured audience model associations.</p>"
+      "documentation":"<p>Lists information about requested configured audience model associations.</p>",
+      "readonly":true
     },
     "ListConfiguredTableAssociations":{
       "name":"ListConfiguredTableAssociations",
@@ -1075,7 +1108,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists configured table associations for a membership.</p>"
+      "documentation":"<p>Lists configured table associations for a membership.</p>",
+      "readonly":true
     },
     "ListConfiguredTables":{
       "name":"ListConfiguredTables",
@@ -1092,7 +1126,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists configured tables.</p>"
+      "documentation":"<p>Lists configured tables.</p>",
+      "readonly":true
     },
     "ListIdMappingTables":{
       "name":"ListIdMappingTables",
@@ -1110,7 +1145,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns a list of ID mapping tables.</p>"
+      "documentation":"<p>Returns a list of ID mapping tables.</p>",
+      "readonly":true
     },
     "ListIdNamespaceAssociations":{
       "name":"ListIdNamespaceAssociations",
@@ -1128,7 +1164,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns a list of ID namespace associations.</p>"
+      "documentation":"<p>Returns a list of ID namespace associations.</p>",
+      "readonly":true
     },
     "ListMembers":{
       "name":"ListMembers",
@@ -1146,7 +1183,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists all members within a collaboration.</p>"
+      "documentation":"<p>Lists all members within a collaboration.</p>",
+      "readonly":true
     },
     "ListMemberships":{
       "name":"ListMemberships",
@@ -1163,7 +1201,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists all memberships resources within the caller's account.</p>"
+      "documentation":"<p>Lists all memberships resources within the caller's account.</p>",
+      "readonly":true
     },
     "ListPrivacyBudgetTemplates":{
       "name":"ListPrivacyBudgetTemplates",
@@ -1181,7 +1220,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns detailed information about the privacy budget templates in a specified membership.</p>"
+      "documentation":"<p>Returns detailed information about the privacy budget templates in a specified membership.</p>",
+      "readonly":true
     },
     "ListPrivacyBudgets":{
       "name":"ListPrivacyBudgets",
@@ -1199,7 +1239,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Returns detailed information about the privacy budgets in a specified membership.</p>"
+      "documentation":"<p>Returns detailed information about the privacy budgets in a specified membership.</p>",
+      "readonly":true
     },
     "ListProtectedJobs":{
       "name":"ListProtectedJobs",
@@ -1217,7 +1258,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists protected jobs, sorted by most recent job.</p>"
+      "documentation":"<p>Lists protected jobs, sorted by most recent job.</p>",
+      "readonly":true
     },
     "ListProtectedQueries":{
       "name":"ListProtectedQueries",
@@ -1235,7 +1277,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists protected queries, sorted by the most recent query.</p>"
+      "documentation":"<p>Lists protected queries, sorted by the most recent query.</p>",
+      "readonly":true
     },
     "ListSchemas":{
       "name":"ListSchemas",
@@ -1253,7 +1296,8 @@
         {"shape":"ThrottlingException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Lists the schemas for relations within a collaboration.</p>"
+      "documentation":"<p>Lists the schemas for relations within a collaboration.</p>",
+      "readonly":true
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -1268,7 +1312,8 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Lists all of the tags that have been added to a resource.</p>"
+      "documentation":"<p>Lists all of the tags that have been added to a resource.</p>",
+      "readonly":true
     },
     "PopulateIdMappingTable":{
       "name":"PopulateIdMappingTable",
@@ -6778,6 +6823,14 @@
       },
       "documentation":"<p>An object representing the collaboration member's payment responsibilities set by the collaboration creator for query and job compute costs.</p>"
     },
+    "JobType":{
+      "type":"string",
+      "enum":[
+        "BATCH",
+        "INCREMENTAL",
+        "DELETE_ONLY"
+      ]
+    },
     "JoinOperator":{
       "type":"string",
       "enum":[
@@ -8237,6 +8290,10 @@
           "documentation":"<p>The unique identifier of the membership that contains the ID mapping table that you want to populate.</p>",
           "location":"uri",
           "locationName":"membershipIdentifier"
+        },
+        "jobType":{
+          "shape":"JobType",
+          "documentation":"<p>The job type of the rule-based ID mapping job. Valid values include:</p> <p> <code>INCREMENTAL</code>: Processes only new or changed data since the last job run. This is the default job type if the ID mapping workflow was created in Entity Resolution with <code>incrementalRunConfig</code> specified.</p> <p> <code>BATCH</code>: Processes all data from the input source, regardless of previous job runs. This is the default job type if the ID mapping workflow was created in Entity Resolution but <code>incrementalRunConfig</code> wasn't specified.</p> <p> <code>DELETE_ONLY</code>: Processes only deletion requests from <code>BatchDeleteUniqueId</code>, which is set in Entity Resolution.</p> <p>For more information about <code>incrementalRunConfig</code> and <code>BatchDeleteUniqueId</code>, see the <a href=\"https://docs.aws.amazon.com/entityresolution/latest/apireference/Welcome.html\">Entity Resolution API Reference</a>.</p>"
         }
       }
     },
diff --git a/services/cleanroomsml/pom.xml b/services/cleanroomsml/pom.xml
index b1ebdea3e864..45b0ae1e0977 100644
--- a/services/cleanroomsml/pom.xml
+++ b/services/cleanroomsml/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cleanroomsml</artifactId>
     <name>AWS Java SDK :: Services :: Clean Rooms ML</name>
diff --git a/services/cloud9/pom.xml b/services/cloud9/pom.xml
index 829b5901cb2d..7c1e74ba29a1 100644
--- a/services/cloud9/pom.xml
+++ b/services/cloud9/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cloud9</artifactId>
diff --git a/services/cloudcontrol/pom.xml b/services/cloudcontrol/pom.xml
index 4bf1cf39f6a6..da5dc4b8bb63 100644
--- a/services/cloudcontrol/pom.xml
+++ b/services/cloudcontrol/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudcontrol</artifactId>
     <name>AWS Java SDK :: Services :: Cloud Control</name>
diff --git a/services/clouddirectory/pom.xml b/services/clouddirectory/pom.xml
index 4314c4fffe07..d5c8e6257820 100644
--- a/services/clouddirectory/pom.xml
+++ b/services/clouddirectory/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>clouddirectory</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudDirectory</name>
diff --git a/services/cloudformation/pom.xml b/services/cloudformation/pom.xml
index 8201e5069a75..d79b285da93c 100644
--- a/services/cloudformation/pom.xml
+++ b/services/cloudformation/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudformation</artifactId>
     <name>AWS Java SDK :: Services :: AWS CloudFormation</name>
diff --git a/services/cloudfront/pom.xml b/services/cloudfront/pom.xml
index 34713814dcac..d340b28bcea0 100644
--- a/services/cloudfront/pom.xml
+++ b/services/cloudfront/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudfront</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudFront</name>
diff --git a/services/cloudfrontkeyvaluestore/pom.xml b/services/cloudfrontkeyvaluestore/pom.xml
index 3848a3e9d029..9a3d783b5abd 100644
--- a/services/cloudfrontkeyvaluestore/pom.xml
+++ b/services/cloudfrontkeyvaluestore/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudfrontkeyvaluestore</artifactId>
     <name>AWS Java SDK :: Services :: Cloud Front Key Value Store</name>
diff --git a/services/cloudhsm/pom.xml b/services/cloudhsm/pom.xml
index 5ca2a0f73014..fdc21a044733 100644
--- a/services/cloudhsm/pom.xml
+++ b/services/cloudhsm/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudhsm</artifactId>
     <name>AWS Java SDK :: Services :: AWS CloudHSM</name>
diff --git a/services/cloudhsmv2/pom.xml b/services/cloudhsmv2/pom.xml
index c228ffb6c703..8afd72ce0ffb 100644
--- a/services/cloudhsmv2/pom.xml
+++ b/services/cloudhsmv2/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cloudhsmv2</artifactId>
diff --git a/services/cloudsearch/pom.xml b/services/cloudsearch/pom.xml
index 75dd46366084..337383d5bb34 100644
--- a/services/cloudsearch/pom.xml
+++ b/services/cloudsearch/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudsearch</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudSearch</name>
diff --git a/services/cloudsearchdomain/pom.xml b/services/cloudsearchdomain/pom.xml
index aeb373c35fb1..6bf8e7d70685 100644
--- a/services/cloudsearchdomain/pom.xml
+++ b/services/cloudsearchdomain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudsearchdomain</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudSearch Domain</name>
diff --git a/services/cloudtrail/pom.xml b/services/cloudtrail/pom.xml
index 7ffb1585fb7a..de59d01b9e00 100644
--- a/services/cloudtrail/pom.xml
+++ b/services/cloudtrail/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudtrail</artifactId>
     <name>AWS Java SDK :: Services :: AWS CloudTrail</name>
diff --git a/services/cloudtraildata/pom.xml b/services/cloudtraildata/pom.xml
index 6b841b091e04..040f55285ea3 100644
--- a/services/cloudtraildata/pom.xml
+++ b/services/cloudtraildata/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudtraildata</artifactId>
     <name>AWS Java SDK :: Services :: Cloud Trail Data</name>
diff --git a/services/cloudwatch/pom.xml b/services/cloudwatch/pom.xml
index 49aea0ae476f..313c0955c7f2 100644
--- a/services/cloudwatch/pom.xml
+++ b/services/cloudwatch/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudwatch</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudWatch</name>
diff --git a/services/cloudwatch/src/main/resources/codegen-resources/endpoint-rule-set.json b/services/cloudwatch/src/main/resources/codegen-resources/endpoint-rule-set.json
index d88fc982878a..b9da014c86c7 100644
--- a/services/cloudwatch/src/main/resources/codegen-resources/endpoint-rule-set.json
+++ b/services/cloudwatch/src/main/resources/codegen-resources/endpoint-rule-set.json
@@ -1,12 +1,6 @@
 {
     "version": "1.0",
     "parameters": {
-        "Region": {
-            "builtIn": "AWS::Region",
-            "required": false,
-            "documentation": "The AWS region used to dispatch the request.",
-            "type": "String"
-        },
         "UseDualStack": {
             "builtIn": "AWS::UseDualStack",
             "required": true,
@@ -26,6 +20,12 @@
             "required": false,
             "documentation": "Override the endpoint used to send this request",
             "type": "String"
+        },
+        "Region": {
+            "builtIn": "AWS::Region",
+            "required": false,
+            "documentation": "The AWS region used to dispatch the request.",
+            "type": "String"
         }
     },
     "rules": [
@@ -57,161 +57,170 @@
                     "type": "error"
                 },
                 {
-                    "conditions": [
+                    "conditions": [],
+                    "rules": [
                         {
-                            "fn": "booleanEquals",
-                            "argv": [
+                            "conditions": [
                                 {
-                                    "ref": "UseDualStack"
+                                    "fn": "booleanEquals",
+                                    "argv": [
+                                        {
+                                            "ref": "UseDualStack"
+                                        },
+                                        true
+                                    ]
+                                }
+                            ],
+                            "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
+                            "type": "error"
+                        },
+                        {
+                            "conditions": [],
+                            "endpoint": {
+                                "url": {
+                                    "ref": "Endpoint"
                                 },
-                                true
-                            ]
+                                "properties": {},
+                                "headers": {}
+                            },
+                            "type": "endpoint"
                         }
                     ],
-                    "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
-                    "type": "error"
-                },
-                {
-                    "conditions": [],
-                    "endpoint": {
-                        "url": {
-                            "ref": "Endpoint"
-                        },
-                        "properties": {},
-                        "headers": {}
-                    },
-                    "type": "endpoint"
+                    "type": "tree"
                 }
             ],
             "type": "tree"
         },
         {
-            "conditions": [
-                {
-                    "fn": "isSet",
-                    "argv": [
-                        {
-                            "ref": "Region"
-                        }
-                    ]
-                }
-            ],
+            "conditions": [],
             "rules": [
                 {
                     "conditions": [
                         {
-                            "fn": "aws.partition",
+                            "fn": "isSet",
                             "argv": [
                                 {
                                     "ref": "Region"
                                 }
-                            ],
-                            "assign": "PartitionResult"
+                            ]
                         }
                     ],
                     "rules": [
                         {
                             "conditions": [
                                 {
-                                    "fn": "booleanEquals",
-                                    "argv": [
-                                        {
-                                            "ref": "UseFIPS"
-                                        },
-                                        true
-                                    ]
-                                },
-                                {
-                                    "fn": "booleanEquals",
+                                    "fn": "aws.partition",
                                     "argv": [
                                         {
-                                            "ref": "UseDualStack"
-                                        },
-                                        true
-                                    ]
+                                            "ref": "Region"
+                                        }
+                                    ],
+                                    "assign": "PartitionResult"
                                 }
                             ],
                             "rules": [
                                 {
                                     "conditions": [
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "stringEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
                                                         {
                                                             "ref": "PartitionResult"
                                                         },
-                                                        "supportsFIPS"
+                                                        "name"
                                                     ]
-                                                }
+                                                },
+                                                "aws-us-gov"
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                true
                                             ]
                                         },
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                false
+                                            ]
+                                        }
+                                    ],
+                                    "endpoint": {
+                                        "url": "https://monitoring.{Region}.{PartitionResult#dnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                },
+                                {
+                                    "conditions": [
+                                        {
+                                            "fn": "stringEquals",
+                                            "argv": [
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
                                                         {
                                                             "ref": "PartitionResult"
                                                         },
-                                                        "supportsDualStack"
+                                                        "name"
                                                     ]
-                                                }
+                                                },
+                                                "aws-us-gov"
                                             ]
-                                        }
-                                    ],
-                                    "rules": [
+                                        },
                                         {
-                                            "conditions": [],
-                                            "endpoint": {
-                                                "url": "https://monitoring-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                true
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
                                         }
                                     ],
-                                    "type": "tree"
+                                    "endpoint": {
+                                        "url": "https://monitoring.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
                                 },
                                 {
-                                    "conditions": [],
-                                    "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
-                                    "type": "error"
-                                }
-                            ],
-                            "type": "tree"
-                        },
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "booleanEquals",
-                                    "argv": [
+                                    "conditions": [
                                         {
-                                            "ref": "UseFIPS"
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                true
+                                            ]
                                         },
-                                        true
-                                    ]
-                                }
-                            ],
-                            "rules": [
-                                {
-                                    "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
                                                 {
-                                                    "fn": "getAttr",
-                                                    "argv": [
-                                                        {
-                                                            "ref": "PartitionResult"
-                                                        },
-                                                        "supportsFIPS"
-                                                    ]
+                                                    "ref": "UseDualStack"
                                                 },
                                                 true
                                             ]
@@ -221,119 +230,201 @@
                                         {
                                             "conditions": [
                                                 {
-                                                    "fn": "stringEquals",
+                                                    "fn": "booleanEquals",
                                                     "argv": [
+                                                        true,
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
                                                                 {
                                                                     "ref": "PartitionResult"
                                                                 },
-                                                                "name"
+                                                                "supportsFIPS"
                                                             ]
-                                                        },
-                                                        "aws-us-gov"
+                                                        }
                                                     ]
+                                                },
+                                                {
+                                                    "fn": "booleanEquals",
+                                                    "argv": [
+                                                        true,
+                                                        {
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "supportsDualStack"
+                                                            ]
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "rules": [
+                                                {
+                                                    "conditions": [],
+                                                    "endpoint": {
+                                                        "url": "https://monitoring-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                                        "properties": {},
+                                                        "headers": {}
+                                                    },
+                                                    "type": "endpoint"
                                                 }
                                             ],
-                                            "endpoint": {
-                                                "url": "https://monitoring.{Region}.amazonaws.com",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "type": "tree"
                                         },
                                         {
                                             "conditions": [],
-                                            "endpoint": {
-                                                "url": "https://monitoring-fips.{Region}.{PartitionResult#dnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
+                                            "type": "error"
                                         }
                                     ],
                                     "type": "tree"
                                 },
                                 {
-                                    "conditions": [],
-                                    "error": "FIPS is enabled but this partition does not support FIPS",
-                                    "type": "error"
-                                }
-                            ],
-                            "type": "tree"
-                        },
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "booleanEquals",
-                                    "argv": [
+                                    "conditions": [
                                         {
-                                            "ref": "UseDualStack"
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                true
+                                            ]
                                         },
-                                        true
-                                    ]
-                                }
-                            ],
-                            "rules": [
-                                {
-                                    "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
-                                                    "fn": "getAttr",
+                                                    "ref": "UseDualStack"
+                                                },
+                                                false
+                                            ]
+                                        }
+                                    ],
+                                    "rules": [
+                                        {
+                                            "conditions": [
+                                                {
+                                                    "fn": "booleanEquals",
                                                     "argv": [
                                                         {
-                                                            "ref": "PartitionResult"
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "supportsFIPS"
+                                                            ]
                                                         },
-                                                        "supportsDualStack"
+                                                        true
                                                     ]
                                                 }
+                                            ],
+                                            "rules": [
+                                                {
+                                                    "conditions": [],
+                                                    "endpoint": {
+                                                        "url": "https://monitoring-fips.{Region}.{PartitionResult#dnsSuffix}",
+                                                        "properties": {},
+                                                        "headers": {}
+                                                    },
+                                                    "type": "endpoint"
+                                                }
+                                            ],
+                                            "type": "tree"
+                                        },
+                                        {
+                                            "conditions": [],
+                                            "error": "FIPS is enabled but this partition does not support FIPS",
+                                            "type": "error"
+                                        }
+                                    ],
+                                    "type": "tree"
+                                },
+                                {
+                                    "conditions": [
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                false
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
                                     "rules": [
+                                        {
+                                            "conditions": [
+                                                {
+                                                    "fn": "booleanEquals",
+                                                    "argv": [
+                                                        true,
+                                                        {
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "supportsDualStack"
+                                                            ]
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "rules": [
+                                                {
+                                                    "conditions": [],
+                                                    "endpoint": {
+                                                        "url": "https://monitoring.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                                        "properties": {},
+                                                        "headers": {}
+                                                    },
+                                                    "type": "endpoint"
+                                                }
+                                            ],
+                                            "type": "tree"
+                                        },
                                         {
                                             "conditions": [],
-                                            "endpoint": {
-                                                "url": "https://monitoring.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "error": "DualStack is enabled but this partition does not support DualStack",
+                                            "type": "error"
                                         }
                                     ],
                                     "type": "tree"
                                 },
                                 {
                                     "conditions": [],
-                                    "error": "DualStack is enabled but this partition does not support DualStack",
-                                    "type": "error"
+                                    "endpoint": {
+                                        "url": "https://monitoring.{Region}.{PartitionResult#dnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
                                 }
                             ],
                             "type": "tree"
-                        },
-                        {
-                            "conditions": [],
-                            "endpoint": {
-                                "url": "https://monitoring.{Region}.{PartitionResult#dnsSuffix}",
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
                         }
                     ],
                     "type": "tree"
+                },
+                {
+                    "conditions": [],
+                    "error": "Invalid Configuration: Missing Region",
+                    "type": "error"
                 }
             ],
             "type": "tree"
-        },
-        {
-            "conditions": [],
-            "error": "Invalid Configuration: Missing Region",
-            "type": "error"
         }
     ]
 }
\ No newline at end of file
diff --git a/services/cloudwatch/src/main/resources/codegen-resources/endpoint-tests.json b/services/cloudwatch/src/main/resources/codegen-resources/endpoint-tests.json
index 979663d48f81..8e206869141f 100644
--- a/services/cloudwatch/src/main/resources/codegen-resources/endpoint-tests.json
+++ b/services/cloudwatch/src/main/resources/codegen-resources/endpoint-tests.json
@@ -1,250 +1,49 @@
 {
     "testCases": [
         {
-            "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For custom endpoint with region not set and fips disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.af-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "af-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.ap-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.ap-northeast-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.ap-northeast-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.ap-northeast-3.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-3",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.ap-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.ap-southeast-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.ap-southeast-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.ap-southeast-3.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-3",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.ca-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ca-central-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.eu-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-central-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.eu-north-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-north-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.eu-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.eu-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-west-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.eu-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-west-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.eu-west-3.amazonaws.com"
+                    "url": "https://example.com"
                 }
             },
             "params": {
-                "Region": "eu-west-3",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "Endpoint": "https://example.com",
+                "UseFIPS": false
             }
         },
         {
-            "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For custom endpoint with fips enabled",
             "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.me-south-1.amazonaws.com"
-                }
+                "error": "Invalid Configuration: FIPS and custom endpoint are not supported"
             },
             "params": {
-                "Region": "me-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "Endpoint": "https://example.com",
+                "UseFIPS": true
             }
         },
         {
-            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For custom endpoint with fips disabled and dualstack enabled",
             "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.sa-east-1.amazonaws.com"
-                }
+                "error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
             },
             "params": {
-                "Region": "sa-east-1",
+                "Endpoint": "https://example.com",
                 "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-east-1.amazonaws.com"
+                    "url": "https://monitoring-fips.us-east-1.api.aws"
                 }
             },
             "params": {
                 "Region": "us-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseFIPS": true,
+                "UseDualStack": true
             }
         },
         {
@@ -261,122 +60,70 @@
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-east-2.amazonaws.com"
+                    "url": "https://monitoring.us-east-1.api.aws"
                 }
             },
             "params": {
-                "Region": "us-east-2",
+                "Region": "us-east-1",
                 "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring-fips.us-east-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-2",
-                "UseFIPS": true,
-                "UseDualStack": false
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-west-1.amazonaws.com"
+                    "url": "https://monitoring.us-east-1.amazonaws.com"
                 }
             },
             "params": {
-                "Region": "us-west-1",
+                "Region": "us-east-1",
                 "UseFIPS": false,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring-fips.us-west-1.amazonaws.com"
+                    "url": "https://monitoring-fips.cn-northwest-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
-                "Region": "us-west-1",
+                "Region": "cn-northwest-1",
                 "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.us-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-west-2",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
+            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring-fips.us-west-2.amazonaws.com"
+                    "url": "https://monitoring-fips.cn-northwest-1.amazonaws.com.cn"
                 }
             },
             "params": {
-                "Region": "us-west-2",
+                "Region": "cn-northwest-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring-fips.us-east-1.api.aws"
+                    "url": "https://monitoring.cn-northwest-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
-                "Region": "us-east-1",
-                "UseFIPS": true,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.us-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
+                "Region": "cn-northwest-1",
                 "UseFIPS": false,
                 "UseDualStack": true
             }
         },
-        {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring.cn-north-1.amazonaws.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
         {
             "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled",
             "expect": {
@@ -391,236 +138,185 @@
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring-fips.cn-north-1.api.amazonwebservices.com.cn"
+                    "url": "https://monitoring.us-gov-west-1.api.aws"
                 }
             },
             "params": {
-                "Region": "cn-north-1",
+                "Region": "us-gov-west-1",
                 "UseFIPS": true,
                 "UseDualStack": true
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring-fips.cn-north-1.amazonaws.com.cn"
+                    "url": "https://monitoring.us-gov-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "Region": "cn-north-1",
+                "Region": "us-gov-west-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.cn-north-1.api.amazonwebservices.com.cn"
+                    "url": "https://monitoring.us-gov-west-1.api.aws"
                 }
             },
             "params": {
-                "Region": "cn-north-1",
+                "Region": "us-gov-west-1",
                 "UseFIPS": false,
                 "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-gov-east-1.amazonaws.com"
+                    "url": "https://monitoring.us-gov-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "Region": "us-gov-east-1",
+                "Region": "us-gov-west-1",
                 "UseFIPS": false,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-gov-east-1.amazonaws.com"
+                    "url": "https://monitoring-fips.us-iso-east-1.c2s.ic.gov"
                 }
             },
             "params": {
-                "Region": "us-gov-east-1",
+                "Region": "us-iso-east-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-gov-west-1.amazonaws.com"
+                    "url": "https://monitoring.us-iso-east-1.c2s.ic.gov"
                 }
             },
             "params": {
-                "Region": "us-gov-west-1",
+                "Region": "us-iso-east-1",
                 "UseFIPS": false,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-gov-west-1.amazonaws.com"
+                    "url": "https://monitoring-fips.us-isob-east-1.sc2s.sgov.gov"
                 }
             },
             "params": {
-                "Region": "us-gov-west-1",
+                "Region": "us-isob-east-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://monitoring-fips.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseFIPS": true,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-gov-east-1.api.aws"
+                    "url": "https://monitoring.us-isob-east-1.sc2s.sgov.gov"
                 }
             },
             "params": {
-                "Region": "us-gov-east-1",
+                "Region": "us-isob-east-1",
                 "UseFIPS": false,
-                "UseDualStack": true
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-isoe-west-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://monitoring-fips.eu-isoe-west-1.cloud.adc-e.uk"
                 }
             },
             "params": {
-                "Region": "us-iso-east-1",
-                "UseFIPS": false,
+                "Region": "eu-isoe-west-1",
+                "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-iso-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-isoe-west-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-iso-west-1.c2s.ic.gov"
+                    "url": "https://monitoring.eu-isoe-west-1.cloud.adc-e.uk"
                 }
             },
             "params": {
-                "Region": "us-iso-west-1",
+                "Region": "eu-isoe-west-1",
                 "UseFIPS": false,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-isof-south-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring-fips.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://monitoring-fips.us-isof-south-1.csp.hci.ic.gov"
                 }
             },
             "params": {
-                "Region": "us-iso-east-1",
+                "Region": "us-isof-south-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-isof-south-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring.us-isob-east-1.sc2s.sgov.gov"
+                    "url": "https://monitoring.us-isof-south-1.csp.hci.ic.gov"
                 }
             },
             "params": {
-                "Region": "us-isob-east-1",
+                "Region": "us-isof-south-1",
                 "UseFIPS": false,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region eusc-de-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://monitoring-fips.us-isob-east-1.sc2s.sgov.gov"
+                    "url": "https://monitoring-fips.eusc-de-east-1.amazonaws.eu"
                 }
             },
             "params": {
-                "Region": "us-isob-east-1",
+                "Region": "eusc-de-east-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://example.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Endpoint": "https://example.com"
-            }
-        },
-        {
-            "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled",
+            "documentation": "For region eusc-de-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://example.com"
+                    "url": "https://monitoring.eusc-de-east-1.amazonaws.eu"
                 }
             },
             "params": {
+                "Region": "eusc-de-east-1",
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Endpoint": "https://example.com"
-            }
-        },
-        {
-            "documentation": "For custom endpoint with fips enabled and dualstack disabled",
-            "expect": {
-                "error": "Invalid Configuration: FIPS and custom endpoint are not supported"
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false,
-                "Endpoint": "https://example.com"
-            }
-        },
-        {
-            "documentation": "For custom endpoint with fips disabled and dualstack enabled",
-            "expect": {
-                "error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Endpoint": "https://example.com"
+                "UseDualStack": false
             }
         },
         {
diff --git a/services/cloudwatchevents/pom.xml b/services/cloudwatchevents/pom.xml
index 30a9142f6784..8e817fce3c0b 100644
--- a/services/cloudwatchevents/pom.xml
+++ b/services/cloudwatchevents/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudwatchevents</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudWatch Events</name>
diff --git a/services/cloudwatchlogs/pom.xml b/services/cloudwatchlogs/pom.xml
index 9e1ad25a4446..0f8dd0b22973 100644
--- a/services/cloudwatchlogs/pom.xml
+++ b/services/cloudwatchlogs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cloudwatchlogs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudWatch Logs</name>
diff --git a/services/cloudwatchlogs/src/main/resources/codegen-resources/service-2.json b/services/cloudwatchlogs/src/main/resources/codegen-resources/service-2.json
index f50563a3a3de..4af2382cb5e9 100644
--- a/services/cloudwatchlogs/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloudwatchlogs/src/main/resources/codegen-resources/service-2.json
@@ -532,7 +532,7 @@
         {"shape":"OperationAbortedException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Returns a list of field indexes listed in the field index policies of one or more log groups. For more information about field index policies, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutIndexPolicy.html\">PutIndexPolicy</a>.</p>"
+      "documentation":"<p>Returns a list of custom and default field indexes which are discovered in log data. For more information about field index policies, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutIndexPolicy.html\">PutIndexPolicy</a>.</p>"
     },
     "DescribeIndexPolicies":{
       "name":"DescribeIndexPolicies",
@@ -549,7 +549,7 @@
         {"shape":"OperationAbortedException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Returns the field index policies of one or more log groups. For more information about field index policies, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutIndexPolicy.html\">PutIndexPolicy</a>.</p> <p>If a specified log group has a log-group level index policy, that policy is returned by this operation.</p> <p>If a specified log group doesn't have a log-group level index policy, but an account-wide index policy applies to it, that account-wide policy is returned by this operation.</p> <p>To find information about only account-level policies, use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DescribeAccountPolicies.html\">DescribeAccountPolicies</a> instead.</p>"
+      "documentation":"<p>Returns the field index policies of the specified log group. For more information about field index policies, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutIndexPolicy.html\">PutIndexPolicy</a>.</p> <p>If a specified log group has a log-group level index policy, that policy is returned by this operation.</p> <p>If a specified log group doesn't have a log-group level index policy, but an account-wide index policy applies to it, that account-wide policy is returned by this operation.</p> <p>To find information about only account-level policies, use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DescribeAccountPolicies.html\">DescribeAccountPolicies</a> instead.</p>"
     },
     "DescribeLogGroups":{
       "name":"DescribeLogGroups",
@@ -681,7 +681,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Lists log events from the specified log group. You can list all the log events or filter the results using one or more of the following:</p> <ul> <li> <p>A filter pattern</p> </li> <li> <p>A time range</p> </li> <li> <p>The log stream name, or a log stream name prefix that matches mutltiple log streams</p> </li> </ul> <p>You must have the <code>logs:FilterLogEvents</code> permission to perform this operation.</p> <p>You can specify the log group to search by using either <code>logGroupIdentifier</code> or <code>logGroupName</code>. You must include one of these two parameters, but you can't include both. </p> <p> <code>FilterLogEvents</code> is a paginated operation. Each page returned can contain up to 1 MB of log events or up to 10,000 log events. A returned page might only be partially full, or even empty. For example, if the result of a query would return 15,000 log events, the first page isn't guaranteed to have 10,000 log events even if they all fit into 1 MB.</p> <p>Partially full or empty pages don't necessarily mean that pagination is finished. If the results include a <code>nextToken</code>, there might be more log events available. You can return these additional log events by providing the nextToken in a subsequent <code>FilterLogEvents</code> operation. If the results don't include a <code>nextToken</code>, then pagination is finished. </p> <p>Specifying the <code>limit</code> parameter only guarantees that a single page doesn't return more log events than the specified limit, but it might return fewer events than the limit. This is the expected API behavior.</p> <p>The returned log events are sorted by event timestamp, the timestamp when the event was ingested by CloudWatch Logs, and the ID of the <code>PutLogEvents</code> request.</p> <p>If you are using CloudWatch cross-account observability, you can use this operation in a monitoring account and view data from the linked source accounts. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html\">CloudWatch cross-account observability</a>.</p> <note> <p>If you are using <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation.html\">log transformation</a>, the <code>FilterLogEvents</code> operation returns only the original versions of log events, before they were transformed. To view the transformed versions, you must use a <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AnalyzingLogData.html\">CloudWatch Logs query.</a> </p> </note>"
+      "documentation":"<p>Lists log events from the specified log group. You can list all the log events or filter the results using one or more of the following:</p> <ul> <li> <p>A filter pattern</p> </li> <li> <p>A time range</p> </li> <li> <p>The log stream name, or a log stream name prefix that matches multiple log streams</p> </li> </ul> <p>You must have the <code>logs:FilterLogEvents</code> permission to perform this operation.</p> <p>You can specify the log group to search by using either <code>logGroupIdentifier</code> or <code>logGroupName</code>. You must include one of these two parameters, but you can't include both. </p> <p> <code>FilterLogEvents</code> is a paginated operation. Each page returned can contain up to 1 MB of log events or up to 10,000 log events. A returned page might only be partially full, or even empty. For example, if the result of a query would return 15,000 log events, the first page isn't guaranteed to have 10,000 log events even if they all fit into 1 MB.</p> <p>Partially full or empty pages don't necessarily mean that pagination is finished. If the results include a <code>nextToken</code>, there might be more log events available. You can return these additional log events by providing the nextToken in a subsequent <code>FilterLogEvents</code> operation. If the results don't include a <code>nextToken</code>, then pagination is finished. </p> <p>Specifying the <code>limit</code> parameter only guarantees that a single page doesn't return more log events than the specified limit, but it might return fewer events than the limit. This is the expected API behavior.</p> <p>The returned log events are sorted by event timestamp, the timestamp when the event was ingested by CloudWatch Logs, and the ID of the <code>PutLogEvents</code> request.</p> <p>If you are using CloudWatch cross-account observability, you can use this operation in a monitoring account and view data from the linked source accounts. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html\">CloudWatch cross-account observability</a>.</p> <note> <p>If you are using <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation.html\">log transformation</a>, the <code>FilterLogEvents</code> operation returns only the original versions of log events, before they were transformed. To view the transformed versions, you must use a <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AnalyzingLogData.html\">CloudWatch Logs query.</a> </p> </note>"
     },
     "GetDataProtectionPolicy":{
       "name":"GetDataProtectionPolicy",
@@ -1013,7 +1013,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates an account-level data protection policy, subscription filter policy, field index policy, transformer policy, or metric extraction policy that applies to all log groups or a subset of log groups in the account.</p> <p>To use this operation, you must be signed on with the correct permissions depending on the type of policy that you are creating.</p> <ul> <li> <p>To create a data protection policy, you must have the <code>logs:PutDataProtectionPolicy</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> <li> <p>To create a subscription filter policy, you must have the <code>logs:PutSubscriptionFilter</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> <li> <p>To create a transformer policy, you must have the <code>logs:PutTransformer</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> <li> <p>To create a field index policy, you must have the <code>logs:PutIndexPolicy</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> <li> <p>To create a metric extraction policy, you must have the <code>logs:PutMetricExtractionPolicy</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> </ul> <p> <b>Data protection policy</b> </p> <p>A data protection policy can help safeguard sensitive data that's ingested by your log groups by auditing and masking the sensitive log data. Each account can have only one account-level data protection policy.</p> <important> <p>Sensitive data is detected and masked when it is ingested into a log group. When you set a data protection policy, log events ingested into the log groups before that time are not masked.</p> </important> <p>If you use <code>PutAccountPolicy</code> to create a data protection policy for your whole account, it applies to both existing log groups and all log groups that are created later in this account. The account-level policy is applied to existing log groups with eventual consistency. It might take up to 5 minutes before sensitive data in existing log groups begins to be masked.</p> <p>By default, when a user views a log event that includes masked data, the sensitive data is replaced by asterisks. A user who has the <code>logs:Unmask</code> permission can use a <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetLogEvents.html\">GetLogEvents</a> or <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_FilterLogEvents.html\">FilterLogEvents</a> operation with the <code>unmask</code> parameter set to <code>true</code> to view the unmasked log events. Users with the <code>logs:Unmask</code> can also view unmasked data in the CloudWatch Logs console by running a CloudWatch Logs Insights query with the <code>unmask</code> query command.</p> <p>For more information, including a list of types of data that can be audited and masked, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/mask-sensitive-log-data.html\">Protect sensitive log data with masking</a>.</p> <p>To use the <code>PutAccountPolicy</code> operation for a data protection policy, you must be signed on with the <code>logs:PutDataProtectionPolicy</code> and <code>logs:PutAccountPolicy</code> permissions.</p> <p>The <code>PutAccountPolicy</code> operation applies to all log groups in the account. You can use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDataProtectionPolicy.html\">PutDataProtectionPolicy</a> to create a data protection policy that applies to just one log group. If a log group has its own data protection policy and the account also has an account-level data protection policy, then the two policies are cumulative. Any sensitive term specified in either policy is masked.</p> <p> <b>Subscription filter policy</b> </p> <p>A subscription filter policy sets up a real-time feed of log events from CloudWatch Logs to other Amazon Web Services services. Account-level subscription filter policies apply to both existing log groups and log groups that are created later in this account. Supported destinations are Kinesis Data Streams, Firehose, and Lambda. When log events are sent to the receiving service, they are Base64 encoded and compressed with the GZIP format.</p> <p>The following destinations are supported for subscription filters:</p> <ul> <li> <p>An Kinesis Data Streams data stream in the same account as the subscription policy, for same-account delivery.</p> </li> <li> <p>An Firehose data stream in the same account as the subscription policy, for same-account delivery.</p> </li> <li> <p>A Lambda function in the same account as the subscription policy, for same-account delivery.</p> </li> <li> <p>A logical destination in a different account created with <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDestination.html\">PutDestination</a>, for cross-account delivery. Kinesis Data Streams and Firehose are supported as logical destinations.</p> </li> </ul> <p>Each account can have one account-level subscription filter policy per Region. If you are updating an existing filter, you must specify the correct name in <code>PolicyName</code>. To perform a <code>PutAccountPolicy</code> subscription filter operation for any destination except a Lambda function, you must also have the <code>iam:PassRole</code> permission.</p> <p> <b>Transformer policy</b> </p> <p>Creates or updates a <i>log transformer policy</i> for your account. You use log transformers to transform log events into a different format, making them easier for you to process and analyze. You can also transform logs from different sources into standardized formats that contain relevant, source-specific information. After you have created a transformer, CloudWatch Logs performs this transformation at the time of log ingestion. You can then refer to the transformed versions of the logs during operations such as querying with CloudWatch Logs Insights or creating metric filters or subscription filters.</p> <p>You can also use a transformer to copy metadata from metadata keys into the log events themselves. This metadata can include log group name, log stream name, account ID and Region.</p> <p>A transformer for a log group is a series of processors, where each processor applies one type of transformation to the log events ingested into this log group. For more information about the available processors to use in a transformer, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation.html#CloudWatch-Logs-Transformation-Processors\"> Processors that you can use</a>.</p> <p>Having log events in standardized format enables visibility across your applications for your log analysis, reporting, and alarming needs. CloudWatch Logs provides transformation for common log types with out-of-the-box transformation templates for major Amazon Web Services log sources such as VPC flow logs, Lambda, and Amazon RDS. You can use pre-built transformation templates or create custom transformation policies.</p> <p>You can create transformers only for the log groups in the Standard log class.</p> <p>You can have one account-level transformer policy that applies to all log groups in the account. Or you can create as many as 20 account-level transformer policies that are each scoped to a subset of log groups with the <code>selectionCriteria</code> parameter. If you have multiple account-level transformer policies with selection criteria, no two of them can use the same or overlapping log group name prefixes. For example, if you have one policy filtered to log groups that start with <code>my-log</code>, you can't have another field index policy filtered to <code>my-logpprod</code> or <code>my-logging</code>.</p> <p>You can also set up a transformer at the log-group level. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutTransformer.html\">PutTransformer</a>. If there is both a log-group level transformer created with <code>PutTransformer</code> and an account-level transformer that could apply to the same log group, the log group uses only the log-group level transformer. It ignores the account-level transformer.</p> <p> <b>Field index policy</b> </p> <p>You can use field index policies to create indexes on fields found in log events in the log group. Creating field indexes can help lower the scan volume for CloudWatch Logs Insights queries that reference those fields, because these queries attempt to skip the processing of log events that are known to not match the indexed field. Good fields to index are fields that you often need to query for and fields or values that match only a small fraction of the total log events. Common examples of indexes include request ID, session ID, user IDs, or instance IDs. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs-Field-Indexing.html\">Create field indexes to improve query performance and reduce costs</a> </p> <p>To find the fields that are in your log group events, use the <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetLogGroupFields.html\">GetLogGroupFields</a> operation.</p> <p>For example, suppose you have created a field index for <code>requestId</code>. Then, any CloudWatch Logs Insights query on that log group that includes <code>requestId = <i>value</i> </code> or <code>requestId in [<i>value</i>, <i>value</i>, ...]</code> will attempt to process only the log events where the indexed field matches the specified value.</p> <p>Matches of log events to the names of indexed fields are case-sensitive. For example, an indexed field of <code>RequestId</code> won't match a log event containing <code>requestId</code>.</p> <p>You can have one account-level field index policy that applies to all log groups in the account. Or you can create as many as 20 account-level field index policies that are each scoped to a subset of log groups with the <code>selectionCriteria</code> parameter. If you have multiple account-level index policies with selection criteria, no two of them can use the same or overlapping log group name prefixes. For example, if you have one policy filtered to log groups that start with <code>my-log</code>, you can't have another field index policy filtered to <code>my-logpprod</code> or <code>my-logging</code>.</p> <p>If you create an account-level field index policy in a monitoring account in cross-account observability, the policy is applied only to the monitoring account and not to any source accounts.</p> <p>If you want to create a field index policy for a single log group, you can use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutIndexPolicy.html\">PutIndexPolicy</a> instead of <code>PutAccountPolicy</code>. If you do so, that log group will use only that log-group level policy, and will ignore the account-level policy that you create with <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutAccountPolicy.html\">PutAccountPolicy</a>.</p> <p> <b>Metric extraction policy</b> </p> <p>A metric extraction policy controls whether CloudWatch Metrics can be created through the Embedded Metrics Format (EMF) for log groups in your account. By default, EMF metric creation is enabled for all log groups. You can use metric extraction policies to disable EMF metric creation for your entire account or specific log groups.</p> <p>When a policy disables EMF metric creation for a log group, log events in the EMF format are still ingested, but no CloudWatch Metrics are created from them.</p> <important> <p>Creating a policy disables metrics for AWS features that use EMF to create metrics, such as CloudWatch Container Insights and CloudWatch Application Signals. To prevent turning off those features by accident, we recommend that you exclude the underlying log-groups through a selection-criteria such as <code>LogGroupNamePrefix NOT IN [\"/aws/containerinsights\", \"/aws/ecs/containerinsights\", \"/aws/application-signals/data\"]</code>.</p> </important> <p>Each account can have either one account-level metric extraction policy that applies to all log groups, or up to 5 policies that are each scoped to a subset of log groups with the <code>selectionCriteria</code> parameter. The selection criteria supports filtering by <code>LogGroupName</code> and <code>LogGroupNamePrefix</code> using the operators <code>IN</code> and <code>NOT IN</code>. You can specify up to 50 values in each <code>IN</code> or <code>NOT IN</code> list.</p> <p>The selection criteria can be specified in these formats:</p> <p> <code>LogGroupName IN [\"log-group-1\", \"log-group-2\"]</code> </p> <p> <code>LogGroupNamePrefix NOT IN [\"/aws/prefix1\", \"/aws/prefix2\"]</code> </p> <p>If you have multiple account-level metric extraction policies with selection criteria, no two of them can have overlapping criteria. For example, if you have one policy with selection criteria <code>LogGroupNamePrefix IN [\"my-log\"]</code>, you can't have another metric extraction policy with selection criteria <code>LogGroupNamePrefix IN [\"/my-log-prod\"]</code> or <code>LogGroupNamePrefix IN [\"/my-logging\"]</code>, as the set of log groups matching these prefixes would be a subset of the log groups matching the first policy's prefix, creating an overlap.</p> <p>When using <code>NOT IN</code>, only one policy with this operator is allowed per account.</p> <p>When combining policies with <code>IN</code> and <code>NOT IN</code> operators, the overlap check ensures that policies don't have conflicting effects. Two policies with <code>IN</code> and <code>NOT IN</code> operators do not overlap if and only if every value in the <code>IN </code>policy is completely contained within some value in the <code>NOT IN</code> policy. For example:</p> <ul> <li> <p>If you have a <code>NOT IN</code> policy for prefix <code>\"/aws/lambda\"</code>, you can create an <code>IN</code> policy for the exact log group name <code>\"/aws/lambda/function1\"</code> because the set of log groups matching <code>\"/aws/lambda/function1\"</code> is a subset of the log groups matching <code>\"/aws/lambda\"</code>.</p> </li> <li> <p>If you have a <code>NOT IN</code> policy for prefix <code>\"/aws/lambda\"</code>, you cannot create an <code>IN</code> policy for prefix <code>\"/aws\"</code> because the set of log groups matching <code>\"/aws\"</code> is not a subset of the log groups matching <code>\"/aws/lambda\"</code>.</p> </li> </ul>"
+      "documentation":"<p>Creates an account-level data protection policy, subscription filter policy, field index policy, transformer policy, or metric extraction policy that applies to all log groups or a subset of log groups in the account.</p> <p>To use this operation, you must be signed on with the correct permissions depending on the type of policy that you are creating.</p> <ul> <li> <p>To create a data protection policy, you must have the <code>logs:PutDataProtectionPolicy</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> <li> <p>To create a subscription filter policy, you must have the <code>logs:PutSubscriptionFilter</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> <li> <p>To create a transformer policy, you must have the <code>logs:PutTransformer</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> <li> <p>To create a field index policy, you must have the <code>logs:PutIndexPolicy</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> <li> <p>To create a metric extraction policy, you must have the <code>logs:PutMetricExtractionPolicy</code> and <code>logs:PutAccountPolicy</code> permissions.</p> </li> </ul> <p> <b>Data protection policy</b> </p> <p>A data protection policy can help safeguard sensitive data that's ingested by your log groups by auditing and masking the sensitive log data. Each account can have only one account-level data protection policy.</p> <important> <p>Sensitive data is detected and masked when it is ingested into a log group. When you set a data protection policy, log events ingested into the log groups before that time are not masked.</p> </important> <p>If you use <code>PutAccountPolicy</code> to create a data protection policy for your whole account, it applies to both existing log groups and all log groups that are created later in this account. The account-level policy is applied to existing log groups with eventual consistency. It might take up to 5 minutes before sensitive data in existing log groups begins to be masked.</p> <p>By default, when a user views a log event that includes masked data, the sensitive data is replaced by asterisks. A user who has the <code>logs:Unmask</code> permission can use a <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetLogEvents.html\">GetLogEvents</a> or <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_FilterLogEvents.html\">FilterLogEvents</a> operation with the <code>unmask</code> parameter set to <code>true</code> to view the unmasked log events. Users with the <code>logs:Unmask</code> can also view unmasked data in the CloudWatch Logs console by running a CloudWatch Logs Insights query with the <code>unmask</code> query command.</p> <p>For more information, including a list of types of data that can be audited and masked, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/mask-sensitive-log-data.html\">Protect sensitive log data with masking</a>.</p> <p>To use the <code>PutAccountPolicy</code> operation for a data protection policy, you must be signed on with the <code>logs:PutDataProtectionPolicy</code> and <code>logs:PutAccountPolicy</code> permissions.</p> <p>The <code>PutAccountPolicy</code> operation applies to all log groups in the account. You can use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDataProtectionPolicy.html\">PutDataProtectionPolicy</a> to create a data protection policy that applies to just one log group. If a log group has its own data protection policy and the account also has an account-level data protection policy, then the two policies are cumulative. Any sensitive term specified in either policy is masked.</p> <p> <b>Subscription filter policy</b> </p> <p>A subscription filter policy sets up a real-time feed of log events from CloudWatch Logs to other Amazon Web Services services. Account-level subscription filter policies apply to both existing log groups and log groups that are created later in this account. Supported destinations are Kinesis Data Streams, Firehose, and Lambda. When log events are sent to the receiving service, they are Base64 encoded and compressed with the GZIP format.</p> <p>The following destinations are supported for subscription filters:</p> <ul> <li> <p>An Kinesis Data Streams data stream in the same account as the subscription policy, for same-account delivery.</p> </li> <li> <p>An Firehose data stream in the same account as the subscription policy, for same-account delivery.</p> </li> <li> <p>A Lambda function in the same account as the subscription policy, for same-account delivery.</p> </li> <li> <p>A logical destination in a different account created with <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutDestination.html\">PutDestination</a>, for cross-account delivery. Kinesis Data Streams and Firehose are supported as logical destinations.</p> </li> </ul> <p>Each account can have one account-level subscription filter policy per Region. If you are updating an existing filter, you must specify the correct name in <code>PolicyName</code>. To perform a <code>PutAccountPolicy</code> subscription filter operation for any destination except a Lambda function, you must also have the <code>iam:PassRole</code> permission.</p> <p> <b>Transformer policy</b> </p> <p>Creates or updates a <i>log transformer policy</i> for your account. You use log transformers to transform log events into a different format, making them easier for you to process and analyze. You can also transform logs from different sources into standardized formats that contain relevant, source-specific information. After you have created a transformer, CloudWatch Logs performs this transformation at the time of log ingestion. You can then refer to the transformed versions of the logs during operations such as querying with CloudWatch Logs Insights or creating metric filters or subscription filters.</p> <p>You can also use a transformer to copy metadata from metadata keys into the log events themselves. This metadata can include log group name, log stream name, account ID and Region.</p> <p>A transformer for a log group is a series of processors, where each processor applies one type of transformation to the log events ingested into this log group. For more information about the available processors to use in a transformer, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation.html#CloudWatch-Logs-Transformation-Processors\"> Processors that you can use</a>.</p> <p>Having log events in standardized format enables visibility across your applications for your log analysis, reporting, and alarming needs. CloudWatch Logs provides transformation for common log types with out-of-the-box transformation templates for major Amazon Web Services log sources such as VPC flow logs, Lambda, and Amazon RDS. You can use pre-built transformation templates or create custom transformation policies.</p> <p>You can create transformers only for the log groups in the Standard log class.</p> <p>You can have one account-level transformer policy that applies to all log groups in the account. Or you can create as many as 20 account-level transformer policies that are each scoped to a subset of log groups with the <code>selectionCriteria</code> parameter. If you have multiple account-level transformer policies with selection criteria, no two of them can use the same or overlapping log group name prefixes. For example, if you have one policy filtered to log groups that start with <code>my-log</code>, you can't have another field index policy filtered to <code>my-logpprod</code> or <code>my-logging</code>.</p> <p>CloudWatch Logs provides default field indexes for all log groups in the Standard log class. Default field indexes are automatically available for the following fields: </p> <ul> <li> <p> <code>@aws.region</code> </p> </li> <li> <p> <code>@aws.account</code> </p> </li> <li> <p> <code>@source.log</code> </p> </li> <li> <p> <code>traceId</code> </p> </li> </ul> <p>Default field indexes are in addition to any custom field indexes you define within your policy. Default field indexes are not counted towards your field index quota. </p> <p>You can also set up a transformer at the log-group level. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutTransformer.html\">PutTransformer</a>. If there is both a log-group level transformer created with <code>PutTransformer</code> and an account-level transformer that could apply to the same log group, the log group uses only the log-group level transformer. It ignores the account-level transformer.</p> <p> <b>Field index policy</b> </p> <p>You can use field index policies to create indexes on fields found in log events in the log group. Creating field indexes can help lower the scan volume for CloudWatch Logs Insights queries that reference those fields, because these queries attempt to skip the processing of log events that are known to not match the indexed field. Good fields to index are fields that you often need to query for and fields or values that match only a small fraction of the total log events. Common examples of indexes include request ID, session ID, user IDs, or instance IDs. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs-Field-Indexing.html\">Create field indexes to improve query performance and reduce costs</a> </p> <p>To find the fields that are in your log group events, use the <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetLogGroupFields.html\">GetLogGroupFields</a> operation.</p> <p>For example, suppose you have created a field index for <code>requestId</code>. Then, any CloudWatch Logs Insights query on that log group that includes <code>requestId = <i>value</i> </code> or <code>requestId in [<i>value</i>, <i>value</i>, ...]</code> will attempt to process only the log events where the indexed field matches the specified value.</p> <p>Matches of log events to the names of indexed fields are case-sensitive. For example, an indexed field of <code>RequestId</code> won't match a log event containing <code>requestId</code>.</p> <p>You can have one account-level field index policy that applies to all log groups in the account. Or you can create as many as 20 account-level field index policies that are each scoped to a subset of log groups with the <code>selectionCriteria</code> parameter. If you have multiple account-level index policies with selection criteria, no two of them can use the same or overlapping log group name prefixes. For example, if you have one policy filtered to log groups that start with <code>my-log</code>, you can't have another field index policy filtered to <code>my-logpprod</code> or <code>my-logging</code>.</p> <p>If you create an account-level field index policy in a monitoring account in cross-account observability, the policy is applied only to the monitoring account and not to any source accounts.</p> <p>If you want to create a field index policy for a single log group, you can use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutIndexPolicy.html\">PutIndexPolicy</a> instead of <code>PutAccountPolicy</code>. If you do so, that log group will use only that log-group level policy, and will ignore the account-level policy that you create with <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutAccountPolicy.html\">PutAccountPolicy</a>.</p> <p> <b>Metric extraction policy</b> </p> <p>A metric extraction policy controls whether CloudWatch Metrics can be created through the Embedded Metrics Format (EMF) for log groups in your account. By default, EMF metric creation is enabled for all log groups. You can use metric extraction policies to disable EMF metric creation for your entire account or specific log groups.</p> <p>When a policy disables EMF metric creation for a log group, log events in the EMF format are still ingested, but no CloudWatch Metrics are created from them.</p> <important> <p>Creating a policy disables metrics for AWS features that use EMF to create metrics, such as CloudWatch Container Insights and CloudWatch Application Signals. To prevent turning off those features by accident, we recommend that you exclude the underlying log-groups through a selection-criteria such as <code>LogGroupNamePrefix NOT IN [\"/aws/containerinsights\", \"/aws/ecs/containerinsights\", \"/aws/application-signals/data\"]</code>.</p> </important> <p>Each account can have either one account-level metric extraction policy that applies to all log groups, or up to 5 policies that are each scoped to a subset of log groups with the <code>selectionCriteria</code> parameter. The selection criteria supports filtering by <code>LogGroupName</code> and <code>LogGroupNamePrefix</code> using the operators <code>IN</code> and <code>NOT IN</code>. You can specify up to 50 values in each <code>IN</code> or <code>NOT IN</code> list.</p> <p>The selection criteria can be specified in these formats:</p> <p> <code>LogGroupName IN [\"log-group-1\", \"log-group-2\"]</code> </p> <p> <code>LogGroupNamePrefix NOT IN [\"/aws/prefix1\", \"/aws/prefix2\"]</code> </p> <p>If you have multiple account-level metric extraction policies with selection criteria, no two of them can have overlapping criteria. For example, if you have one policy with selection criteria <code>LogGroupNamePrefix IN [\"my-log\"]</code>, you can't have another metric extraction policy with selection criteria <code>LogGroupNamePrefix IN [\"/my-log-prod\"]</code> or <code>LogGroupNamePrefix IN [\"/my-logging\"]</code>, as the set of log groups matching these prefixes would be a subset of the log groups matching the first policy's prefix, creating an overlap.</p> <p>When using <code>NOT IN</code>, only one policy with this operator is allowed per account.</p> <p>When combining policies with <code>IN</code> and <code>NOT IN</code> operators, the overlap check ensures that policies don't have conflicting effects. Two policies with <code>IN</code> and <code>NOT IN</code> operators do not overlap if and only if every value in the <code>IN </code>policy is completely contained within some value in the <code>NOT IN</code> policy. For example:</p> <ul> <li> <p>If you have a <code>NOT IN</code> policy for prefix <code>\"/aws/lambda\"</code>, you can create an <code>IN</code> policy for the exact log group name <code>\"/aws/lambda/function1\"</code> because the set of log groups matching <code>\"/aws/lambda/function1\"</code> is a subset of the log groups matching <code>\"/aws/lambda\"</code>.</p> </li> <li> <p>If you have a <code>NOT IN</code> policy for prefix <code>\"/aws/lambda\"</code>, you cannot create an <code>IN</code> policy for prefix <code>\"/aws\"</code> because the set of log groups matching <code>\"/aws\"</code> is not a subset of the log groups matching <code>\"/aws/lambda\"</code>.</p> </li> </ul>"
     },
     "PutDataProtectionPolicy":{
       "name":"PutDataProtectionPolicy",
@@ -1128,7 +1128,7 @@
         {"shape":"OperationAbortedException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Creates or updates a <i>field index policy</i> for the specified log group. Only log groups in the Standard log class support field index policies. For more information about log classes, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch_Logs_Log_Classes.html\">Log classes</a>.</p> <p>You can use field index policies to create <i>field indexes</i> on fields found in log events in the log group. Creating field indexes speeds up and lowers the costs for CloudWatch Logs Insights queries that reference those field indexes, because these queries attempt to skip the processing of log events that are known to not match the indexed field. Good fields to index are fields that you often need to query for and fields or values that match only a small fraction of the total log events. Common examples of indexes include request ID, session ID, userID, and instance IDs. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs-Field-Indexing.html\">Create field indexes to improve query performance and reduce costs</a>.</p> <p>To find the fields that are in your log group events, use the <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetLogGroupFields.html\">GetLogGroupFields</a> operation.</p> <p>For example, suppose you have created a field index for <code>requestId</code>. Then, any CloudWatch Logs Insights query on that log group that includes <code>requestId = <i>value</i> </code> or <code>requestId IN [<i>value</i>, <i>value</i>, ...]</code> will process fewer log events to reduce costs, and have improved performance.</p> <p>Each index policy has the following quotas and restrictions:</p> <ul> <li> <p>As many as 20 fields can be included in the policy.</p> </li> <li> <p>Each field name can include as many as 100 characters.</p> </li> </ul> <p>Matches of log events to the names of indexed fields are case-sensitive. For example, a field index of <code>RequestId</code> won't match a log event containing <code>requestId</code>.</p> <p>Log group-level field index policies created with <code>PutIndexPolicy</code> override account-level field index policies created with <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutAccountPolicy.html\">PutAccountPolicy</a>. If you use <code>PutIndexPolicy</code> to create a field index policy for a log group, that log group uses only that policy. The log group ignores any account-wide field index policy that you might have created.</p>"
+      "documentation":"<p>Creates or updates a <i>field index policy</i> for the specified log group. Only log groups in the Standard log class support field index policies. For more information about log classes, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch_Logs_Log_Classes.html\">Log classes</a>.</p> <p>You can use field index policies to create <i>field indexes</i> on fields found in log events in the log group. Creating field indexes speeds up and lowers the costs for CloudWatch Logs Insights queries that reference those field indexes, because these queries attempt to skip the processing of log events that are known to not match the indexed field. Good fields to index are fields that you often need to query for and fields or values that match only a small fraction of the total log events. Common examples of indexes include request ID, session ID, userID, and instance IDs. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs-Field-Indexing.html\">Create field indexes to improve query performance and reduce costs</a>.</p> <p>To find the fields that are in your log group events, use the <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_GetLogGroupFields.html\">GetLogGroupFields</a> operation.</p> <p>For example, suppose you have created a field index for <code>requestId</code>. Then, any CloudWatch Logs Insights query on that log group that includes <code>requestId = <i>value</i> </code> or <code>requestId IN [<i>value</i>, <i>value</i>, ...]</code> will process fewer log events to reduce costs, and have improved performance.</p> <p>CloudWatch Logs provides default field indexes for all log groups in the Standard log class. Default field indexes are automatically available for the following fields: </p> <ul> <li> <p> <code>@aws.region</code> </p> </li> <li> <p> <code>@aws.account</code> </p> </li> <li> <p> <code>@source.log</code> </p> </li> <li> <p> <code>traceId</code> </p> </li> </ul> <p>Default field indexes are in addition to any custom field indexes you define within your policy. Default field indexes are not counted towards your field index quota. </p> <p>Each index policy has the following quotas and restrictions:</p> <ul> <li> <p>As many as 20 fields can be included in the policy.</p> </li> <li> <p>Each field name can include as many as 100 characters.</p> </li> </ul> <p>Matches of log events to the names of indexed fields are case-sensitive. For example, a field index of <code>RequestId</code> won't match a log event containing <code>requestId</code>.</p> <p>Log group-level field index policies created with <code>PutIndexPolicy</code> override account-level field index policies created with <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutAccountPolicy.html\">PutAccountPolicy</a>. If you use <code>PutIndexPolicy</code> to create a field index policy for a log group, that log group uses only that policy. The log group ignores any account-wide field index policy that you might have created.</p>"
     },
     "PutIntegration":{
       "name":"PutIntegration",
@@ -3204,6 +3204,10 @@
       ]
     },
     "DynamicTokenPosition":{"type":"integer"},
+    "EmitSystemFields":{
+      "type":"list",
+      "member":{"shape":"SystemField"}
+    },
     "EncryptionKey":{
       "type":"string",
       "max":256
@@ -3467,6 +3471,11 @@
       "type":"list",
       "member":{"shape":"FieldIndex"}
     },
+    "FieldSelectionCriteria":{
+      "type":"string",
+      "max":2000,
+      "min":0
+    },
     "FieldsData":{
       "type":"structure",
       "members":{
@@ -3889,7 +3898,10 @@
     "GetLogObjectResponse":{
       "type":"structure",
       "members":{
-        "fieldStream":{"shape":"GetLogObjectResponseStream"}
+        "fieldStream":{
+          "shape":"GetLogObjectResponseStream",
+          "documentation":"<p>A stream of structured log data returned by the GetLogObject operation. This stream contains log events with their associated metadata and extracted fields.</p>"
+        }
       },
       "documentation":"<p>The response from the GetLogObject operation.</p>"
     },
@@ -3897,7 +3909,10 @@
       "type":"structure",
       "members":{
         "fields":{"shape":"FieldsData"},
-        "InternalStreamingException":{"shape":"InternalStreamingException"}
+        "InternalStreamingException":{
+          "shape":"InternalStreamingException",
+          "documentation":"<p>An internal error occurred during the streaming of log data. This exception is thrown when there's an issue with the internal streaming mechanism used by the GetLogObject operation.</p>"
+        }
       },
       "documentation":"<p>A stream of structured log data returned by the GetLogObject operation. This stream contains log events with their associated metadata and extracted fields.</p>",
       "eventstream":true
@@ -4001,10 +4016,10 @@
         },
         "match":{
           "shape":"GrokMatch",
-          "documentation":"<p>The grok pattern to match against the log event. For a list of supported grok patterns, see <a href=\"https://docs.aws.amazon.com/mazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation-Processors.html#Grok-Patterns\">Supported grok patterns</a>.</p>"
+          "documentation":"<p>The grok pattern to match against the log event. For a list of supported grok patterns, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation-Processors.html#Grok-Patterns\">Supported grok patterns</a>.</p>"
         }
       },
-      "documentation":"<p>This processor uses pattern matching to parse and structure unstructured data. This processor can also extract fields from log messages.</p> <p>For more information about this processor including examples, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation.html#CloudWatch-Logs-Transformation-Grok\"> grok</a> in the <i>CloudWatch Logs User Guide</i>.</p>"
+      "documentation":"<p>This processor uses pattern matching to parse and structure unstructured data. This processor can also extract fields from log messages.</p> <p>For more information about this processor including examples, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation-Processors.html#CloudWatch-Logs-Transformation-Grok\">grok</a> in the <i>CloudWatch Logs User Guide</i>.</p>"
     },
     "GrokMatch":{
       "type":"string",
@@ -4831,6 +4846,14 @@
         "applyOnTransformedLogs":{
           "shape":"ApplyOnTransformedLogs",
           "documentation":"<p>This parameter is valid only for log groups that have an active log transformer. For more information about log transformers, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutTransformer.html\">PutTransformer</a>.</p> <p>If this value is <code>true</code>, the metric filter is applied on the transformed version of the log events instead of the original ingested log events.</p>"
+        },
+        "fieldSelectionCriteria":{
+          "shape":"FieldSelectionCriteria",
+          "documentation":"<p>The filter expression that specifies which log events are processed by this metric filter based on system fields. Returns the <code>fieldSelectionCriteria</code> value if it was specified when the metric filter was created.</p>"
+        },
+        "emitSystemFieldDimensions":{
+          "shape":"EmitSystemFields",
+          "documentation":"<p>The list of system fields that are emitted as additional dimensions in the generated metrics. Returns the <code>emitSystemFieldDimensions</code> value if it was specified when the metric filter was created.</p>"
         }
       },
       "documentation":"<p>Metric filters express how CloudWatch Logs would extract metric observations from ingested log events and transform them into metric data in a CloudWatch metric.</p>"
@@ -5947,6 +5970,14 @@
         "applyOnTransformedLogs":{
           "shape":"ApplyOnTransformedLogs",
           "documentation":"<p>This parameter is valid only for log groups that have an active log transformer. For more information about log transformers, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutTransformer.html\">PutTransformer</a>.</p> <p>If the log group uses either a log-group level or account-level transformer, and you specify <code>true</code>, the metric filter will be applied on the transformed version of the log events instead of the original ingested log events.</p>"
+        },
+        "fieldSelectionCriteria":{
+          "shape":"FieldSelectionCriteria",
+          "documentation":"<p>A filter expression that specifies which log events should be processed by this metric filter based on system fields such as source account and source region. Uses selection criteria syntax with operators like <code>=</code>, <code>!=</code>, <code>AND</code>, <code>OR</code>, <code>IN</code>, <code>NOT IN</code>. Example: <code>@aws.region = \"us-east-1\"</code> or <code>@aws.account IN [\"123456789012\", \"987654321098\"]</code>. Maximum length: 2000 characters.</p>"
+        },
+        "emitSystemFieldDimensions":{
+          "shape":"EmitSystemFields",
+          "documentation":"<p>A list of system fields to emit as additional dimensions in the generated metrics. Valid values are <code>@aws.account</code> and <code>@aws.region</code>. These dimensions help identify the source of centralized log data and count toward the total dimension limit for metric filters.</p>"
         }
       }
     },
@@ -6077,6 +6108,14 @@
         "applyOnTransformedLogs":{
           "shape":"ApplyOnTransformedLogs",
           "documentation":"<p>This parameter is valid only for log groups that have an active log transformer. For more information about log transformers, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutTransformer.html\">PutTransformer</a>.</p> <p>If the log group uses either a log-group level or account-level transformer, and you specify <code>true</code>, the subscription filter will be applied on the transformed version of the log events instead of the original ingested log events.</p>"
+        },
+        "fieldSelectionCriteria":{
+          "shape":"FieldSelectionCriteria",
+          "documentation":"<p>A filter expression that specifies which log events should be processed by this subscription filter based on system fields such as source account and source region. Uses selection criteria syntax with operators like <code>=</code>, <code>!=</code>, <code>AND</code>, <code>OR</code>, <code>IN</code>, <code>NOT IN</code>. Example: <code>@aws.region NOT IN [\"cn-north-1\"]</code> or <code>@aws.account = \"123456789012\" AND @aws.region = \"us-east-1\"</code>. Maximum length: 2000 characters.</p>"
+        },
+        "emitSystemFields":{
+          "shape":"EmitSystemFields",
+          "documentation":"<p>A list of system fields to include in the log events sent to the subscription destination. Valid values are <code>@aws.account</code> and <code>@aws.region</code>. These fields provide source information for centralized log data in the forwarded payload.</p>"
         }
       }
     },
@@ -6812,6 +6851,14 @@
         "creationTime":{
           "shape":"Timestamp",
           "documentation":"<p>The creation time of the subscription filter, expressed as the number of milliseconds after <code>Jan 1, 1970 00:00:00 UTC</code>.</p>"
+        },
+        "fieldSelectionCriteria":{
+          "shape":"FieldSelectionCriteria",
+          "documentation":"<p>The filter expression that specifies which log events are processed by this subscription filter based on system fields. Returns the <code>fieldSelectionCriteria</code> value if it was specified when the subscription filter was created.</p>"
+        },
+        "emitSystemFields":{
+          "shape":"EmitSystemFields",
+          "documentation":"<p>The list of system fields that are included in the log events sent to the subscription destination. Returns the <code>emitSystemFields</code> value if it was specified when the subscription filter was created.</p>"
         }
       },
       "documentation":"<p>Represents a subscription filter.</p>"
@@ -6897,6 +6944,7 @@
         "HOURS"
       ]
     },
+    "SystemField":{"type":"string"},
     "TagKey":{
       "type":"string",
       "max":128,
diff --git a/services/codeartifact/pom.xml b/services/codeartifact/pom.xml
index e0067f0e6fb7..63bc8bb06176 100644
--- a/services/codeartifact/pom.xml
+++ b/services/codeartifact/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codeartifact</artifactId>
     <name>AWS Java SDK :: Services :: Codeartifact</name>
diff --git a/services/codebuild/pom.xml b/services/codebuild/pom.xml
index 29ea915f5cd8..d8870a6eae15 100644
--- a/services/codebuild/pom.xml
+++ b/services/codebuild/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codebuild</artifactId>
     <name>AWS Java SDK :: Services :: AWS Code Build</name>
diff --git a/services/codecatalyst/pom.xml b/services/codecatalyst/pom.xml
index 1228aff39f65..3db01fc38366 100644
--- a/services/codecatalyst/pom.xml
+++ b/services/codecatalyst/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codecatalyst</artifactId>
     <name>AWS Java SDK :: Services :: Code Catalyst</name>
diff --git a/services/codecommit/pom.xml b/services/codecommit/pom.xml
index 0b80ecfc00f5..7eb16c33c4dc 100644
--- a/services/codecommit/pom.xml
+++ b/services/codecommit/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codecommit</artifactId>
     <name>AWS Java SDK :: Services :: AWS CodeCommit</name>
diff --git a/services/codeconnections/pom.xml b/services/codeconnections/pom.xml
index 4382839b7e64..94b6adfc049e 100644
--- a/services/codeconnections/pom.xml
+++ b/services/codeconnections/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codeconnections</artifactId>
     <name>AWS Java SDK :: Services :: Code Connections</name>
diff --git a/services/codedeploy/pom.xml b/services/codedeploy/pom.xml
index 568e417057eb..f89ae06cded0 100644
--- a/services/codedeploy/pom.xml
+++ b/services/codedeploy/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codedeploy</artifactId>
     <name>AWS Java SDK :: Services :: AWS CodeDeploy</name>
diff --git a/services/codeguruprofiler/pom.xml b/services/codeguruprofiler/pom.xml
index be2faaa9dca3..85aff4f5daee 100644
--- a/services/codeguruprofiler/pom.xml
+++ b/services/codeguruprofiler/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codeguruprofiler</artifactId>
     <name>AWS Java SDK :: Services :: CodeGuruProfiler</name>
diff --git a/services/codegurureviewer/pom.xml b/services/codegurureviewer/pom.xml
index 8ec6b5729f1c..37384536a1ab 100644
--- a/services/codegurureviewer/pom.xml
+++ b/services/codegurureviewer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codegurureviewer</artifactId>
     <name>AWS Java SDK :: Services :: CodeGuru Reviewer</name>
diff --git a/services/codegurusecurity/pom.xml b/services/codegurusecurity/pom.xml
index 5701a404a078..74ad7d0246ef 100644
--- a/services/codegurusecurity/pom.xml
+++ b/services/codegurusecurity/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codegurusecurity</artifactId>
     <name>AWS Java SDK :: Services :: Code Guru Security</name>
diff --git a/services/codepipeline/pom.xml b/services/codepipeline/pom.xml
index 6ca5b0389901..1897b17b8515 100644
--- a/services/codepipeline/pom.xml
+++ b/services/codepipeline/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codepipeline</artifactId>
     <name>AWS Java SDK :: Services :: AWS CodePipeline</name>
diff --git a/services/codestarconnections/pom.xml b/services/codestarconnections/pom.xml
index 46c0a58c9f34..cd6abd0ae1de 100644
--- a/services/codestarconnections/pom.xml
+++ b/services/codestarconnections/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codestarconnections</artifactId>
     <name>AWS Java SDK :: Services :: CodeStar connections</name>
diff --git a/services/codestarnotifications/pom.xml b/services/codestarnotifications/pom.xml
index 59de97c28244..eece15d6500d 100644
--- a/services/codestarnotifications/pom.xml
+++ b/services/codestarnotifications/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>codestarnotifications</artifactId>
     <name>AWS Java SDK :: Services :: Codestar Notifications</name>
diff --git a/services/cognitoidentity/pom.xml b/services/cognitoidentity/pom.xml
index 88e8762b6b46..ceadaa71c4ec 100644
--- a/services/cognitoidentity/pom.xml
+++ b/services/cognitoidentity/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cognitoidentity</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Cognito Identity</name>
diff --git a/services/cognitoidentityprovider/pom.xml b/services/cognitoidentityprovider/pom.xml
index fb7b16bb2d8c..9fceec5e2fa2 100644
--- a/services/cognitoidentityprovider/pom.xml
+++ b/services/cognitoidentityprovider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cognitoidentityprovider</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Cognito Identity Provider Service</name>
diff --git a/services/cognitosync/pom.xml b/services/cognitosync/pom.xml
index cf481c11296b..79dc7f906477 100644
--- a/services/cognitosync/pom.xml
+++ b/services/cognitosync/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>cognitosync</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Cognito Sync</name>
diff --git a/services/comprehend/pom.xml b/services/comprehend/pom.xml
index c58e112b8e85..b6efbc06935a 100644
--- a/services/comprehend/pom.xml
+++ b/services/comprehend/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>comprehend</artifactId>
diff --git a/services/comprehendmedical/pom.xml b/services/comprehendmedical/pom.xml
index da44839c4e82..f8ac4d336292 100644
--- a/services/comprehendmedical/pom.xml
+++ b/services/comprehendmedical/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>comprehendmedical</artifactId>
     <name>AWS Java SDK :: Services :: ComprehendMedical</name>
diff --git a/services/computeoptimizer/pom.xml b/services/computeoptimizer/pom.xml
index 9346a56e2899..916c64459117 100644
--- a/services/computeoptimizer/pom.xml
+++ b/services/computeoptimizer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>computeoptimizer</artifactId>
     <name>AWS Java SDK :: Services :: Compute Optimizer</name>
diff --git a/services/config/pom.xml b/services/config/pom.xml
index 705d041fdcc7..288adff111c6 100644
--- a/services/config/pom.xml
+++ b/services/config/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>config</artifactId>
     <name>AWS Java SDK :: Services :: AWS Config</name>
diff --git a/services/config/src/main/resources/codegen-resources/service-2.json b/services/config/src/main/resources/codegen-resources/service-2.json
index 89b23a8f80e8..14fcde570b11 100644
--- a/services/config/src/main/resources/codegen-resources/service-2.json
+++ b/services/config/src/main/resources/codegen-resources/service-2.json
@@ -7226,7 +7226,8 @@
         "QUEUED",
         "IN_PROGRESS",
         "SUCCEEDED",
-        "FAILED"
+        "FAILED",
+        "UNKNOWN"
       ]
     },
     "RemediationExecutionStatus":{
@@ -7287,7 +7288,10 @@
       "enum":[
         "SUCCEEDED",
         "PENDING",
-        "FAILED"
+        "FAILED",
+        "IN_PROGRESS",
+        "EXITED",
+        "UNKNOWN"
       ]
     },
     "RemediationExecutionSteps":{
diff --git a/services/connect/pom.xml b/services/connect/pom.xml
index d96963facb14..714f2bd78e70 100644
--- a/services/connect/pom.xml
+++ b/services/connect/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>connect</artifactId>
     <name>AWS Java SDK :: Services :: Connect</name>
diff --git a/services/connect/src/main/resources/codegen-resources/paginators-1.json b/services/connect/src/main/resources/codegen-resources/paginators-1.json
index 0015869326c2..fb423c472d86 100644
--- a/services/connect/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/connect/src/main/resources/codegen-resources/paginators-1.json
@@ -199,6 +199,16 @@
       "limit_key": "MaxResults",
       "output_token": "NextToken"
     },
+    "ListRoutingProfileManualAssignmentQueues": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "non_aggregate_keys": [
+        "LastModifiedRegion",
+        "LastModifiedTime"
+      ],
+      "output_token": "NextToken",
+      "result_key": "RoutingProfileManualAssignmentQueueConfigSummaryList"
+    },
     "ListRoutingProfileQueues": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
diff --git a/services/connect/src/main/resources/codegen-resources/service-2.json b/services/connect/src/main/resources/codegen-resources/service-2.json
index b4e2b7fa31c4..a1bb6c9fabaa 100644
--- a/services/connect/src/main/resources/codegen-resources/service-2.json
+++ b/services/connect/src/main/resources/codegen-resources/service-2.json
@@ -85,6 +85,24 @@
       ],
       "documentation":"<p>This API is in preview release for Amazon Connect and is subject to change.</p> <p>Allows the specified Amazon Connect instance to access the specified Amazon Lex or Amazon Lex V2 bot.</p>"
     },
+    "AssociateContactWithUser":{
+      "name":"AssociateContactWithUser",
+      "http":{
+        "method":"POST",
+        "requestUri":"/contacts/{InstanceId}/{ContactId}/associate-user"
+      },
+      "input":{"shape":"AssociateContactWithUserRequest"},
+      "output":{"shape":"AssociateContactWithUserResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Associates a queued contact with an agent.</p> <p> <b>Use cases</b> </p> <p>Following are common uses cases for this API:</p> <ul> <li> <p>Custom contact routing. You can build custom contact routing mechanisms beyond the default system routing in Amazon Connect. You can create tailored contact distribution logic that offers queued contacts directly to specific agents.</p> </li> <li> <p>Manual contact assignment. You can programmatically assign queued contacts to available users. This provides flexibility to contact centers that require manual oversight or specialized routing workflows outside of standard queue management.</p> <p>For information about how manual contact assignment works in the agent workspace, see the <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/worklist-app.html\">Access the Worklist app in the Amazon Connect agent workspace</a> in the <i>Amazon Connect Administrator Guide</i>. </p> </li> </ul> <p> <b>Important things to know</b> </p> <ul> <li> <p>Use this API chat/SMS, email, and task contacts. It does not support voice contacts.</p> </li> <li> <p>Use it to associate contacts with users regardless of their current state, including custom states. Ensure your application logic accounts for user availability before making associations.</p> </li> <li> <p>It honors the IAM context key <code>connect:PreferredUserArn</code> to prevent unauthorized contact associations.</p> </li> <li> <p>It respects the IAM context key <code>connect:PreferredUserArn</code> to enforce authorization controls and prevent unauthorized contact associations. Verify that your IAM policies are properly configured to support your intended use cases.</p> </li> </ul> <p> <b>Endpoints</b>: See <a href=\"https://docs.aws.amazon.com/general/latest/gr/connect_region.html\">Amazon Connect endpoints and quotas</a>.</p>"
+    },
     "AssociateDefaultVocabulary":{
       "name":"AssociateDefaultVocabulary",
       "http":{
@@ -2047,7 +2065,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServiceException"}
       ],
-      "documentation":"<p>Disassociates a set of queues from a routing profile.</p>"
+      "documentation":"<p>Disassociates a set of queues from a routing profile.</p> <p>Up to 10 queue references can be disassociated in a single API call. More than 10 queue references results in a single call results in an InvalidParameterException.</p>"
     },
     "DisassociateSecurityKey":{
       "name":"DisassociateSecurityKey",
@@ -2166,7 +2184,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"InternalServiceException"}
       ],
-      "documentation":"<p>Gets the real-time metrics of the specified contact.</p> <p> <b>Use cases</b> </p> <p>Following are common uses cases for this API:</p> <ul> <li> <p>You can use this API to retrieve the position of the contact in the queue.</p> </li> </ul> <p> <b>Endpoints</b>: See <a href=\"https://docs.aws.amazon.com/general/latest/gr/connect_region.html\">Amazon Connect endpoints and quotas</a>.</p>"
+      "documentation":"<p>Retrieves the position of the contact in the queue.</p> <p> <b>Use cases</b> </p> <p>Following are common uses cases for position in queue:</p> <ul> <li> <p>Understand the expected wait experience of a contact.</p> </li> <li> <p>Inform customers of their position in queue and potentially offer a callback.</p> </li> <li> <p>Make data-driven routing decisions between primary and alternative queues.</p> </li> <li> <p>Enhance queue visibility and leverage agent proficiencies to streamline contact routing.</p> </li> </ul> <p> <b>Important things to know</b> </p> <ul> <li> <p>The only way to retrieve the position of the contact in queue is by using this API. You can't retrieve the position by using flows and attributes.</p> </li> <li> <p>For more information, see the <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html\">Position in queue</a> metric in the <i>Amazon Connect Administrator Guide</i>. </p> </li> </ul> <p> <b>Endpoints</b>: See <a href=\"https://docs.aws.amazon.com/general/latest/gr/connect_region.html\">Amazon Connect endpoints and quotas</a>.</p>"
     },
     "GetCurrentMetricData":{
       "name":"GetCurrentMetricData",
@@ -2897,6 +2915,23 @@
       ],
       "documentation":"<p>Provides a list of analysis segments for a real-time chat analysis session. This API supports CHAT channels only. </p> <important> <p>This API does not support VOICE. If you attempt to use it for VOICE, an <code>InvalidRequestException</code> occurs.</p> </important>"
     },
+    "ListRoutingProfileManualAssignmentQueues":{
+      "name":"ListRoutingProfileManualAssignmentQueues",
+      "http":{
+        "method":"GET",
+        "requestUri":"/routing-profiles/{InstanceId}/{RoutingProfileId}/manual-assignment-queues"
+      },
+      "input":{"shape":"ListRoutingProfileManualAssignmentQueuesRequest"},
+      "output":{"shape":"ListRoutingProfileManualAssignmentQueuesResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Lists the manual assignment queues associated with a routing profile.</p> <p> <b>Use cases</b> </p> <p>Following are common uses cases for this API:</p> <ul> <li> <p>This API returns list of queues where contacts can be manually assigned or picked. The user can additionally filter on queues, if they have access to those queues (otherwise a invalid request exception will be thrown).</p> <p>For information about how manual contact assignment works in the agent workspace, see the <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/worklist-app.html\">Access the Worklist app in the Amazon Connect agent workspace</a> in the <i>Amazon Connect Administrator Guide</i>. </p> </li> </ul> <p> <b>Important things to know</b> </p> <ul> <li> <p>This API only returns the manual assignment queues associated with a routing profile. Use the ListRoutingProfileQueues API to list the auto assignment queues for the routing profile.</p> </li> </ul> <p> <b>Endpoints</b>: See <a href=\"https://docs.aws.amazon.com/general/latest/gr/connect_region.html\">Amazon Connect endpoints and quotas</a>.</p>"
+    },
     "ListRoutingProfileQueues":{
       "name":"ListRoutingProfileQueues",
       "http":{
@@ -5679,6 +5714,36 @@
         }
       }
     },
+    "AssociateContactWithUserRequest":{
+      "type":"structure",
+      "required":[
+        "InstanceId",
+        "ContactId",
+        "UserId"
+      ],
+      "members":{
+        "InstanceId":{
+          "shape":"InstanceId",
+          "documentation":"<p>The identifier of the Amazon Connect instance. You can <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/find-instance-arn.html\">find the instance ID</a> in the Amazon Resource Name (ARN) of the instance.</p>",
+          "location":"uri",
+          "locationName":"InstanceId"
+        },
+        "ContactId":{
+          "shape":"ContactId",
+          "documentation":"<p>The identifier of the contact in this instance of Amazon Connect. </p>",
+          "location":"uri",
+          "locationName":"ContactId"
+        },
+        "UserId":{
+          "shape":"AgentResourceId",
+          "documentation":"<p>The identifier for the user. This can be the ID or the ARN of the user.</p>"
+        }
+      }
+    },
+    "AssociateContactWithUserResponse":{
+      "type":"structure",
+      "members":{}
+    },
     "AssociateDefaultVocabularyRequest":{
       "type":"structure",
       "required":[
@@ -5881,8 +5946,7 @@
       "type":"structure",
       "required":[
         "InstanceId",
-        "RoutingProfileId",
-        "QueueConfigs"
+        "RoutingProfileId"
       ],
       "members":{
         "InstanceId":{
@@ -5900,6 +5964,10 @@
         "QueueConfigs":{
           "shape":"RoutingProfileQueueConfigList",
           "documentation":"<p>The queues to associate with this routing profile.</p>"
+        },
+        "ManualAssignmentQueueConfigs":{
+          "shape":"RoutingProfileManualAssignmentQueueConfigList",
+          "documentation":"<p>The manual assignment queues to associate with this routing profile.</p>"
         }
       }
     },
@@ -7824,7 +7892,7 @@
           "documentation":"<p>The message.</p>"
         }
       },
-      "documentation":"<p>The contact with the specified ID is not active or does not exist. Applies to Voice calls only, not to Chat or Task contacts.</p>",
+      "documentation":"<p>The contact with the specified ID is not active or does not exist.</p>",
       "error":{"httpStatusCode":410},
       "exception":true
     },
@@ -7891,7 +7959,12 @@
         "SegmentAttributes":{
           "shape":"ContactSearchSummarySegmentAttributes",
           "documentation":"<p>Set of segment attributes for a contact.</p>"
-        }
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>Indicates name of the contact.</p>"
+        },
+        "RoutingCriteria":{"shape":"RoutingCriteria"}
       },
       "documentation":"<p>Information of returned contact.</p>"
     },
@@ -7929,6 +8002,10 @@
         "ValueString":{
           "shape":"SegmentAttributeValueString",
           "documentation":"<p>The value of a segment attribute represented as a string.</p>"
+        },
+        "ValueMap":{
+          "shape":"SegmentAttributeValueMap",
+          "documentation":"<p>The key and value of a segment attribute.</p>"
         }
       },
       "documentation":"<p>The value of a segment attribute. This is structured as a map with a single key-value pair. The key 'valueString' indicates that the attribute type is a string, and its corresponding value is the actual string value of the segment attribute.</p>"
@@ -9014,6 +9091,10 @@
           "shape":"RoutingProfileQueueConfigList",
           "documentation":"<p>The inbound queues associated with the routing profile. If no queue is added, the agent can make only outbound calls.</p> <p>The limit of 10 array members applies to the maximum number of <code>RoutingProfileQueueConfig</code> objects that can be passed during a CreateRoutingProfile API request. It is different from the quota of 50 queues per routing profile per instance that is listed in <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/amazon-connect-service-limits.html\">Amazon Connect service quotas</a>. </p>"
         },
+        "ManualAssignmentQueueConfigs":{
+          "shape":"RoutingProfileManualAssignmentQueueConfigList",
+          "documentation":"<p>The manual assignment queues associated with the routing profile. If no queue is added, agents and supervisors can't pick or assign any contacts from this routing profile. The limit of 10 array members applies to the maximum number of RoutingProfileManualAssignmentQueueConfig objects that can be passed during a CreateRoutingProfile API request. It is different from the quota of 50 queues per routing profile per instance that is listed in Amazon Connect service quotas.</p>"
+        },
         "MediaConcurrencies":{
           "shape":"MediaConcurrencies",
           "documentation":"<p>The channels that agents can handle in the Contact Control Panel (CCP) for this routing profile.</p>"
@@ -11783,8 +11864,7 @@
       "type":"structure",
       "required":[
         "InstanceId",
-        "RoutingProfileId",
-        "QueueReferences"
+        "RoutingProfileId"
       ],
       "members":{
         "InstanceId":{
@@ -11802,6 +11882,10 @@
         "QueueReferences":{
           "shape":"RoutingProfileQueueReferenceList",
           "documentation":"<p>The queues to disassociate from this routing profile.</p>"
+        },
+        "ManualAssignmentQueueReferences":{
+          "shape":"RoutingProfileQueueReferenceList",
+          "documentation":"<p>The manual assignment queues to disassociate with this routing profile.</p>"
         }
       }
     },
@@ -13970,7 +14054,7 @@
         },
         "Metrics":{
           "shape":"MetricsV2",
-          "documentation":"<p>The metrics to retrieve. Specify the name, groupings, and filters for each metric. The following historical metrics are available. For a description of each metric, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html\">Metrics definition</a> in the <i>Amazon Connect Administrator Guide</i>.</p> <dl> <dt>ABANDONMENT_RATE</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#abandonment-rate\">Abandonment rate</a> </p> </dd> <dt>AGENT_ADHERENT_TIME</dt> <dd> <p>This metric is available only in Amazon Web Services Regions where <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/regions.html#optimization_region\">Forecasting, capacity planning, and scheduling</a> is available.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy </p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#adherent-time\">Adherent time</a> </p> </dd> <dt>AGENT_ANSWER_RATE</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-answer-rate\">Agent answer rate</a> </p> </dd> <dt>AGENT_NON_ADHERENT_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#non-adherent-time\">Non-adherent time</a> </p> </dd> <dt>AGENT_NON_RESPONSE</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy </p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-non-response\">Agent non-response</a> </p> </dd> <dt>AGENT_NON_RESPONSE_WITHOUT_CUSTOMER_ABANDONS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>Data for this metric is available starting from October 1, 2023 0:00:00 GMT.</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-non-response-without-customer-abandons\">Agent non-response without customer abandons</a> </p> </dd> <dt>AGENT_OCCUPANCY</dt> <dd> <p>Unit: Percentage</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy </p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#occupancy\">Occupancy</a> </p> </dd> <dt>AGENT_SCHEDULE_ADHERENCE</dt> <dd> <p>This metric is available only in Amazon Web Services Regions where <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/regions.html#optimization_region\">Forecasting, capacity planning, and scheduling</a> is available.</p> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#adherence\">Adherence</a> </p> </dd> <dt>AGENT_SCHEDULED_TIME</dt> <dd> <p>This metric is available only in Amazon Web Services Regions where <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/regions.html#optimization_region\">Forecasting, capacity planning, and scheduling</a> is available.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#scheduled-time\">Scheduled time</a> </p> </dd> <dt>AVG_ABANDON_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-queue-abandon-time\">Average queue abandon time</a> </p> </dd> <dt>AVG_ACTIVE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-active-time\">Average active time</a> </p> </dd> <dt>AVG_AFTER_CONTACT_WORK_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#after-contact-work-time\">Average after contact work time</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_AGENT_CONNECTING_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code>. For now, this metric only supports the following as <code>INITIATION_METHOD</code>: <code>INBOUND</code> | <code>OUTBOUND</code> | <code>CALLBACK</code> | <code>API</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-api-connecting-time\">Average agent API connecting time</a> </p> <note> <p>The <code>Negate</code> key in metric-level filters is not applicable for this metric.</p> </note> </dd> <dt>AVG_AGENT_PAUSE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-pause-time\">Average agent pause time</a> </p> </dd> <dt>AVG_BOT_CONVERSATION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#average-bot-conversation-time\">Average bot conversation time</a> </p> </dd> <dt>AVG_BOT_CONVERSATION_TURNS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#average-bot-conversation-turns\">Average bot conversation turns</a> </p> </dd> <dt>AVG_CASE_RELATED_CONTACTS</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-contacts-per-case\">Average contacts per case</a> </p> </dd> <dt>AVG_CASE_RESOLUTION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-case-resolution-time\">Average case resolution time</a> </p> </dd> <dt>AVG_CONTACT_DURATION</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-contact-duration\">Average contact duration</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_CONTACT_FIRST_RESPONSE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-average-contact-first-response-wait-time\">Agent average contact first response wait time</a> </p> </dd> <dt>AVG_CONVERSATION_CLOSE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-conversation-close-time\">Average conversation close time</a> </p> </dd> <dt>AVG_CONVERSATION_DURATION</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-conversation-duration\">Average conversation duration</a> </p> </dd> <dt>AVG_DIALS_PER_MINUTE</dt> <dd> <p>This metric is available only for outbound campaigns that use the agent assisted voice and automated voice delivery modes.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Campaign, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-dials-per-minute\">Average dials per minute</a> </p> </dd> <dt>AVG_EVALUATION_SCORE</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, Evaluation Form ID, Evaluation Section ID, Evaluation Question ID, Evaluation Source, Form Version, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-evaluation-score\">Average evaluation score</a> </p> </dd> <dt>AVG_FIRST_RESPONSE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-first-response-time\">Average agent first response time</a> </p> </dd> <dt>AVG_FLOW_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-flow-time\">Average flow time</a> </p> </dd> <dt>AVG_GREETING_TIME_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-greeting-time\">Average agent greeting time</a> </p> </dd> <dt>AVG_HANDLE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, RoutingStepExpression</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-handle-time\">Average handle time</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_HOLD_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-hold-time\">Average customer hold time</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_HOLD_TIME_ALL_CONTACTS</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-hold-time-all-contacts\">Average customer hold time all contacts</a> </p> </dd> <dt>AVG_HOLDS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-holds\">Average holds</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_INTERACTION_AND_HOLD_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-interaction-and-customer-hold-time\">Average agent interaction and customer hold time</a> </p> </dd> <dt>AVG_INTERACTION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-interaction-time\">Average agent interaction time</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_INTERRUPTIONS_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-interruptions\">Average agent interruptions</a> </p> </dd> <dt>AVG_INTERRUPTION_TIME_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-interruption-time\">Average agent interruption time</a> </p> </dd> <dt>AVG_MESSAGE_LENGTH_AGENT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-message-length\">Average agent message length</a> </p> </dd> <dt>AVG_MESSAGE_LENGTH_CUSTOMER</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-message-length\">Average customer message length</a> </p> </dd> <dt>AVG_MESSAGES</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-messages\">Average messages</a> </p> </dd> <dt>AVG_MESSAGES_AGENT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-messages\">Average agent messages</a> </p> </dd> <dt>AVG_MESSAGES_BOT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-bot-messages\">Average bot messages</a> </p> </dd> <dt>AVG_MESSAGES_CUSTOMER</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-messages\">Average customer messages</a> </p> </dd> <dt>AVG_NON_TALK_TIME</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-non-talk-time\">Average non-talk time</a> </p> </dd> <dt>AVG_QUEUE_ANSWER_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-queue-answer-time\">Average queue answer time</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_RESPONSE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-response-time-agent\">Average agent response time</a> </p> </dd> <dt>AVG_RESPONSE_TIME_CUSTOMER</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-time-agent\">Average customer response time</a> </p> </dd> <dt>AVG_RESOLUTION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-resolution-time\">Average resolution time</a> </p> </dd> <dt>AVG_TALK_TIME</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-talk-time\">Average talk time</a> </p> </dd> <dt>AVG_TALK_TIME_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-talk-time\">Average agent talk time</a> </p> </dd> <dt>AVG_TALK_TIME_CUSTOMER</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-talk-time\">Average customer talk time</a> </p> </dd> <dt>AVG_WAIT_TIME_AFTER_CUSTOMER_CONNECTION</dt> <dd> <p>This metric is available only for outbound campaigns that use the agent assisted voice and automated voice delivery modes.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Campaign</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-wait-time-after-customer-connection\">Average wait time after customer connection</a> </p> </dd> <dt>AVG_WEIGHTED_EVALUATION_SCORE</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, Evaluation Form Id, Evaluation Section ID, Evaluation Question ID, Evaluation Source, Form Version, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-weighted-evaluation-score\">Average weighted evaluation score</a> </p> </dd> <dt>BOT_CONVERSATIONS_COMPLETED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#bot-conversations-completed\">Bot conversations completed</a> </p> </dd> <dt>BOT_INTENTS_COMPLETED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Bot intent name, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#bot-intents-completed\">Bot intents completed</a> </p> </dd> <dt>CAMPAIGN_CONTACTS_ABANDONED_AFTER_X</dt> <dd> <p>This metric is available only for outbound campaigns using the agent assisted voice and automated voice delivery modes.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Campaign</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you must enter <code>GT</code> (for <i>Greater than</i>).</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-contacts-abandoned-after-x\">Campaign contacts abandoned after X</a> </p> </dd> <dt>CAMPAIGN_CONTACTS_ABANDONED_AFTER_X_RATE</dt> <dd> <p>This metric is available only for outbound campaigns using the agent assisted voice and automated voice delivery modes.</p> <p>Unit: Percent</p> <p>Valid groupings and filters: Agent, Campaign</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you must enter <code>GT</code> (for <i>Greater than</i>).</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-contacts-abandoned-after-x-rate\">Campaign contacts abandoned after X rate</a> </p> </dd> <dt>CAMPAIGN_INTERACTIONS</dt> <dd> <p>This metric is available only for outbound campaigns using the email delivery mode. </p> <p>Unit: Count</p> <p>Valid metric filter key: CAMPAIGN_INTERACTION_EVENT_TYPE</p> <p>Valid groupings and filters: Campaign</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-interactions\">Campaign interactions</a> </p> </dd> <dt>CAMPAIGN_PROGRESS_RATE</dt> <dd> <p>This metric is only available for outbound campaigns initiated using a customer segment. It is not available for event triggered campaigns.</p> <p>Unit: Percent</p> <p>Valid groupings and filters: Campaign, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-progress-rate\">Campaign progress rate</a> </p> </dd> <dt>CAMPAIGN_SEND_ATTEMPTS</dt> <dd> <p>This metric is available only for outbound campaigns.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Channel, contact/segmentAttributes/connect:Subtype </p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-send-attempts\">Campaign send attempts</a> </p> </dd> <dt>CAMPAIGN_SEND_EXCLUSIONS</dt> <dd> <p>This metric is available only for outbound campaigns.</p> <p>Valid metric filter key: CAMPAIGN_EXCLUDED_EVENT_TYPE</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Campaign Excluded Event Type, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-send-exclusions\">Campaign send exclusions</a> </p> </dd> <dt>CASES_CREATED</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#cases-created\">Cases created</a> </p> </dd> <dt>CONTACTS_CREATED</dt> <dd> <p>Unit: Count</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-created\">Contacts created</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>CONTACTS_HANDLED</dt> <dd> <p>Unit: Count</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code>, <code>DISCONNECT_REASON</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, RoutingStepExpression, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#api-contacts-handled\">API contacts handled</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>CONTACTS_HANDLED_BY_CONNECTED_TO_AGENT</dt> <dd> <p>Unit: Count</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code> </p> <p>Valid groupings and filters: Queue, Channel, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-handled-by-connected-to-agent-timestamp\">Contacts handled (connected to agent timestamp)</a> </p> </dd> <dt>CONTACTS_HOLD_ABANDONS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-hold-disconnect\">Contacts hold disconnect</a> </p> </dd> <dt>CONTACTS_ON_HOLD_AGENT_DISCONNECT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-hold-agent-disconnect\">Contacts hold agent disconnect</a> </p> </dd> <dt>CONTACTS_ON_HOLD_CUSTOMER_DISCONNECT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-hold-customer-disconnect\">Contacts hold customer disconnect</a> </p> </dd> <dt>CONTACTS_PUT_ON_HOLD</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-put-on-hold\">Contacts put on hold</a> </p> </dd> <dt>CONTACTS_TRANSFERRED_OUT_EXTERNAL</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out-external\">Contacts transferred out external</a> </p> </dd> <dt>CONTACTS_TRANSFERRED_OUT_INTERNAL</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out-internal\">Contacts transferred out internal</a> </p> </dd> <dt>CONTACTS_QUEUED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-queued\">Contacts queued</a> </p> </dd> <dt>CONTACTS_QUEUED_BY_ENQUEUE</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-queued-by-enqueue\">Contacts queued (enqueue timestamp)</a> </p> </dd> <dt>CONTACTS_REMOVED_FROM_QUEUE_IN_X</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-removed-from-queue\">Contacts removed from queue in X seconds</a> </p> </dd> <dt>CONTACTS_RESOLVED_IN_X</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-resolved\">Contacts resolved in X</a> </p> </dd> <dt>CONTACTS_TRANSFERRED_OUT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out\">Contacts transferred out</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>CONTACTS_TRANSFERRED_OUT_BY_AGENT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out-by-agent\">Contacts transferred out by agent</a> </p> </dd> <dt>CONTACTS_TRANSFERRED_OUT_FROM_QUEUE</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out-queue\">Contacts transferred out queue</a> </p> </dd> <dt>CURRENT_CASES</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#current-cases\">Current cases</a> </p> </dd> <dt>CONVERSATIONS_ABANDONED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#conversations-abandoned\">Conversations abandoned</a> </p> </dd> <dt>DELIVERY_ATTEMPTS</dt> <dd> <p>This metric is available only for outbound campaigns.</p> <p>Unit: Count</p> <p>Valid metric filter key: <code>ANSWERING_MACHINE_DETECTION_STATUS</code>, <code>CAMPAIGN_DELIVERY_EVENT_TYPE</code>, <code>DISCONNECT_REASON</code> </p> <p>Valid groupings and filters: Agent, Answering Machine Detection Status, Campaign, Campaign Delivery EventType, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#delivery-attempts\">Delivery attempts</a> </p> <note> <p>Campaign Delivery EventType filter and grouping are only available for SMS and Email campaign delivery modes. Agent, Queue, Routing Profile, Answering Machine Detection Status and Disconnect Reason are only available for agent assisted voice and automated voice delivery modes. </p> </note> </dd> <dt>DELIVERY_ATTEMPT_DISPOSITION_RATE</dt> <dd> <p>This metric is available only for outbound campaigns. Dispositions for the agent assisted voice and automated voice delivery modes are only available with answering machine detection enabled.</p> <p>Unit: Percent</p> <p>Valid metric filter key: <code>ANSWERING_MACHINE_DETECTION_STATUS</code>, <code>CAMPAIGN_DELIVERY_EVENT_TYPE</code>, <code>DISCONNECT_REASON</code> </p> <p>Valid groupings and filters: Agent, Answering Machine Detection Status, Campaign, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#delivery-attempt-disposition-rate\">Delivery attempt disposition rate</a> </p> <note> <p>Campaign Delivery Event Type filter and grouping are only available for SMS and Email campaign delivery modes. Agent, Queue, Routing Profile, Answering Machine Detection Status and Disconnect Reason are only available for agent assisted voice and automated voice delivery modes. </p> </note> </dd> <dt>EVALUATIONS_PERFORMED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, Evaluation Form ID, Evaluation Source, Form Version, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#evaluations-performed\">Evaluations performed</a> </p> </dd> <dt>FLOWS_OUTCOME</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#flows-outcome\">Flows outcome</a> </p> </dd> <dt>FLOWS_STARTED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#flows-started\">Flows started</a> </p> </dd> <dt>HUMAN_ANSWERED_CALLS</dt> <dd> <p>This metric is available only for outbound campaigns. Dispositions for the agent assisted voice and automated voice delivery modes are only available with answering machine detection enabled. </p> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Campaign</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#human-answered\">Human answered</a> </p> </dd> <dt>MAX_FLOW_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#maximum-flow-time\">Maximum flow time</a> </p> </dd> <dt>MAX_QUEUED_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#maximum-queued-time\">Maximum queued time</a> </p> </dd> <dt>MIN_FLOW_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#minimum-flow-time\">Minimum flow time</a> </p> </dd> <dt>PERCENT_AUTOMATIC_FAILS</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, Evaluation Form ID, Evaluation Source, Form Version, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#automatic-fails-percent\">Automatic fails percent</a> </p> </dd> <dt>PERCENT_BOT_CONVERSATIONS_OUTCOME</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#percent-bot-conversations-outcome\">Percent bot conversations outcome</a> </p> </dd> <dt>PERCENT_BOT_INTENTS_OUTCOME</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Bot intent name, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#percent-bot-intents-outcome\">Percent bot intents outcome</a> </p> </dd> <dt>PERCENT_CASES_FIRST_CONTACT_RESOLVED</dt> <dd> <p>Unit: Percent</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#cases-resolved-on-first-contact\">Cases resolved on first contact</a> </p> </dd> <dt>PERCENT_CONTACTS_STEP_EXPIRED</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, RoutingStepExpression</p> <p>UI name: This metric is available in Real-time Metrics UI but not on the Historical Metrics UI.</p> </dd> <dt>PERCENT_CONTACTS_STEP_JOINED</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, RoutingStepExpression</p> <p>UI name: This metric is available in Real-time Metrics UI but not on the Historical Metrics UI.</p> </dd> <dt>PERCENT_FLOWS_OUTCOME</dt> <dd> <p>Unit: Percent</p> <p>Valid metric filter key: <code>FLOWS_OUTCOME_TYPE</code> </p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#flows-outcome-percentage\">Flows outcome percentage</a>.</p> <note> <p>The <code>FLOWS_OUTCOME_TYPE</code> is not a valid grouping.</p> </note> </dd> <dt>PERCENT_NON_TALK_TIME</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Percentage</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#non-talk-time-percent\">Non-talk time percent</a> </p> </dd> <dt>PERCENT_TALK_TIME</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Percentage</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#talk-time-percent\">Talk time percent</a> </p> </dd> <dt>PERCENT_TALK_TIME_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Percentage</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-talk-time-percent\">Agent talk time percent</a> </p> </dd> <dt>PERCENT_TALK_TIME_CUSTOMER</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Percentage</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#customer-talk-time-percent\">Customer talk time percent</a> </p> </dd> <dt>RECIPIENTS_ATTEMPTED</dt> <dd> <p>This metric is only available for outbound campaigns initiated using a customer segment. It is not available for event triggered campaigns.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#recipients-attempted\">Recipients attempted</a> </p> </dd> <dt>RECIPIENTS_INTERACTED</dt> <dd> <p>This metric is only available for outbound campaigns initiated using a customer segment. It is not available for event triggered campaigns.</p> <p>Valid metric filter key: CAMPAIGN_INTERACTION_EVENT_TYPE</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Channel, contact/segmentAttributes/connect:Subtype, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#recipients-interacted\">Recipients interacted</a> </p> </dd> <dt>RECIPIENTS_TARGETED</dt> <dd> <p>This metric is only available for outbound campaigns initiated using a customer segment. It is not available for event triggered campaigns.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#recipients-targeted\">Recipients targeted</a> </p> </dd> <dt>REOPENED_CASE_ACTIONS</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#cases-reopened\">Cases reopened</a> </p> </dd> <dt>RESOLVED_CASE_ACTIONS</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#cases-resolved\">Cases resolved</a> </p> </dd> <dt>SERVICE_LEVEL</dt> <dd> <p>You can include up to 20 SERVICE_LEVEL metrics in a request.</p> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#service-level\">Service level X</a> </p> </dd> <dt>STEP_CONTACTS_QUEUED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, RoutingStepExpression</p> <p>UI name: This metric is available in Real-time Metrics UI but not on the Historical Metrics UI.</p> </dd> <dt>SUM_AFTER_CONTACT_WORK_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#after-contact-work-time\">After contact work time</a> </p> </dd> <dt>SUM_CONNECTING_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code>. This metric only supports the following filter keys as <code>INITIATION_METHOD</code>: <code>INBOUND</code> | <code>OUTBOUND</code> | <code>CALLBACK</code> | <code>API</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-api-connecting-time\">Agent API connecting time</a> </p> <note> <p>The <code>Negate</code> key in metric-level filters is not applicable for this metric.</p> </note> </dd> <dt>CONTACTS_ABANDONED</dt> <dd> <p>Unit: Count</p> <p>Metric filter: </p> <ul> <li> <p>Valid values: <code>API</code>| <code>Incoming</code> | <code>Outbound</code> | <code>Transfer</code> | <code>Callback</code> | <code>Queue_Transfer</code>| <code>Disconnect</code> </p> </li> </ul> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, RoutingStepExpression, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-abandoned\">Contact abandoned</a> </p> </dd> <dt>SUM_CONTACTS_ABANDONED_IN_X</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-abandoned-in-x-seconds\">Contacts abandoned in X seconds</a> </p> </dd> <dt>SUM_CONTACTS_ANSWERED_IN_X</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-answered-in-x-seconds\">Contacts answered in X seconds</a> </p> </dd> <dt>SUM_CONTACT_FLOW_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contact-flow-time\">Contact flow time</a> </p> </dd> <dt>SUM_CONTACT_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-on-contact-time\">Agent on contact time</a> </p> </dd> <dt>SUM_CONTACTS_DISCONNECTED </dt> <dd> <p>Valid metric filter key: <code>DISCONNECT_REASON</code> </p> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contact-disconnected\">Contact disconnected</a> </p> </dd> <dt>SUM_ERROR_STATUS_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#error-status-time\">Error status time</a> </p> </dd> <dt>SUM_HANDLE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contact-handle-time\">Contact handle time</a> </p> </dd> <dt>SUM_HOLD_TIME</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#customer-hold-time\">Customer hold time</a> </p> </dd> <dt>SUM_IDLE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-idle-time\">Agent idle time</a> </p> </dd> <dt>SUM_INTERACTION_AND_HOLD_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-interaction-and-hold-time\">Agent interaction and hold time</a> </p> </dd> <dt>SUM_INTERACTION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-interaction-time\">Agent interaction time</a> </p> </dd> <dt>SUM_NON_PRODUCTIVE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-non-productive-time\">Agent non-productive time</a> </p> </dd> <dt>SUM_ONLINE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#online-time\">Online time</a> </p> </dd> <dt>SUM_RETRY_CALLBACK_ATTEMPTS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#callback-attempts\">Callback attempts</a> </p> </dd> </dl>"
+          "documentation":"<p>The metrics to retrieve. Specify the name, groupings, and filters for each metric. The following historical metrics are available. For a description of each metric, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html\">Metrics definition</a> in the <i>Amazon Connect Administrator Guide</i>.</p> <dl> <dt>ABANDONMENT_RATE</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#abandonment-rate\">Abandonment rate</a> </p> </dd> <dt>AGENT_ADHERENT_TIME</dt> <dd> <p>This metric is available only in Amazon Web Services Regions where <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/regions.html#optimization_region\">Forecasting, capacity planning, and scheduling</a> is available.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy </p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#adherent-time\">Adherent time</a> </p> </dd> <dt>AGENT_ANSWER_RATE</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-answer-rate\">Agent answer rate</a> </p> </dd> <dt>AGENT_NON_ADHERENT_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#non-adherent-time\">Non-adherent time</a> </p> </dd> <dt>AGENT_NON_RESPONSE</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy </p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-non-response\">Agent non-response</a> </p> </dd> <dt>AGENT_NON_RESPONSE_WITHOUT_CUSTOMER_ABANDONS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>Data for this metric is available starting from October 1, 2023 0:00:00 GMT.</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-non-response-without-customer-abandons\">Agent non-response without customer abandons</a> </p> </dd> <dt>AGENT_OCCUPANCY</dt> <dd> <p>Unit: Percentage</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy </p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#occupancy\">Occupancy</a> </p> </dd> <dt>AGENT_SCHEDULE_ADHERENCE</dt> <dd> <p>This metric is available only in Amazon Web Services Regions where <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/regions.html#optimization_region\">Forecasting, capacity planning, and scheduling</a> is available.</p> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#adherence\">Adherence</a> </p> </dd> <dt>AGENT_SCHEDULED_TIME</dt> <dd> <p>This metric is available only in Amazon Web Services Regions where <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/regions.html#optimization_region\">Forecasting, capacity planning, and scheduling</a> is available.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#scheduled-time\">Scheduled time</a> </p> </dd> <dt>AVG_ABANDON_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code> </p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-queue-abandon-time\">Average queue abandon time</a> </p> </dd> <dt>AVG_ACTIVE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-active-time\">Average active time</a> </p> </dd> <dt>AVG_AFTER_CONTACT_WORK_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#after-contact-work-time\">Average after contact work time</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_AGENT_CONNECTING_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code>. For now, this metric only supports the following as <code>INITIATION_METHOD</code>: <code>INBOUND</code> | <code>OUTBOUND</code> | <code>CALLBACK</code> | <code>API</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-api-connecting-time\">Average agent API connecting time</a> </p> <note> <p>The <code>Negate</code> key in metric-level filters is not applicable for this metric.</p> </note> </dd> <dt>AVG_AGENT_PAUSE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-pause-time\">Average agent pause time</a> </p> </dd> <dt>AVG_BOT_CONVERSATION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#average-bot-conversation-time\">Average bot conversation time</a> </p> </dd> <dt>AVG_BOT_CONVERSATION_TURNS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#average-bot-conversation-turns\">Average bot conversation turns</a> </p> </dd> <dt>AVG_CASE_RELATED_CONTACTS</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-contacts-per-case\">Average contacts per case</a> </p> </dd> <dt>AVG_CASE_RESOLUTION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-case-resolution-time\">Average case resolution time</a> </p> </dd> <dt>AVG_CONTACT_DURATION</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-contact-duration\">Average contact duration</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_CONTACT_FIRST_RESPONSE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-average-contact-first-response-wait-time\">Agent average contact first response wait time</a> </p> </dd> <dt>AVG_CONVERSATION_CLOSE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-conversation-close-time\">Average conversation close time</a> </p> </dd> <dt>AVG_CONVERSATION_DURATION</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-conversation-duration\">Average conversation duration</a> </p> </dd> <dt>AVG_DIALS_PER_MINUTE</dt> <dd> <p>This metric is available only for outbound campaigns that use the agent assisted voice and automated voice delivery modes.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Campaign, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-dials-per-minute\">Average dials per minute</a> </p> </dd> <dt>AVG_EVALUATION_SCORE</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, Evaluation Form ID, Evaluation Section ID, Evaluation Question ID, Evaluation Source, Form Version, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-evaluation-score\">Average evaluation score</a> </p> </dd> <dt>AVG_FIRST_RESPONSE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-first-response-time\">Average agent first response time</a> </p> </dd> <dt>AVG_FLOW_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-flow-time\">Average flow time</a> </p> </dd> <dt>AVG_GREETING_TIME_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-greeting-time\">Average agent greeting time</a> </p> </dd> <dt>AVG_HANDLE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, RoutingStepExpression</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-handle-time\">Average handle time</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_HOLD_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-hold-time\">Average customer hold time</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_HOLD_TIME_ALL_CONTACTS</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-hold-time-all-contacts\">Average customer hold time all contacts</a> </p> </dd> <dt>AVG_HOLDS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-holds\">Average holds</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_INTERACTION_AND_HOLD_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-interaction-and-customer-hold-time\">Average agent interaction and customer hold time</a> </p> </dd> <dt>AVG_INTERACTION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-interaction-time\">Average agent interaction time</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_INTERRUPTIONS_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-interruptions\">Average agent interruptions</a> </p> </dd> <dt>AVG_INTERRUPTION_TIME_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-interruption-time\">Average agent interruption time</a> </p> </dd> <dt>AVG_MESSAGE_LENGTH_AGENT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-message-length\">Average agent message length</a> </p> </dd> <dt>AVG_MESSAGE_LENGTH_CUSTOMER</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-message-length\">Average customer message length</a> </p> </dd> <dt>AVG_MESSAGES</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-messages\">Average messages</a> </p> </dd> <dt>AVG_MESSAGES_AGENT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-messages\">Average agent messages</a> </p> </dd> <dt>AVG_MESSAGES_BOT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-bot-messages\">Average bot messages</a> </p> </dd> <dt>AVG_MESSAGES_CUSTOMER</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-messages\">Average customer messages</a> </p> </dd> <dt>AVG_NON_TALK_TIME</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-non-talk-time\">Average non-talk time</a> </p> </dd> <dt>AVG_QUEUE_ANSWER_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-queue-answer-time\">Average queue answer time</a> </p> <p>Valid metric level filters: <code>INITIATION_METHOD</code>, <code>FEATURE</code>, <code>DISCONNECT_REASON</code> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>AVG_QUEUE_ANSWER_TIME_CUSTOMER_FIRST_CALLBACK</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-queue-answer-time-customer-first-callback\">Avg. queue answer time - customer first callback</a> </p> </dd> <dt>AVG_RESPONSE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-response-time-agent\">Average agent response time</a> </p> </dd> <dt>AVG_RESPONSE_TIME_CUSTOMER</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-time-agent\">Average customer response time</a> </p> </dd> <dt>AVG_RESOLUTION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-resolution-time\">Average resolution time</a> </p> </dd> <dt>AVG_TALK_TIME</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-talk-time\">Average talk time</a> </p> </dd> <dt>AVG_TALK_TIME_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-agent-talk-time\">Average agent talk time</a> </p> </dd> <dt>AVG_TALK_TIME_CUSTOMER</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-customer-talk-time\">Average customer talk time</a> </p> </dd> <dt>AVG_WAIT_TIME_AFTER_CUSTOMER_CONNECTION</dt> <dd> <p>This metric is available only for outbound campaigns that use the agent assisted voice and automated voice delivery modes.</p> <p>Unit: Seconds</p> <p>Valid groupings and filters: Campaign</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-wait-time-after-customer-connection\">Average wait time after customer connection</a> </p> </dd> <dt>AVG_WAIT_TIME_AFTER_CUSTOMER_FIRST_CALLBACK_CONNECTION</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-wait-time-after-customer-connection-customer-first-callback\">Avg. wait time after customer connection - customer first callback</a> </p> </dd> <dt>AVG_WEIGHTED_EVALUATION_SCORE</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, Evaluation Form Id, Evaluation Section ID, Evaluation Question ID, Evaluation Source, Form Version, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#average-weighted-evaluation-score\">Average weighted evaluation score</a> </p> </dd> <dt>BOT_CONVERSATIONS_COMPLETED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#bot-conversations-completed\">Bot conversations completed</a> </p> </dd> <dt>BOT_INTENTS_COMPLETED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Bot intent name, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#bot-intents-completed\">Bot intents completed</a> </p> </dd> <dt>CAMPAIGN_CONTACTS_ABANDONED_AFTER_X</dt> <dd> <p>This metric is available only for outbound campaigns using the agent assisted voice and automated voice delivery modes.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Campaign</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you must enter <code>GT</code> (for <i>Greater than</i>).</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-contacts-abandoned-after-x\">Campaign contacts abandoned after X</a> </p> </dd> <dt>CAMPAIGN_CONTACTS_ABANDONED_AFTER_X_RATE</dt> <dd> <p>This metric is available only for outbound campaigns using the agent assisted voice and automated voice delivery modes.</p> <p>Unit: Percent</p> <p>Valid groupings and filters: Agent, Campaign</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you must enter <code>GT</code> (for <i>Greater than</i>).</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-contacts-abandoned-after-x-rate\">Campaign contacts abandoned after X rate</a> </p> </dd> <dt>CAMPAIGN_INTERACTIONS</dt> <dd> <p>This metric is available only for outbound campaigns using the email delivery mode. </p> <p>Unit: Count</p> <p>Valid metric filter key: CAMPAIGN_INTERACTION_EVENT_TYPE</p> <p>Valid groupings and filters: Campaign</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-interactions\">Campaign interactions</a> </p> </dd> <dt>CAMPAIGN_PROGRESS_RATE</dt> <dd> <p>This metric is only available for outbound campaigns initiated using a customer segment. It is not available for event triggered campaigns.</p> <p>Unit: Percent</p> <p>Valid groupings and filters: Campaign, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-progress-rate\">Campaign progress rate</a> </p> </dd> <dt>CAMPAIGN_SEND_ATTEMPTS</dt> <dd> <p>This metric is available only for outbound campaigns.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Channel, contact/segmentAttributes/connect:Subtype </p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-send-attempts\">Campaign send attempts</a> </p> </dd> <dt>CAMPAIGN_SEND_EXCLUSIONS</dt> <dd> <p>This metric is available only for outbound campaigns.</p> <p>Valid metric filter key: CAMPAIGN_EXCLUDED_EVENT_TYPE</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Campaign Excluded Event Type, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#campaign-send-exclusions\">Campaign send exclusions</a> </p> </dd> <dt>CASES_CREATED</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#cases-created\">Cases created</a> </p> </dd> <dt>CONTACTS_CREATED</dt> <dd> <p>Unit: Count</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-created\">Contacts created</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>CONTACTS_HANDLED</dt> <dd> <p>Unit: Count</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code>, <code>DISCONNECT_REASON</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, RoutingStepExpression, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-handled\">Contacts handled</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>CONTACTS_HANDLED_BY_CONNECTED_TO_AGENT</dt> <dd> <p>Unit: Count</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code> </p> <p>Valid groupings and filters: Queue, Channel, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-handled-by-connected-to-agent-timestamp\">Contacts handled (connected to agent timestamp)</a> </p> </dd> <dt>CONTACTS_HOLD_ABANDONS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-hold-disconnect\">Contacts hold disconnect</a> </p> </dd> <dt>CONTACTS_ON_HOLD_AGENT_DISCONNECT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-hold-agent-disconnect\">Contacts hold agent disconnect</a> </p> </dd> <dt>CONTACTS_ON_HOLD_CUSTOMER_DISCONNECT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-hold-customer-disconnect\">Contacts hold customer disconnect</a> </p> </dd> <dt>CONTACTS_PUT_ON_HOLD</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-put-on-hold\">Contacts put on hold</a> </p> </dd> <dt>CONTACTS_TRANSFERRED_OUT_EXTERNAL</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out-external\">Contacts transferred out external</a> </p> </dd> <dt>CONTACTS_TRANSFERRED_OUT_INTERNAL</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out-internal\">Contacts transferred out internal</a> </p> </dd> <dt>CONTACTS_QUEUED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-queued\">Contacts queued</a> </p> </dd> <dt>CONTACTS_QUEUED_BY_ENQUEUE</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-queued-by-enqueue\">Contacts queued (enqueue timestamp)</a> </p> </dd> <dt>CONTACTS_REMOVED_FROM_QUEUE_IN_X</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-removed-from-queue\">Contacts removed from queue in X seconds</a> </p> </dd> <dt>CONTACTS_RESOLVED_IN_X</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-resolved\">Contacts resolved in X</a> </p> </dd> <dt>CONTACTS_TRANSFERRED_OUT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Feature, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out\">Contacts transferred out</a> </p> <note> <p>Feature is a valid filter but not a valid grouping.</p> </note> </dd> <dt>CONTACTS_TRANSFERRED_OUT_BY_AGENT</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out-by-agent\">Contacts transferred out by agent</a> </p> </dd> <dt>CONTACTS_TRANSFERRED_OUT_FROM_QUEUE</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-transferred-out-queue\">Contacts transferred out queue</a> </p> </dd> <dt>CURRENT_CASES</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#current-cases\">Current cases</a> </p> </dd> <dt>CONVERSATIONS_ABANDONED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Feature, RoutingStepExpression, Initiation method, Routing Profile, Queue, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#conversations-abandoned\">Conversations abandoned</a> </p> </dd> <dt>DELIVERY_ATTEMPTS</dt> <dd> <p>This metric is available only for outbound campaigns.</p> <p>Unit: Count</p> <p>Valid metric filter key: <code>ANSWERING_MACHINE_DETECTION_STATUS</code>, <code>CAMPAIGN_DELIVERY_EVENT_TYPE</code>, <code>DISCONNECT_REASON</code> </p> <p>Valid groupings and filters: Agent, Answering Machine Detection Status, Campaign, Campaign Delivery EventType, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#delivery-attempts\">Delivery attempts</a> </p> <note> <p>Campaign Delivery EventType filter and grouping are only available for SMS and Email campaign delivery modes. Agent, Queue, Routing Profile, Answering Machine Detection Status and Disconnect Reason are only available for agent assisted voice and automated voice delivery modes. </p> </note> </dd> <dt>DELIVERY_ATTEMPT_DISPOSITION_RATE</dt> <dd> <p>This metric is available only for outbound campaigns. Dispositions for the agent assisted voice and automated voice delivery modes are only available with answering machine detection enabled.</p> <p>Unit: Percent</p> <p>Valid metric filter key: <code>ANSWERING_MACHINE_DETECTION_STATUS</code>, <code>CAMPAIGN_DELIVERY_EVENT_TYPE</code>, <code>DISCONNECT_REASON</code> </p> <p>Valid groupings and filters: Agent, Answering Machine Detection Status, Campaign, Channel, contact/segmentAttributes/connect:Subtype, Disconnect Reason, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#delivery-attempt-disposition-rate\">Delivery attempt disposition rate</a> </p> <note> <p>Campaign Delivery Event Type filter and grouping are only available for SMS and Email campaign delivery modes. Agent, Queue, Routing Profile, Answering Machine Detection Status and Disconnect Reason are only available for agent assisted voice and automated voice delivery modes. </p> </note> </dd> <dt>EVALUATIONS_PERFORMED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, Evaluation Form ID, Evaluation Source, Form Version, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#evaluations-performed\">Evaluations performed</a> </p> </dd> <dt>FLOWS_OUTCOME</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#flows-outcome\">Flows outcome</a> </p> </dd> <dt>FLOWS_STARTED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#flows-started\">Flows started</a> </p> </dd> <dt>HUMAN_ANSWERED_CALLS</dt> <dd> <p>This metric is available only for outbound campaigns. Dispositions for the agent assisted voice and automated voice delivery modes are only available with answering machine detection enabled. </p> <p>Unit: Count</p> <p>Valid groupings and filters: Agent, Campaign</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#human-answered\">Human answered</a> </p> </dd> <dt>MAX_FLOW_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#maximum-flow-time\">Maximum flow time</a> </p> </dd> <dt>MAX_QUEUED_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#maximum-queued-time\">Maximum queued time</a> </p> </dd> <dt>MIN_FLOW_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#minimum-flow-time\">Minimum flow time</a> </p> </dd> <dt>PERCENT_AUTOMATIC_FAILS</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Agent, Agent Hierarchy, Channel, Evaluation Form ID, Evaluation Source, Form Version, Queue, Routing Profile</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#automatic-fails-percent\">Automatic fails percent</a> </p> </dd> <dt>PERCENT_BOT_CONVERSATIONS_OUTCOME</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#percent-bot-conversations-outcome\">Percent bot conversations outcome</a> </p> </dd> <dt>PERCENT_BOT_INTENTS_OUTCOME</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Bot ID, Bot alias, Bot version, Bot locale, Bot intent name, Flows resource ID, Flows module resource ID, Flow type, Flow action ID, Invoking resource published timestamp, Initiation method, Invoking resource type, Parent flows resource ID</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/bot-metrics.html#percent-bot-intents-outcome\">Percent bot intents outcome</a> </p> </dd> <dt>PERCENT_CASES_FIRST_CONTACT_RESOLVED</dt> <dd> <p>Unit: Percent</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#cases-resolved-on-first-contact\">Cases resolved on first contact</a> </p> </dd> <dt>PERCENT_CONTACTS_STEP_EXPIRED</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, RoutingStepExpression</p> <p>UI name: This metric is available in Real-time Metrics UI but not on the Historical Metrics UI.</p> </dd> <dt>PERCENT_CONTACTS_STEP_JOINED</dt> <dd> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, RoutingStepExpression</p> <p>UI name: This metric is available in Real-time Metrics UI but not on the Historical Metrics UI.</p> </dd> <dt>PERCENT_FLOWS_OUTCOME</dt> <dd> <p>Unit: Percent</p> <p>Valid metric filter key: <code>FLOWS_OUTCOME_TYPE</code> </p> <p>Valid groupings and filters: Channel, contact/segmentAttributes/connect:Subtype, Flow type, Flows module resource ID, Flows next resource ID, Flows next resource queue ID, Flows outcome type, Flows resource ID, Initiation method, Resource published timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#flows-outcome-percentage\">Flows outcome percentage</a>.</p> <note> <p>The <code>FLOWS_OUTCOME_TYPE</code> is not a valid grouping.</p> </note> </dd> <dt>PERCENT_NON_TALK_TIME</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Percentage</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#non-talk-time-percent\">Non-talk time percent</a> </p> </dd> <dt>PERCENT_TALK_TIME</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Percentage</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#talk-time-percent\">Talk time percent</a> </p> </dd> <dt>PERCENT_TALK_TIME_AGENT</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Percentage</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-talk-time-percent\">Agent talk time percent</a> </p> </dd> <dt>PERCENT_TALK_TIME_CUSTOMER</dt> <dd> <p>This metric is available only for contacts analyzed by Contact Lens conversational analytics.</p> <p>Unit: Percentage</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#customer-talk-time-percent\">Customer talk time percent</a> </p> </dd> <dt>RECIPIENTS_ATTEMPTED</dt> <dd> <p>This metric is only available for outbound campaigns initiated using a customer segment. It is not available for event triggered campaigns.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#recipients-attempted\">Recipients attempted</a> </p> </dd> <dt>RECIPIENTS_INTERACTED</dt> <dd> <p>This metric is only available for outbound campaigns initiated using a customer segment. It is not available for event triggered campaigns.</p> <p>Valid metric filter key: CAMPAIGN_INTERACTION_EVENT_TYPE</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Channel, contact/segmentAttributes/connect:Subtype, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#recipients-interacted\">Recipients interacted</a> </p> </dd> <dt>RECIPIENTS_TARGETED</dt> <dd> <p>This metric is only available for outbound campaigns initiated using a customer segment. It is not available for event triggered campaigns.</p> <p>Unit: Count</p> <p>Valid groupings and filters: Campaign, Campaign Execution Timestamp</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#recipients-targeted\">Recipients targeted</a> </p> </dd> <dt>REOPENED_CASE_ACTIONS</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#cases-reopened\">Cases reopened</a> </p> </dd> <dt>RESOLVED_CASE_ACTIONS</dt> <dd> <p>Unit: Count</p> <p>Required filter key: CASE_TEMPLATE_ARN</p> <p>Valid groupings and filters: CASE_TEMPLATE_ARN, CASE_STATUS</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#cases-resolved\">Cases resolved</a> </p> </dd> <dt>SERVICE_LEVEL</dt> <dd> <p>You can include up to 20 SERVICE_LEVEL metrics in a request.</p> <p>Unit: Percent</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#service-level\">Service level X</a> </p> </dd> <dt>STEP_CONTACTS_QUEUED</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, RoutingStepExpression</p> <p>UI name: This metric is available in Real-time Metrics UI but not on the Historical Metrics UI.</p> </dd> <dt>SUM_AFTER_CONTACT_WORK_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#after-contact-work-time\">After contact work time</a> </p> </dd> <dt>SUM_CONNECTING_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid metric filter key: <code>INITIATION_METHOD</code>. This metric only supports the following filter keys as <code>INITIATION_METHOD</code>: <code>INBOUND</code> | <code>OUTBOUND</code> | <code>CALLBACK</code> | <code>API</code> | <code>CALLBACK_CUSTOMER_FIRST_DIALED</code> </p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-api-connecting-time\">Agent API connecting time</a> </p> <note> <p>The <code>Negate</code> key in metric-level filters is not applicable for this metric.</p> </note> </dd> <dt>CONTACTS_ABANDONED</dt> <dd> <p>Unit: Count</p> <p>Metric filter: </p> <ul> <li> <p>Valid values: <code>API</code>| <code>INCOMING</code> | <code>OUTBOUND</code> | <code>TRANSFER</code> | <code>CALLBACK</code> | <code>QUEUE_TRANSFER</code>| <code>Disconnect</code> | <code>CALLBACK_CUSTOMER_FIRST_DIALED</code> </p> </li> </ul> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, RoutingStepExpression, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-abandoned\">Contact abandoned</a> </p> </dd> <dt>SUM_CONTACTS_ABANDONED_IN_X</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-abandoned-in-x-seconds\">Contacts abandoned in X seconds</a> </p> </dd> <dt>SUM_CONTACTS_ANSWERED_IN_X</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>Threshold: For <code>ThresholdValue</code>, enter any whole number from 1 to 604800 (inclusive), in seconds. For <code>Comparison</code>, you can use <code>LT</code> (for \"Less than\") or <code>LTE</code> (for \"Less than equal\").</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contacts-answered-in-x-seconds\">Contacts answered in X seconds</a> </p> </dd> <dt>SUM_CONTACT_FLOW_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contact-flow-time\">Contact flow time</a> </p> </dd> <dt>SUM_CONTACT_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-on-contact-time\">Agent on contact time</a> </p> </dd> <dt>SUM_CONTACTS_DISCONNECTED </dt> <dd> <p>Valid metric filter key: <code>DISCONNECT_REASON</code> </p> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contact-disconnected\">Contact disconnected</a> </p> </dd> <dt>SUM_ERROR_STATUS_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#error-status-time\">Error status time</a> </p> </dd> <dt>SUM_HANDLE_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#contact-handle-time\">Contact handle time</a> </p> </dd> <dt>SUM_HOLD_TIME</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#customer-hold-time\">Customer hold time</a> </p> </dd> <dt>SUM_IDLE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-idle-time\">Agent idle time</a> </p> </dd> <dt>SUM_INTERACTION_AND_HOLD_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-interaction-and-hold-time\">Agent interaction and hold time</a> </p> </dd> <dt>SUM_INTERACTION_TIME</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-interaction-time\">Agent interaction time</a> </p> </dd> <dt>SUM_NON_PRODUCTIVE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#agent-non-productive-time\">Agent non-productive time</a> </p> </dd> <dt>SUM_ONLINE_TIME_AGENT</dt> <dd> <p>Unit: Seconds</p> <p>Valid groupings and filters: Routing Profile, Agent, Agent Hierarchy</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#online-time\">Online time</a> </p> </dd> <dt>SUM_RETRY_CALLBACK_ATTEMPTS</dt> <dd> <p>Unit: Count</p> <p>Valid groupings and filters: Queue, Channel, Routing Profile, contact/segmentAttributes/connect:Subtype, Q in Connect</p> <p>UI name: <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/metrics-definitions.html#callback-attempts\">Callback attempts</a> </p> </dd> </dl>"
         },
         "NextToken":{
           "shape":"NextToken2500",
@@ -14711,7 +14795,7 @@
         },
         "EffectiveTill":{
           "shape":"HoursOfOperationOverrideYearMonthDayDateFormat",
-          "documentation":"<p>The date till which the hours of operation override would be effective.</p>"
+          "documentation":"<p>The date until the hours of operation override is effective.</p>"
         }
       },
       "documentation":"<p>Information about the hours of operations override.</p>"
@@ -17016,6 +17100,61 @@
         }
       }
     },
+    "ListRoutingProfileManualAssignmentQueuesRequest":{
+      "type":"structure",
+      "required":[
+        "InstanceId",
+        "RoutingProfileId"
+      ],
+      "members":{
+        "InstanceId":{
+          "shape":"InstanceId",
+          "documentation":"<p>The identifier of the Amazon Connect instance. You can <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/find-instance-arn.html\">find the instance ID</a> in the Amazon Resource Name (ARN) of the instance.</p>",
+          "location":"uri",
+          "locationName":"InstanceId"
+        },
+        "RoutingProfileId":{
+          "shape":"RoutingProfileId",
+          "documentation":"<p>The identifier of the routing profile.</p>",
+          "location":"uri",
+          "locationName":"RoutingProfileId"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of results. Use the value returned in the previous response in the next request to retrieve the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResult100",
+          "documentation":"<p>The maximum number of results to return per page.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"maxResults"
+        }
+      }
+    },
+    "ListRoutingProfileManualAssignmentQueuesResponse":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If there are additional results, this is the token for the next set of results.</p>"
+        },
+        "RoutingProfileManualAssignmentQueueConfigSummaryList":{
+          "shape":"RoutingProfileManualAssignmentQueueConfigSummaryList",
+          "documentation":"<p>Information about the manual assignment queues associated with the routing profile.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp when this resource was last modified.</p>"
+        },
+        "LastModifiedRegion":{
+          "shape":"RegionName",
+          "documentation":"<p>The Amazon Web Services Region where this resource was last modified.</p>"
+        }
+      }
+    },
     "ListRoutingProfileQueuesRequest":{
       "type":"structure",
       "required":[
@@ -18121,6 +18260,24 @@
       "min":1,
       "pattern":"(^[\\S].*[\\S]$)|(^[\\S]$)"
     },
+    "NameCriteria":{
+      "type":"structure",
+      "required":[
+        "SearchText",
+        "MatchType"
+      ],
+      "members":{
+        "SearchText":{
+          "shape":"SearchTextList",
+          "documentation":"<p>The words or phrases used to match the contact name.</p>"
+        },
+        "MatchType":{
+          "shape":"SearchContactsMatchType",
+          "documentation":"<p>The match type combining name search criteria using multiple search texts in a name criteria.</p>"
+        }
+      },
+      "documentation":"<p>The search criteria based on the contact name</p>"
+    },
     "Namespace":{
       "type":"string",
       "max":128,
@@ -18697,6 +18854,7 @@
       },
       "documentation":"<p>Enable persistent chats. For more information about enabling persistent chat, and for example use cases and how to configure for them, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/chat-persistence.html\">Enable persistent chat</a>.</p>"
     },
+    "PersistentConnection":{"type":"boolean"},
     "PhoneNumber":{
       "type":"string",
       "pattern":"\\\\+[1-9]\\\\d{1,14}$"
@@ -20921,6 +21079,10 @@
           "shape":"Long",
           "documentation":"<p>The number of associated queues in routing profile.</p>"
         },
+        "NumberOfAssociatedManualAssignmentQueues":{
+          "shape":"Long",
+          "documentation":"<p>The number of associated manual assignment queues in routing profile.</p>"
+        },
         "NumberOfAssociatedUsers":{
           "shape":"Long",
           "documentation":"<p>The number of associated users in routing profile.</p>"
@@ -20944,6 +21106,10 @@
         "AssociatedQueueIds":{
           "shape":"AssociatedQueueIdList",
           "documentation":"<p>The IDs of the associated queue.</p>"
+        },
+        "AssociatedManualAssignmentQueueIds":{
+          "shape":"AssociatedQueueIdList",
+          "documentation":"<p>The IDs of the associated manual assignment queues.</p>"
         }
       },
       "documentation":"<p>Contains information about a routing profile.</p>"
@@ -20958,6 +21124,52 @@
       "type":"list",
       "member":{"shape":"RoutingProfile"}
     },
+    "RoutingProfileManualAssignmentQueueConfig":{
+      "type":"structure",
+      "required":["QueueReference"],
+      "members":{
+        "QueueReference":{"shape":"RoutingProfileQueueReference"}
+      },
+      "documentation":"<p>Contains information about the queue and channel for manual assignment behaviour can be enabled.</p>"
+    },
+    "RoutingProfileManualAssignmentQueueConfigList":{
+      "type":"list",
+      "member":{"shape":"RoutingProfileManualAssignmentQueueConfig"},
+      "max":10,
+      "min":1
+    },
+    "RoutingProfileManualAssignmentQueueConfigSummary":{
+      "type":"structure",
+      "required":[
+        "QueueId",
+        "QueueArn",
+        "QueueName",
+        "Channel"
+      ],
+      "members":{
+        "QueueId":{
+          "shape":"QueueId",
+          "documentation":"<p>The identifier for the queue.</p>"
+        },
+        "QueueArn":{
+          "shape":"ARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the queue.</p>"
+        },
+        "QueueName":{
+          "shape":"QueueName",
+          "documentation":"<p>The name of the queue.</p>"
+        },
+        "Channel":{
+          "shape":"Channel",
+          "documentation":"<p>The channels this queue supports. Valid Values: CHAT | TASK | EMAIL </p>"
+        }
+      },
+      "documentation":"<p>Contains summary information about a routing profile manual assignment queue.</p>"
+    },
+    "RoutingProfileManualAssignmentQueueConfigSummaryList":{
+      "type":"list",
+      "member":{"shape":"RoutingProfileManualAssignmentQueueConfigSummary"}
+    },
     "RoutingProfileName":{
       "type":"string",
       "max":127,
@@ -21551,11 +21763,46 @@
         }
       }
     },
+    "SearchContactsAdditionalTimeRange":{
+      "type":"structure",
+      "required":[
+        "Criteria",
+        "MatchType"
+      ],
+      "members":{
+        "Criteria":{
+          "shape":"SearchContactsAdditionalTimeRangeCriteriaList",
+          "documentation":"<p>List of criteria of the time range to additionally filter on.</p>"
+        },
+        "MatchType":{
+          "shape":"SearchContactsMatchType",
+          "documentation":"<p>The match type combining multiple time range filters.</p>"
+        }
+      },
+      "documentation":"<p>Time range that you additionally want to filter on.</p>"
+    },
+    "SearchContactsAdditionalTimeRangeCriteria":{
+      "type":"structure",
+      "members":{
+        "TimeRange":{"shape":"SearchContactsTimeRange"},
+        "TimestampCondition":{
+          "shape":"SearchContactsTimestampCondition",
+          "documentation":"<p>List of the timestamp conditions.</p>"
+        }
+      },
+      "documentation":"<p>The criteria of the time range to additionally filter on.</p>"
+    },
+    "SearchContactsAdditionalTimeRangeCriteriaList":{
+      "type":"list",
+      "member":{"shape":"SearchContactsAdditionalTimeRangeCriteria"}
+    },
     "SearchContactsMatchType":{
       "type":"string",
       "enum":[
         "MATCH_ALL",
-        "MATCH_ANY"
+        "MATCH_ANY",
+        "MATCH_EXACT",
+        "MATCH_NONE"
       ]
     },
     "SearchContactsRequest":{
@@ -21633,18 +21880,45 @@
       },
       "documentation":"<p>A structure of time range that you want to search results.</p>"
     },
+    "SearchContactsTimeRangeConditionType":{
+      "type":"string",
+      "enum":["NOT_EXISTS"]
+    },
     "SearchContactsTimeRangeType":{
       "type":"string",
       "enum":[
         "INITIATION_TIMESTAMP",
         "SCHEDULED_TIMESTAMP",
         "CONNECTED_TO_AGENT_TIMESTAMP",
-        "DISCONNECT_TIMESTAMP"
+        "DISCONNECT_TIMESTAMP",
+        "ENQUEUE_TIMESTAMP"
       ]
     },
+    "SearchContactsTimestampCondition":{
+      "type":"structure",
+      "required":[
+        "Type",
+        "ConditionType"
+      ],
+      "members":{
+        "Type":{
+          "shape":"SearchContactsTimeRangeType",
+          "documentation":"<p>Type of the timestamps to use for the filter.</p>"
+        },
+        "ConditionType":{
+          "shape":"SearchContactsTimeRangeConditionType",
+          "documentation":"<p>Condition of the timestamp on the contact.</p>"
+        }
+      },
+      "documentation":"<p>The timestamp condition indicating which timestamp should be used and how it should be filtered.</p>"
+    },
     "SearchCriteria":{
       "type":"structure",
       "members":{
+        "Name":{
+          "shape":"NameCriteria",
+          "documentation":"<p>Name of the contact.</p>"
+        },
         "AgentIds":{
           "shape":"AgentResourceIdList",
           "documentation":"<p>The identifiers of agents who handled the contacts.</p>"
@@ -21669,6 +21943,14 @@
           "shape":"QueueIdList",
           "documentation":"<p>The list of queue IDs associated with contacts.</p>"
         },
+        "RoutingCriteria":{
+          "shape":"SearchableRoutingCriteria",
+          "documentation":"<p>Routing criteria for the contact.</p>"
+        },
+        "AdditionalTimeRange":{
+          "shape":"SearchContactsAdditionalTimeRange",
+          "documentation":"<p>Additional TimeRange used to filter contacts.</p>"
+        },
         "SearchableContactAttributes":{
           "shape":"SearchableContactAttributes",
           "documentation":"<p>The search criteria based on user-defined contact attributes that have been configured for contact search. For more information, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/search-custom-attributes.html\">Search by custom contact attributes</a> in the <i>Amazon Connect Administrator Guide</i>.</p> <important> <p>To use <code>SearchableContactAttributes</code> in a search request, the <code>GetContactAttributes</code> action is required to perform an API request. For more information, see <a href=\"https://docs.aws.amazon.com/service-authorization/latest/reference/list_amazonconnect.html#amazonconnect-actions-as-permissions\">https://docs.aws.amazon.com/service-authorization/latest/reference/list_amazonconnect.html#amazonconnect-actions-as-permissions</a>Actions defined by Amazon Connect.</p> </important>"
@@ -22249,6 +22531,20 @@
         }
       }
     },
+    "SearchableAgentCriteriaStep":{
+      "type":"structure",
+      "members":{
+        "AgentIds":{
+          "shape":"AgentResourceIdList",
+          "documentation":"<p>The identifiers of agents used in preferred agents matching.</p>"
+        },
+        "MatchType":{
+          "shape":"SearchContactsMatchType",
+          "documentation":"<p>The match type combining multiple agent criteria steps.</p>"
+        }
+      },
+      "documentation":"<p>The agent criteria to search for preferred agents on the routing criteria.</p>"
+    },
     "SearchableContactAttributeKey":{
       "type":"string",
       "max":100,
@@ -22310,6 +22606,30 @@
       "type":"string",
       "enum":["STANDARD"]
     },
+    "SearchableRoutingCriteria":{
+      "type":"structure",
+      "members":{
+        "Steps":{
+          "shape":"SearchableRoutingCriteriaStepList",
+          "documentation":"<p>The list of Routing criteria steps of the contact routing.</p>"
+        }
+      },
+      "documentation":"<p>Routing criteria of the contact to match on.</p>"
+    },
+    "SearchableRoutingCriteriaStep":{
+      "type":"structure",
+      "members":{
+        "AgentCriteria":{
+          "shape":"SearchableAgentCriteriaStep",
+          "documentation":"<p>Agent matching the routing step of the routing criteria</p>"
+        }
+      },
+      "documentation":"<p>Routing criteria of the contact to match on.</p>"
+    },
+    "SearchableRoutingCriteriaStepList":{
+      "type":"list",
+      "member":{"shape":"SearchableRoutingCriteriaStep"}
+    },
     "SearchableSegmentAttributeKey":{
       "type":"string",
       "max":64,
@@ -22887,7 +23207,8 @@
         "CONNECTED_TO_AGENT_TIMESTAMP",
         "DISCONNECT_TIMESTAMP",
         "INITIATION_METHOD",
-        "CHANNEL"
+        "CHANNEL",
+        "EXPIRY_TIMESTAMP"
       ]
     },
     "SourceApplicationName":{
@@ -25363,7 +25684,7 @@
         },
         "EffectiveTill":{
           "shape":"HoursOfOperationOverrideYearMonthDayDateFormat",
-          "documentation":"<p>The date till when the hours of operation override would be effective.</p>"
+          "documentation":"<p>The date until the hours of operation override is effective.</p>"
         }
       }
     },
@@ -26868,6 +27189,11 @@
         "DeskPhoneNumber":{
           "shape":"PhoneNumber",
           "documentation":"<p>The phone number for the user's desk phone.</p>"
+        },
+        "PersistentConnection":{
+          "shape":"PersistentConnection",
+          "documentation":"<p>The persistent connection setting for the user.</p>",
+          "box":true
         }
       },
       "documentation":"<p>Contains information about the phone configuration settings for a user.</p>"
diff --git a/services/connectcampaigns/pom.xml b/services/connectcampaigns/pom.xml
index cf8efd0197c8..3655ca49cff2 100644
--- a/services/connectcampaigns/pom.xml
+++ b/services/connectcampaigns/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>connectcampaigns</artifactId>
     <name>AWS Java SDK :: Services :: Connect Campaigns</name>
diff --git a/services/connectcampaignsv2/pom.xml b/services/connectcampaignsv2/pom.xml
index fd2c0839cef1..deed141902a0 100644
--- a/services/connectcampaignsv2/pom.xml
+++ b/services/connectcampaignsv2/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>connectcampaignsv2</artifactId>
     <name>AWS Java SDK :: Services :: Connect Campaigns V2</name>
diff --git a/services/connectcases/pom.xml b/services/connectcases/pom.xml
index 6c72c7d03c47..21acbb7eec67 100644
--- a/services/connectcases/pom.xml
+++ b/services/connectcases/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>connectcases</artifactId>
     <name>AWS Java SDK :: Services :: Connect Cases</name>
diff --git a/services/connectcontactlens/pom.xml b/services/connectcontactlens/pom.xml
index b58f2549f923..b45b8f4b24ed 100644
--- a/services/connectcontactlens/pom.xml
+++ b/services/connectcontactlens/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>connectcontactlens</artifactId>
     <name>AWS Java SDK :: Services :: Connect Contact Lens</name>
diff --git a/services/connectparticipant/pom.xml b/services/connectparticipant/pom.xml
index 2f4e8a2b2fc3..1929fd43f16a 100644
--- a/services/connectparticipant/pom.xml
+++ b/services/connectparticipant/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>connectparticipant</artifactId>
     <name>AWS Java SDK :: Services :: ConnectParticipant</name>
diff --git a/services/controlcatalog/pom.xml b/services/controlcatalog/pom.xml
index 248bd5cccc75..20c85fafdb94 100644
--- a/services/controlcatalog/pom.xml
+++ b/services/controlcatalog/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>controlcatalog</artifactId>
     <name>AWS Java SDK :: Services :: Control Catalog</name>
diff --git a/services/controltower/pom.xml b/services/controltower/pom.xml
index 588903457251..2a01c96fd7f5 100644
--- a/services/controltower/pom.xml
+++ b/services/controltower/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>controltower</artifactId>
     <name>AWS Java SDK :: Services :: Control Tower</name>
diff --git a/services/costandusagereport/pom.xml b/services/costandusagereport/pom.xml
index 2c727d3fe8d5..ae95b20cd4b2 100644
--- a/services/costandusagereport/pom.xml
+++ b/services/costandusagereport/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>costandusagereport</artifactId>
     <name>AWS Java SDK :: Services :: AWS Cost and Usage Report</name>
diff --git a/services/costexplorer/pom.xml b/services/costexplorer/pom.xml
index a9e0680b0e5f..346b3e5eefe3 100644
--- a/services/costexplorer/pom.xml
+++ b/services/costexplorer/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>costexplorer</artifactId>
diff --git a/services/costexplorer/src/main/resources/codegen-resources/endpoint-rule-set.json b/services/costexplorer/src/main/resources/codegen-resources/endpoint-rule-set.json
index 6e774dcfc1d4..8e405605cfe3 100644
--- a/services/costexplorer/src/main/resources/codegen-resources/endpoint-rule-set.json
+++ b/services/costexplorer/src/main/resources/codegen-resources/endpoint-rule-set.json
@@ -419,6 +419,56 @@
                                     },
                                     "type": "endpoint"
                                 },
+                                {
+                                    "conditions": [
+                                        {
+                                            "fn": "stringEquals",
+                                            "argv": [
+                                                {
+                                                    "fn": "getAttr",
+                                                    "argv": [
+                                                        {
+                                                            "ref": "PartitionResult"
+                                                        },
+                                                        "name"
+                                                    ]
+                                                },
+                                                "aws-eusc"
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                false
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
+                                        }
+                                    ],
+                                    "endpoint": {
+                                        "url": "https://ce.eusc-de-east-1.api.amazonwebservices.eu",
+                                        "properties": {
+                                            "authSchemes": [
+                                                {
+                                                    "name": "sigv4",
+                                                    "signingRegion": "eusc-de-east-1"
+                                                }
+                                            ]
+                                        },
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                },
                                 {
                                     "conditions": [
                                         {
diff --git a/services/costexplorer/src/main/resources/codegen-resources/service-2.json b/services/costexplorer/src/main/resources/codegen-resources/service-2.json
index c72f631eb61d..ea5322482333 100644
--- a/services/costexplorer/src/main/resources/codegen-resources/service-2.json
+++ b/services/costexplorer/src/main/resources/codegen-resources/service-2.json
@@ -200,7 +200,8 @@
         {"shape":"DataUnavailableException"},
         {"shape":"InvalidNextTokenException"},
         {"shape":"RequestChangedException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BillingViewHealthStatusException"}
       ],
       "documentation":"<p>Retrieves cost and usage metrics for your account. You can specify which cost and usage-related metric that you want the request to return. For example, you can specify <code>BlendedCosts</code> or <code>UsageQuantity</code>. You can also filter and group your data by various dimensions, such as <code>SERVICE</code> or <code>AZ</code>, in a specific time range. For a complete list of valid dimensions, see the <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_GetDimensionValues.html\">GetDimensionValues</a> operation. Management account in an organization in Organizations have access to all member accounts.</p> <p>For information about filter limitations, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/billing-limits.html\">Quotas and restrictions</a> in the <i>Billing and Cost Management User Guide</i>.</p>"
     },
@@ -216,7 +217,8 @@
         {"shape":"DataUnavailableException"},
         {"shape":"InvalidNextTokenException"},
         {"shape":"LimitExceededException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BillingViewHealthStatusException"}
       ],
       "documentation":"<p>Retrieves cost and usage comparisons for your account between two periods within the last 13 months. If you have enabled multi-year data at monthly granularity, you can go back up to 38 months.</p>"
     },
@@ -234,7 +236,8 @@
         {"shape":"BillExpirationException"},
         {"shape":"InvalidNextTokenException"},
         {"shape":"RequestChangedException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BillingViewHealthStatusException"}
       ],
       "documentation":"<p>Retrieves cost and usage metrics with resources for your account. You can specify which cost and usage-related metric, such as <code>BlendedCosts</code> or <code>UsageQuantity</code>, that you want the request to return. You can also filter and group your data by various dimensions, such as <code>SERVICE</code> or <code>AZ</code>, in a specific time range. For a complete list of valid dimensions, see the <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_GetDimensionValues.html\">GetDimensionValues</a> operation. Management account in an organization in Organizations have access to all member accounts.</p> <p>Hourly granularity is only available for EC2-Instances (Elastic Compute Cloud) resource-level data. All other resource-level data is available at daily granularity.</p> <note> <p>This is an opt-in only feature. You can enable this feature from the Cost Explorer Settings page. For information about how to access the Settings page, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/ce-access.html\">Controlling Access for Cost Explorer</a> in the <i>Billing and Cost Management User Guide</i>.</p> </note>"
     },
@@ -252,7 +255,8 @@
         {"shape":"DataUnavailableException"},
         {"shape":"InvalidNextTokenException"},
         {"shape":"RequestChangedException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BillingViewHealthStatusException"}
       ],
       "documentation":"<p>Retrieves an array of Cost Category names and values incurred cost.</p> <note> <p>If some Cost Category names and values are not associated with any cost, they will not be returned by this API.</p> </note>"
     },
@@ -268,7 +272,8 @@
         {"shape":"DataUnavailableException"},
         {"shape":"InvalidNextTokenException"},
         {"shape":"LimitExceededException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BillingViewHealthStatusException"}
       ],
       "documentation":"<p>Retrieves key factors driving cost changes between two time periods within the last 13 months, such as usage changes, discount changes, and commitment-based savings. If you have enabled multi-year data at monthly granularity, you can go back up to 38 months.</p>"
     },
@@ -283,7 +288,8 @@
       "errors":[
         {"shape":"LimitExceededException"},
         {"shape":"DataUnavailableException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BillingViewHealthStatusException"}
       ],
       "documentation":"<p>Retrieves a forecast for how much Amazon Web Services predicts that you will spend over the forecast time period that you select, based on your past costs. </p>"
     },
@@ -301,7 +307,8 @@
         {"shape":"DataUnavailableException"},
         {"shape":"InvalidNextTokenException"},
         {"shape":"RequestChangedException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BillingViewHealthStatusException"}
       ],
       "documentation":"<p>Retrieves all available filter values for a specified filter over a period of time. You can search the dimension values for an arbitrary string. </p>"
     },
@@ -450,7 +457,8 @@
         {"shape":"DataUnavailableException"},
         {"shape":"InvalidNextTokenException"},
         {"shape":"RequestChangedException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BillingViewHealthStatusException"}
       ],
       "documentation":"<p>Queries for available tag keys and tag values for a specified period. You can search the tag values for an arbitrary string. </p>"
     },
@@ -466,7 +474,8 @@
         {"shape":"LimitExceededException"},
         {"shape":"DataUnavailableException"},
         {"shape":"UnresolvableUsageUnitException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BillingViewHealthStatusException"}
       ],
       "documentation":"<p>Retrieves a forecast for how much Amazon Web Services predicts that you will use over the forecast time period that you select, based on your past usage. </p>"
     },
@@ -1045,6 +1054,14 @@
       "min":20,
       "pattern":"^arn:aws[a-z-]*:(billing)::[0-9]{12}:billingview/[-a-zA-Z0-9/:_+=.-@]{1,43}$"
     },
+    "BillingViewHealthStatusException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p> The billing view status must be <code>HEALTHY</code> to perform this action. Try again when the status is <code>HEALTHY</code>. </p>",
+      "exception":true
+    },
     "CommitmentPurchaseAnalysisConfiguration":{
       "type":"structure",
       "members":{
@@ -1553,7 +1570,7 @@
       "members":{
         "Type":{
           "shape":"GenericString",
-          "documentation":"<p>The category or classification of the cost driver.</p> <p>Values include: BUNDLED_DISCOUNT, CREDIT, OUT_OF_CYCLE_CHARGE, REFUND, RECURRING_RESERVATION_FEE, RESERVATION_USAGE, RI_VOLUME_DISCOUNT, SAVINGS_PLAN_USAGE, SAVINGS_PLAN_NEGATION, SAVINGS_PLAN_RECURRING_FEE, SUPPORT_FEE, TAX, UPFRONT_RESERVATION_FEE, USAGE_CHANGE, COMMITMENT</p>"
+          "documentation":"<p>The category or classification of the cost driver.</p> <p>Values include: BUNDLED_DISCOUNT, CREDIT, OUT_OF_CYCLE_CHARGE, REFUND, RECURRING_RESERVATION_FEE, RESERVATION_USAGE, RI_VOLUME_DISCOUNT, SAVINGS_PLAN_USAGE, SAVINGS_PLAN_RECURRING_FEE, SUPPORT_FEE, TAX, UPFRONT_RESERVATION_FEE, USAGE_CHANGE, COMMITMENT</p>"
         },
         "Name":{
           "shape":"GenericString",
@@ -1909,6 +1926,7 @@
         "AZ",
         "INSTANCE_TYPE",
         "LINKED_ACCOUNT",
+        "PAYER_ACCOUNT",
         "LINKED_ACCOUNT_NAME",
         "OPERATION",
         "PURCHASE_TYPE",
diff --git a/services/costoptimizationhub/pom.xml b/services/costoptimizationhub/pom.xml
index f24ffdb16d2c..e406a1382f15 100644
--- a/services/costoptimizationhub/pom.xml
+++ b/services/costoptimizationhub/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>costoptimizationhub</artifactId>
     <name>AWS Java SDK :: Services :: Cost Optimization Hub</name>
diff --git a/services/customerprofiles/pom.xml b/services/customerprofiles/pom.xml
index da97d82df154..7b424225f55d 100644
--- a/services/customerprofiles/pom.xml
+++ b/services/customerprofiles/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>customerprofiles</artifactId>
     <name>AWS Java SDK :: Services :: Customer Profiles</name>
diff --git a/services/databasemigration/pom.xml b/services/databasemigration/pom.xml
index ff8eaa382801..0dbeced87725 100644
--- a/services/databasemigration/pom.xml
+++ b/services/databasemigration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>databasemigration</artifactId>
     <name>AWS Java SDK :: Services :: AWS Database Migration Service</name>
diff --git a/services/databrew/pom.xml b/services/databrew/pom.xml
index 409f8561da93..1d70cc5e3f71 100644
--- a/services/databrew/pom.xml
+++ b/services/databrew/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>databrew</artifactId>
     <name>AWS Java SDK :: Services :: Data Brew</name>
diff --git a/services/dataexchange/pom.xml b/services/dataexchange/pom.xml
index 180e54fd755b..62c63f099b42 100644
--- a/services/dataexchange/pom.xml
+++ b/services/dataexchange/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>dataexchange</artifactId>
     <name>AWS Java SDK :: Services :: DataExchange</name>
diff --git a/services/datapipeline/pom.xml b/services/datapipeline/pom.xml
index a5d4fabb81e6..1269aa3cdb85 100644
--- a/services/datapipeline/pom.xml
+++ b/services/datapipeline/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>datapipeline</artifactId>
     <name>AWS Java SDK :: Services :: AWS Data Pipeline</name>
diff --git a/services/datasync/pom.xml b/services/datasync/pom.xml
index ba18f191386b..16d24159d87b 100644
--- a/services/datasync/pom.xml
+++ b/services/datasync/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>datasync</artifactId>
     <name>AWS Java SDK :: Services :: DataSync</name>
diff --git a/services/datazone/pom.xml b/services/datazone/pom.xml
index ed202fc67058..37e39c2bb2db 100644
--- a/services/datazone/pom.xml
+++ b/services/datazone/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>datazone</artifactId>
     <name>AWS Java SDK :: Services :: Data Zone</name>
diff --git a/services/datazone/src/main/resources/codegen-resources/service-2.json b/services/datazone/src/main/resources/codegen-resources/service-2.json
index b7cb6b8b3558..13176f29aafe 100644
--- a/services/datazone/src/main/resources/codegen-resources/service-2.json
+++ b/services/datazone/src/main/resources/codegen-resources/service-2.json
@@ -14756,6 +14756,10 @@
         "arn":{
           "shape":"String",
           "documentation":"<p>The ARN of an IAM user profile in Amazon DataZone.</p>"
+        },
+        "principalId":{
+          "shape":"String",
+          "documentation":"<p>Principal ID of the IAM user.</p>"
         }
       },
       "documentation":"<p>The details of an IAM user profile in Amazon DataZone.</p>"
diff --git a/services/dax/pom.xml b/services/dax/pom.xml
index 2ec2785c285b..4c0004cddca4 100644
--- a/services/dax/pom.xml
+++ b/services/dax/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>dax</artifactId>
     <name>AWS Java SDK :: Services :: Amazon DynamoDB Accelerator (DAX)</name>
diff --git a/services/dax/src/main/resources/codegen-resources/service-2.json b/services/dax/src/main/resources/codegen-resources/service-2.json
index cc40068414a2..fe34942fee21 100644
--- a/services/dax/src/main/resources/codegen-resources/service-2.json
+++ b/services/dax/src/main/resources/codegen-resources/service-2.json
@@ -73,7 +73,8 @@
         {"shape":"SubnetGroupQuotaExceededFault"},
         {"shape":"SubnetQuotaExceededFault"},
         {"shape":"InvalidSubnet"},
-        {"shape":"ServiceLinkedRoleNotFoundFault"}
+        {"shape":"ServiceLinkedRoleNotFoundFault"},
+        {"shape":"SubnetNotAllowedFault"}
       ],
       "documentation":"<p>Creates a new subnet group.</p>"
     },
@@ -291,7 +292,7 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"InvalidParameterCombinationException"}
       ],
-      "documentation":"<p>Reboots a single node of a DAX cluster. The reboot action takes place as soon as possible. During the reboot, the node status is set to REBOOTING.</p> <note> <p> <code>RebootNode</code> restarts the DAX engine process and does not remove the contents of the cache. </p> </note>"
+      "documentation":"<p>Reboots a single node of a DAX cluster. The reboot action takes place as soon as possible. During the reboot, the node status is set to REBOOTING.</p> <note> <p> <code>RebootNode</code> restarts the DAX engine process and does not remove the contents of the cache.</p> </note>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -380,7 +381,8 @@
         {"shape":"SubnetQuotaExceededFault"},
         {"shape":"SubnetInUse"},
         {"shape":"InvalidSubnet"},
-        {"shape":"ServiceLinkedRoleNotFoundFault"}
+        {"shape":"ServiceLinkedRoleNotFoundFault"},
+        {"shape":"SubnetNotAllowedFault"}
       ],
       "documentation":"<p>Modifies an existing subnet group.</p>"
     }
@@ -472,6 +474,10 @@
         "ClusterEndpointEncryptionType":{
           "shape":"ClusterEndpointEncryptionType",
           "documentation":"<p>The type of encryption supported by the cluster's endpoint. Values are:</p> <ul> <li> <p> <code>NONE</code> for no encryption</p> <p> <code>TLS</code> for Transport Layer Security</p> </li> </ul>"
+        },
+        "NetworkType":{
+          "shape":"NetworkType",
+          "documentation":"<p>The IP address type of the cluster. Values are:</p> <ul> <li> <p> <code>ipv4</code> - IPv4 addresses only</p> </li> <li> <p> <code>ipv6</code> - IPv6 addresses only</p> </li> <li> <p> <code>dual_stack</code> - Both IPv4 and IPv6 addresses</p> </li> </ul>"
         }
       },
       "documentation":"<p>Contains all of the attributes of a specific DAX cluster.</p>"
@@ -506,7 +512,7 @@
     "ClusterQuotaForCustomerExceededFault":{
       "type":"structure",
       "members":{},
-      "documentation":"<p>You have attempted to exceed the maximum number of DAX clusters for your AWS account.</p>",
+      "documentation":"<p>You have attempted to exceed the maximum number of DAX clusters for your Amazon Web Services account.</p>",
       "exception":true
     },
     "CreateClusterRequest":{
@@ -532,7 +538,7 @@
         },
         "ReplicationFactor":{
           "shape":"Integer",
-          "documentation":"<p>The number of nodes in the DAX cluster. A replication factor of 1 will create a single-node cluster, without any read replicas. For additional fault tolerance, you can create a multiple node cluster with one or more read replicas. To do this, set <code>ReplicationFactor</code> to a number between 3 (one primary and two read replicas) and 10 (one primary and nine read replicas). <code>If the AvailabilityZones</code> parameter is provided, its length must equal the <code>ReplicationFactor</code>.</p> <note> <p>AWS recommends that you have at least two read replicas per cluster.</p> </note>"
+          "documentation":"<p>The number of nodes in the DAX cluster. A replication factor of 1 will create a single-node cluster, without any read replicas. For additional fault tolerance, you can create a multiple node cluster with one or more read replicas. To do this, set <code>ReplicationFactor</code> to a number between 3 (one primary and two read replicas) and 10 (one primary and nine read replicas). <code>If the AvailabilityZones</code> parameter is provided, its length must equal the <code>ReplicationFactor</code>.</p> <note> <p>Amazon Web Services recommends that you have at least two read replicas per cluster.</p> </note>"
         },
         "AvailabilityZones":{
           "shape":"AvailabilityZoneList",
@@ -573,6 +579,10 @@
         "ClusterEndpointEncryptionType":{
           "shape":"ClusterEndpointEncryptionType",
           "documentation":"<p>The type of encryption the cluster's endpoint should support. Values are:</p> <ul> <li> <p> <code>NONE</code> for no encryption</p> </li> <li> <p> <code>TLS</code> for Transport Layer Security</p> </li> </ul>"
+        },
+        "NetworkType":{
+          "shape":"NetworkType",
+          "documentation":"<p>Specifies the IP protocol(s) the cluster uses for network communications. Values are:</p> <ul> <li> <p> <code>ipv4</code> - The cluster is accessible only through IPv4 addresses</p> </li> <li> <p> <code>ipv6</code> - The cluster is accessible only through IPv6 addresses</p> </li> <li> <p> <code>dual_stack</code> - The cluster is accessible through both IPv4 and IPv6 addresses.</p> </li> </ul> <note> <p>If no explicit <code>NetworkType</code> is provided, the network type is derived based on the subnet group's configuration.</p> </note>"
         }
       }
     },
@@ -996,7 +1006,7 @@
       "members":{
         "Cluster":{
           "shape":"Cluster",
-          "documentation":"<p>A description of the DAX cluster. with its new replication factor.</p>"
+          "documentation":"<p>A description of the DAX cluster, with its new replication factor.</p>"
         }
       }
     },
@@ -1095,6 +1105,18 @@
         }
       }
     },
+    "NetworkType":{
+      "type":"string",
+      "enum":[
+        "ipv4",
+        "ipv6",
+        "dual_stack"
+      ]
+    },
+    "NetworkTypeList":{
+      "type":"list",
+      "member":{"shape":"NetworkType"}
+    },
     "Node":{
       "type":"structure",
       "members":{
@@ -1148,7 +1170,7 @@
     "NodeQuotaForCustomerExceededFault":{
       "type":"structure",
       "members":{},
-      "documentation":"<p>You have attempted to exceed the maximum number of nodes for your AWS account.</p>",
+      "documentation":"<p>You have attempted to exceed the maximum number of nodes for your Amazon Web Services account.</p>",
       "exception":true
     },
     "NodeTypeSpecificValue":{
@@ -1174,7 +1196,7 @@
       "members":{
         "TopicArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the topic. </p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the topic.</p>"
         },
         "TopicStatus":{
           "shape":"String",
@@ -1404,7 +1426,7 @@
     "ServiceQuotaExceededException":{
       "type":"structure",
       "members":{},
-      "documentation":"<p>You have reached the maximum number of x509 certificates that can be created for encrypted clusters in a 30 day period. Contact AWS customer support to discuss options for continuing to create encrypted clusters.</p>",
+      "documentation":"<p>You have reached the maximum number of x509 certificates that can be created for encrypted clusters in a 30 day period. Contact Amazon Web Services customer support to discuss options for continuing to create encrypted clusters.</p>",
       "exception":true
     },
     "SourceType":{
@@ -1426,6 +1448,10 @@
         "SubnetAvailabilityZone":{
           "shape":"String",
           "documentation":"<p>The Availability Zone (AZ) for the subnet.</p>"
+        },
+        "SupportedNetworkTypes":{
+          "shape":"NetworkTypeList",
+          "documentation":"<p>The network types supported by this subnet. Returns an array of strings that can include <code>ipv4</code>, <code>ipv6</code>, or both, indicating whether the subnet supports IPv4 only, IPv6 only, or dual-stack deployments.</p>"
         }
       },
       "documentation":"<p>Represents the subnet associated with a DAX cluster. This parameter refers to subnets defined in Amazon Virtual Private Cloud (Amazon VPC) and used with DAX.</p>"
@@ -1448,6 +1474,10 @@
         "Subnets":{
           "shape":"SubnetList",
           "documentation":"<p>A list of subnets associated with the subnet group. </p>"
+        },
+        "SupportedNetworkTypes":{
+          "shape":"NetworkTypeList",
+          "documentation":"<p>The network types supported by this subnet. Returns an array of strings that can include <code>ipv4</code>, <code>ipv6</code>, or both, indicating whether the subnet group supports IPv4 only, IPv6 only, or dual-stack deployments. </p>"
         }
       },
       "documentation":"<p>Represents the output of one of the following actions:</p> <ul> <li> <p> <i>CreateSubnetGroup</i> </p> </li> <li> <p> <i>ModifySubnetGroup</i> </p> </li> </ul>"
@@ -1498,6 +1528,12 @@
       "type":"list",
       "member":{"shape":"Subnet"}
     },
+    "SubnetNotAllowedFault":{
+      "type":"structure",
+      "members":{},
+      "documentation":"<p>The specified subnet can't be used for the requested network type. This error occurs when either there aren't enough subnets of the required network type to create the cluster, or when you try to use a subnet that doesn't support the requested network type (for example, trying to create a dual-stack cluster with a subnet that doesn't have IPv6 CIDR). </p>",
+      "exception":true
+    },
     "SubnetQuotaExceededFault":{
       "type":"structure",
       "members":{},
@@ -1514,10 +1550,10 @@
         },
         "Value":{
           "shape":"String",
-          "documentation":"<p>The value of the tag. Tag values are case-sensitive and can be null. </p>"
+          "documentation":"<p>The value of the tag. Tag values are case-sensitive and can be null.</p>"
         }
       },
-      "documentation":"<p>A description of a tag. Every tag is a key-value pair. You can add up to 50 tags to a single DAX cluster.</p> <p>AWS-assigned tag names and values are automatically assigned the <code>aws:</code> prefix, which the user cannot assign. AWS-assigned tag names do not count towards the tag limit of 50. User-assigned tag names have the prefix <code>user:</code>.</p> <p>You cannot backdate the application of a tag.</p>"
+      "documentation":"<p>A description of a tag. Every tag is a key-value pair. You can add up to 50 tags to a single DAX cluster.</p> <p>Amazon Web Services-assigned tag names and values are automatically assigned the <code>aws:</code> prefix, which the user cannot assign. Amazon Web Services-assigned tag names do not count towards the tag limit of 50. User-assigned tag names have the prefix <code>user:</code>.</p> <p>You cannot backdate the application of a tag.</p>"
     },
     "TagList":{
       "type":"list",
@@ -1684,5 +1720,5 @@
       }
     }
   },
-  "documentation":"<p>DAX is a managed caching service engineered for Amazon DynamoDB. DAX dramatically speeds up database reads by caching frequently-accessed data from DynamoDB, so applications can access that data with sub-millisecond latency. You can create a DAX cluster easily, using the AWS Management Console. With a few simple modifications to your code, your application can begin taking advantage of the DAX cluster and realize significant improvements in read performance.</p>"
+  "documentation":"<p>DAX is a managed caching service engineered for Amazon DynamoDB. DAX dramatically speeds up database reads by caching frequently-accessed data from DynamoDB, so applications can access that data with sub-millisecond latency. You can create a DAX cluster easily, using the Amazon Web Services Management Console. With a few simple modifications to your code, your application can begin taking advantage of the DAX cluster and realize significant improvements in read performance.</p>"
 }
diff --git a/services/deadline/pom.xml b/services/deadline/pom.xml
index 7be61abe9475..365b386d9ddf 100644
--- a/services/deadline/pom.xml
+++ b/services/deadline/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>deadline</artifactId>
     <name>AWS Java SDK :: Services :: Deadline</name>
diff --git a/services/detective/pom.xml b/services/detective/pom.xml
index 1a69c494dbf5..ac4942db15eb 100644
--- a/services/detective/pom.xml
+++ b/services/detective/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>detective</artifactId>
     <name>AWS Java SDK :: Services :: Detective</name>
diff --git a/services/devicefarm/pom.xml b/services/devicefarm/pom.xml
index ff60da4f526a..a0d9465c6e3a 100644
--- a/services/devicefarm/pom.xml
+++ b/services/devicefarm/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>devicefarm</artifactId>
     <name>AWS Java SDK :: Services :: AWS Device Farm</name>
diff --git a/services/devopsguru/pom.xml b/services/devopsguru/pom.xml
index eaa4950c124e..722591ed7726 100644
--- a/services/devopsguru/pom.xml
+++ b/services/devopsguru/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>devopsguru</artifactId>
     <name>AWS Java SDK :: Services :: Dev Ops Guru</name>
diff --git a/services/directconnect/pom.xml b/services/directconnect/pom.xml
index 074801464c43..1f96eae62337 100644
--- a/services/directconnect/pom.xml
+++ b/services/directconnect/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>directconnect</artifactId>
     <name>AWS Java SDK :: Services :: AWS Direct Connect</name>
diff --git a/services/directory/pom.xml b/services/directory/pom.xml
index 56b8b9fbcb27..22be1dd57745 100644
--- a/services/directory/pom.xml
+++ b/services/directory/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>directory</artifactId>
     <name>AWS Java SDK :: Services :: AWS Directory Service</name>
diff --git a/services/directoryservicedata/pom.xml b/services/directoryservicedata/pom.xml
index f54b8c2fc182..bd54e2569bd3 100644
--- a/services/directoryservicedata/pom.xml
+++ b/services/directoryservicedata/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>directoryservicedata</artifactId>
     <name>AWS Java SDK :: Services :: Directory Service Data</name>
diff --git a/services/dlm/pom.xml b/services/dlm/pom.xml
index 0f671f1e3598..a98488869883 100644
--- a/services/dlm/pom.xml
+++ b/services/dlm/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>dlm</artifactId>
     <name>AWS Java SDK :: Services :: DLM</name>
diff --git a/services/docdb/pom.xml b/services/docdb/pom.xml
index 618e19e18e5d..06ecb9f2ab10 100644
--- a/services/docdb/pom.xml
+++ b/services/docdb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>docdb</artifactId>
     <name>AWS Java SDK :: Services :: DocDB</name>
diff --git a/services/docdbelastic/pom.xml b/services/docdbelastic/pom.xml
index 9cd5562b7535..3cab87b9d651 100644
--- a/services/docdbelastic/pom.xml
+++ b/services/docdbelastic/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>docdbelastic</artifactId>
     <name>AWS Java SDK :: Services :: Doc DB Elastic</name>
diff --git a/services/drs/pom.xml b/services/drs/pom.xml
index ab5bf86e91a8..a182ec03246a 100644
--- a/services/drs/pom.xml
+++ b/services/drs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>drs</artifactId>
     <name>AWS Java SDK :: Services :: Drs</name>
diff --git a/services/dsql/pom.xml b/services/dsql/pom.xml
index 2adb2e1e52fe..3c032954866e 100644
--- a/services/dsql/pom.xml
+++ b/services/dsql/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>dsql</artifactId>
     <name>AWS Java SDK :: Services :: DSQL</name>
diff --git a/services/dynamodb/pom.xml b/services/dynamodb/pom.xml
index 52db98eacea6..43f4f3a1a522 100644
--- a/services/dynamodb/pom.xml
+++ b/services/dynamodb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>dynamodb</artifactId>
     <name>AWS Java SDK :: Services :: Amazon DynamoDB</name>
diff --git a/services/dynamodb/src/main/resources/codegen-resources/dynamodbstreams/endpoint-rule-set.json b/services/dynamodb/src/main/resources/codegen-resources/dynamodbstreams/endpoint-rule-set.json
index 62df4e073a64..014779c88b1e 100644
--- a/services/dynamodb/src/main/resources/codegen-resources/dynamodbstreams/endpoint-rule-set.json
+++ b/services/dynamodb/src/main/resources/codegen-resources/dynamodbstreams/endpoint-rule-set.json
@@ -1,12 +1,6 @@
 {
     "version": "1.0",
     "parameters": {
-        "Region": {
-            "builtIn": "AWS::Region",
-            "required": false,
-            "documentation": "The AWS region used to dispatch the request.",
-            "type": "String"
-        },
         "UseDualStack": {
             "builtIn": "AWS::UseDualStack",
             "required": true,
@@ -26,6 +20,12 @@
             "required": false,
             "documentation": "Override the endpoint used to send this request",
             "type": "String"
+        },
+        "Region": {
+            "builtIn": "AWS::Region",
+            "required": false,
+            "documentation": "The AWS region used to dispatch the request.",
+            "type": "String"
         }
     },
     "rules": [
@@ -57,152 +57,158 @@
                     "type": "error"
                 },
                 {
-                    "conditions": [
+                    "conditions": [],
+                    "rules": [
                         {
-                            "fn": "booleanEquals",
-                            "argv": [
+                            "conditions": [
                                 {
-                                    "ref": "UseDualStack"
+                                    "fn": "booleanEquals",
+                                    "argv": [
+                                        {
+                                            "ref": "UseDualStack"
+                                        },
+                                        true
+                                    ]
+                                }
+                            ],
+                            "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
+                            "type": "error"
+                        },
+                        {
+                            "conditions": [],
+                            "endpoint": {
+                                "url": {
+                                    "ref": "Endpoint"
                                 },
-                                true
-                            ]
+                                "properties": {},
+                                "headers": {}
+                            },
+                            "type": "endpoint"
                         }
                     ],
-                    "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
-                    "type": "error"
-                },
-                {
-                    "conditions": [],
-                    "endpoint": {
-                        "url": {
-                            "ref": "Endpoint"
-                        },
-                        "properties": {},
-                        "headers": {}
-                    },
-                    "type": "endpoint"
+                    "type": "tree"
                 }
             ],
             "type": "tree"
         },
         {
-            "conditions": [
-                {
-                    "fn": "isSet",
-                    "argv": [
-                        {
-                            "ref": "Region"
-                        }
-                    ]
-                }
-            ],
+            "conditions": [],
             "rules": [
                 {
                     "conditions": [
                         {
-                            "fn": "aws.partition",
+                            "fn": "isSet",
                             "argv": [
                                 {
                                     "ref": "Region"
                                 }
-                            ],
-                            "assign": "PartitionResult"
+                            ]
                         }
                     ],
                     "rules": [
                         {
                             "conditions": [
                                 {
-                                    "fn": "booleanEquals",
+                                    "fn": "aws.partition",
                                     "argv": [
                                         {
-                                            "ref": "UseFIPS"
-                                        },
-                                        true
-                                    ]
-                                },
-                                {
-                                    "fn": "booleanEquals",
-                                    "argv": [
-                                        {
-                                            "ref": "UseDualStack"
-                                        },
-                                        true
-                                    ]
+                                            "ref": "Region"
+                                        }
+                                    ],
+                                    "assign": "PartitionResult"
                                 }
                             ],
                             "rules": [
                                 {
                                     "conditions": [
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "stringEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
                                                         {
                                                             "ref": "PartitionResult"
                                                         },
-                                                        "supportsFIPS"
+                                                        "name"
                                                     ]
-                                                }
+                                                },
+                                                "aws"
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                false
                                             ]
                                         },
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
+                                        }
+                                    ],
+                                    "endpoint": {
+                                        "url": "https://streams-dynamodb.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                },
+                                {
+                                    "conditions": [
+                                        {
+                                            "fn": "stringEquals",
+                                            "argv": [
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
                                                         {
                                                             "ref": "PartitionResult"
                                                         },
-                                                        "supportsDualStack"
+                                                        "name"
                                                     ]
-                                                }
+                                                },
+                                                "aws"
                                             ]
-                                        }
-                                    ],
-                                    "rules": [
+                                        },
                                         {
-                                            "conditions": [],
-                                            "endpoint": {
-                                                "url": "https://streams.dynamodb-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                true
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
                                         }
                                     ],
-                                    "type": "tree"
+                                    "endpoint": {
+                                        "url": "https://streams-dynamodb-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
                                 },
-                                {
-                                    "conditions": [],
-                                    "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
-                                    "type": "error"
-                                }
-                            ],
-                            "type": "tree"
-                        },
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "booleanEquals",
-                                    "argv": [
-                                        {
-                                            "ref": "UseFIPS"
-                                        },
-                                        true
-                                    ]
-                                }
-                            ],
-                            "rules": [
                                 {
                                     "conditions": [
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "stringEquals",
                                             "argv": [
                                                 {
                                                     "fn": "getAttr",
@@ -210,282 +216,430 @@
                                                         {
                                                             "ref": "PartitionResult"
                                                         },
-                                                        "supportsFIPS"
+                                                        "name"
                                                     ]
                                                 },
+                                                "aws-cn"
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                false
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
                                                 true
                                             ]
                                         }
                                     ],
-                                    "rules": [
+                                    "endpoint": {
+                                        "url": "https://streams-dynamodb.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                },
+                                {
+                                    "conditions": [
                                         {
-                                            "conditions": [
+                                            "fn": "stringEquals",
+                                            "argv": [
                                                 {
-                                                    "fn": "stringEquals",
+                                                    "fn": "getAttr",
                                                     "argv": [
                                                         {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "name"
-                                                            ]
+                                                            "ref": "PartitionResult"
                                                         },
-                                                        "aws-us-gov"
+                                                        "name"
                                                     ]
-                                                }
-                                            ],
-                                            "endpoint": {
-                                                "url": "https://streams.dynamodb.{Region}.amazonaws.com",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                                },
+                                                "aws-cn"
+                                            ]
                                         },
                                         {
-                                            "conditions": [],
-                                            "endpoint": {
-                                                "url": "https://streams.dynamodb-fips.{Region}.{PartitionResult#dnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                true
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
                                         }
                                     ],
-                                    "type": "tree"
+                                    "endpoint": {
+                                        "url": "https://streams-dynamodb-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
                                 },
                                 {
-                                    "conditions": [],
-                                    "error": "FIPS is enabled but this partition does not support FIPS",
-                                    "type": "error"
-                                }
-                            ],
-                            "type": "tree"
-                        },
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "booleanEquals",
-                                    "argv": [
+                                    "conditions": [
                                         {
-                                            "ref": "UseDualStack"
+                                            "fn": "stringEquals",
+                                            "argv": [
+                                                {
+                                                    "fn": "getAttr",
+                                                    "argv": [
+                                                        {
+                                                            "ref": "PartitionResult"
+                                                        },
+                                                        "name"
+                                                    ]
+                                                },
+                                                "aws-us-gov"
+                                            ]
                                         },
-                                        true
-                                    ]
-                                }
-                            ],
-                            "rules": [
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                false
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
+                                        }
+                                    ],
+                                    "endpoint": {
+                                        "url": "https://streams-dynamodb.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
+                                },
                                 {
                                     "conditions": [
                                         {
-                                            "fn": "booleanEquals",
+                                            "fn": "stringEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
                                                         {
                                                             "ref": "PartitionResult"
                                                         },
-                                                        "supportsDualStack"
+                                                        "name"
                                                     ]
-                                                }
+                                                },
+                                                "aws-us-gov"
                                             ]
-                                        }
-                                    ],
-                                    "rules": [
+                                        },
                                         {
-                                            "conditions": [],
-                                            "endpoint": {
-                                                "url": "https://streams.dynamodb.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                true
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
+                                            ]
                                         }
                                     ],
-                                    "type": "tree"
+                                    "endpoint": {
+                                        "url": "https://streams-dynamodb-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
                                 },
                                 {
-                                    "conditions": [],
-                                    "error": "DualStack is enabled but this partition does not support DualStack",
-                                    "type": "error"
-                                }
-                            ],
-                            "type": "tree"
-                        },
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "stringEquals",
-                                    "argv": [
+                                    "conditions": [
                                         {
-                                            "ref": "Region"
+                                            "fn": "stringEquals",
+                                            "argv": [
+                                                {
+                                                    "fn": "getAttr",
+                                                    "argv": [
+                                                        {
+                                                            "ref": "PartitionResult"
+                                                        },
+                                                        "name"
+                                                    ]
+                                                },
+                                                "aws-us-gov"
+                                            ]
                                         },
-                                        "local"
-                                    ]
-                                }
-                            ],
-                            "endpoint": {
-                                "url": "http://localhost:8000",
-                                "properties": {
-                                    "authSchemes": [
                                         {
-                                            "name": "sigv4",
-                                            "signingName": "dynamodb",
-                                            "signingRegion": "us-east-1"
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseFIPS"
+                                                },
+                                                true
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                false
+                                            ]
                                         }
-                                    ]
+                                    ],
+                                    "endpoint": {
+                                        "url": "https://streams.dynamodb.{Region}.{PartitionResult#dnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
                                 },
-                                "headers": {}
-                            },
-                            "type": "endpoint"
-                        },
-                        {
-                            "conditions": [
                                 {
-                                    "fn": "stringEquals",
-                                    "argv": [
-                                        "aws",
+                                    "conditions": [
                                         {
-                                            "fn": "getAttr",
+                                            "fn": "booleanEquals",
                                             "argv": [
                                                 {
-                                                    "ref": "PartitionResult"
+                                                    "ref": "UseFIPS"
                                                 },
-                                                "name"
+                                                true
                                             ]
-                                        }
-                                    ]
-                                }
-                            ],
-                            "endpoint": {
-                                "url": "https://streams.dynamodb.{Region}.amazonaws.com",
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
-                        },
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "stringEquals",
-                                    "argv": [
-                                        "aws-cn",
+                                        },
                                         {
-                                            "fn": "getAttr",
+                                            "fn": "booleanEquals",
                                             "argv": [
                                                 {
-                                                    "ref": "PartitionResult"
+                                                    "ref": "UseDualStack"
                                                 },
-                                                "name"
+                                                true
                                             ]
                                         }
-                                    ]
-                                }
-                            ],
-                            "endpoint": {
-                                "url": "https://streams.dynamodb.{Region}.amazonaws.com.cn",
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
-                        },
-                        {
-                            "conditions": [
+                                    ],
+                                    "rules": [
+                                        {
+                                            "conditions": [
+                                                {
+                                                    "fn": "booleanEquals",
+                                                    "argv": [
+                                                        true,
+                                                        {
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "supportsFIPS"
+                                                            ]
+                                                        }
+                                                    ]
+                                                },
+                                                {
+                                                    "fn": "booleanEquals",
+                                                    "argv": [
+                                                        true,
+                                                        {
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "supportsDualStack"
+                                                            ]
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "rules": [
+                                                {
+                                                    "conditions": [],
+                                                    "endpoint": {
+                                                        "url": "https://streams.dynamodb-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                                        "properties": {},
+                                                        "headers": {}
+                                                    },
+                                                    "type": "endpoint"
+                                                }
+                                            ],
+                                            "type": "tree"
+                                        },
+                                        {
+                                            "conditions": [],
+                                            "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
+                                            "type": "error"
+                                        }
+                                    ],
+                                    "type": "tree"
+                                },
                                 {
-                                    "fn": "stringEquals",
-                                    "argv": [
-                                        "aws-us-gov",
+                                    "conditions": [
                                         {
-                                            "fn": "getAttr",
+                                            "fn": "booleanEquals",
                                             "argv": [
                                                 {
-                                                    "ref": "PartitionResult"
+                                                    "ref": "UseFIPS"
                                                 },
-                                                "name"
+                                                true
                                             ]
-                                        }
-                                    ]
-                                }
-                            ],
-                            "endpoint": {
-                                "url": "https://streams.dynamodb.{Region}.amazonaws.com",
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
-                        },
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "stringEquals",
-                                    "argv": [
-                                        "aws-iso",
+                                        },
                                         {
-                                            "fn": "getAttr",
+                                            "fn": "booleanEquals",
                                             "argv": [
                                                 {
-                                                    "ref": "PartitionResult"
+                                                    "ref": "UseDualStack"
                                                 },
-                                                "name"
+                                                false
                                             ]
                                         }
-                                    ]
-                                }
-                            ],
-                            "endpoint": {
-                                "url": "https://streams.dynamodb.{Region}.c2s.ic.gov",
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
-                        },
-                        {
-                            "conditions": [
+                                    ],
+                                    "rules": [
+                                        {
+                                            "conditions": [
+                                                {
+                                                    "fn": "booleanEquals",
+                                                    "argv": [
+                                                        {
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "supportsFIPS"
+                                                            ]
+                                                        },
+                                                        true
+                                                    ]
+                                                }
+                                            ],
+                                            "rules": [
+                                                {
+                                                    "conditions": [],
+                                                    "endpoint": {
+                                                        "url": "https://streams.dynamodb-fips.{Region}.{PartitionResult#dnsSuffix}",
+                                                        "properties": {},
+                                                        "headers": {}
+                                                    },
+                                                    "type": "endpoint"
+                                                }
+                                            ],
+                                            "type": "tree"
+                                        },
+                                        {
+                                            "conditions": [],
+                                            "error": "FIPS is enabled but this partition does not support FIPS",
+                                            "type": "error"
+                                        }
+                                    ],
+                                    "type": "tree"
+                                },
                                 {
-                                    "fn": "stringEquals",
-                                    "argv": [
-                                        "aws-iso-b",
+                                    "conditions": [
                                         {
-                                            "fn": "getAttr",
+                                            "fn": "booleanEquals",
                                             "argv": [
                                                 {
-                                                    "ref": "PartitionResult"
+                                                    "ref": "UseFIPS"
                                                 },
-                                                "name"
+                                                false
+                                            ]
+                                        },
+                                        {
+                                            "fn": "booleanEquals",
+                                            "argv": [
+                                                {
+                                                    "ref": "UseDualStack"
+                                                },
+                                                true
                                             ]
                                         }
-                                    ]
+                                    ],
+                                    "rules": [
+                                        {
+                                            "conditions": [
+                                                {
+                                                    "fn": "booleanEquals",
+                                                    "argv": [
+                                                        true,
+                                                        {
+                                                            "fn": "getAttr",
+                                                            "argv": [
+                                                                {
+                                                                    "ref": "PartitionResult"
+                                                                },
+                                                                "supportsDualStack"
+                                                            ]
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            "rules": [
+                                                {
+                                                    "conditions": [],
+                                                    "endpoint": {
+                                                        "url": "https://streams.dynamodb.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                                        "properties": {},
+                                                        "headers": {}
+                                                    },
+                                                    "type": "endpoint"
+                                                }
+                                            ],
+                                            "type": "tree"
+                                        },
+                                        {
+                                            "conditions": [],
+                                            "error": "DualStack is enabled but this partition does not support DualStack",
+                                            "type": "error"
+                                        }
+                                    ],
+                                    "type": "tree"
+                                },
+                                {
+                                    "conditions": [],
+                                    "endpoint": {
+                                        "url": "https://streams.dynamodb.{Region}.{PartitionResult#dnsSuffix}",
+                                        "properties": {},
+                                        "headers": {}
+                                    },
+                                    "type": "endpoint"
                                 }
                             ],
-                            "endpoint": {
-                                "url": "https://streams.dynamodb.{Region}.sc2s.sgov.gov",
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
-                        },
-                        {
-                            "conditions": [],
-                            "endpoint": {
-                                "url": "https://streams.dynamodb.{Region}.{PartitionResult#dnsSuffix}",
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
+                            "type": "tree"
                         }
                     ],
                     "type": "tree"
+                },
+                {
+                    "conditions": [],
+                    "error": "Invalid Configuration: Missing Region",
+                    "type": "error"
                 }
             ],
             "type": "tree"
-        },
-        {
-            "conditions": [],
-            "error": "Invalid Configuration: Missing Region",
-            "type": "error"
         }
     ]
 }
\ No newline at end of file
diff --git a/services/dynamodb/src/main/resources/codegen-resources/dynamodbstreams/endpoint-tests.json b/services/dynamodb/src/main/resources/codegen-resources/dynamodbstreams/endpoint-tests.json
index 736b34277519..0f8ba10a35ae 100644
--- a/services/dynamodb/src/main/resources/codegen-resources/dynamodbstreams/endpoint-tests.json
+++ b/services/dynamodb/src/main/resources/codegen-resources/dynamodbstreams/endpoint-tests.json
@@ -1,259 +1,75 @@
 {
     "testCases": [
         {
-            "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For custom endpoint with region not set and fips disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.af-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "af-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.ap-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.ap-northeast-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.ap-northeast-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.ap-northeast-3.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-3",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.ap-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.ap-southeast-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.ap-southeast-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.ap-southeast-3.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-3",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.ca-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ca-central-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.eu-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-central-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.eu-north-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-north-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.eu-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.eu-west-1.amazonaws.com"
+                    "url": "https://example.com"
                 }
             },
             "params": {
-                "Region": "eu-west-1",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "Endpoint": "https://example.com",
+                "UseFIPS": false
             }
         },
         {
-            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
+            "documentation": "For custom endpoint with fips enabled",
             "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.eu-west-2.amazonaws.com"
-                }
+                "error": "Invalid Configuration: FIPS and custom endpoint are not supported"
             },
             "params": {
-                "Region": "eu-west-2",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "Endpoint": "https://example.com",
+                "UseFIPS": true
             }
         },
         {
-            "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled",
+            "documentation": "For custom endpoint with fips disabled and dualstack enabled",
             "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.eu-west-3.amazonaws.com"
-                }
+                "error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
             },
             "params": {
-                "Region": "eu-west-3",
+                "Endpoint": "https://example.com",
                 "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region local with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "properties": {
-                        "authSchemes": [
-                            {
-                                "name": "sigv4",
-                                "signingName": "dynamodb",
-                                "signingRegion": "us-east-1"
-                            }
-                        ]
-                    },
-                    "url": "http://localhost:8000"
+                    "url": "https://streams-dynamodb-fips.us-east-1.api.aws"
                 }
             },
             "params": {
-                "Region": "local",
-                "UseFIPS": false,
-                "UseDualStack": false
+                "Region": "us-east-1",
+                "UseFIPS": true,
+                "UseDualStack": true
             }
         },
         {
-            "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.me-south-1.amazonaws.com"
+                    "url": "https://streams.dynamodb-fips.us-east-1.amazonaws.com"
                 }
             },
             "params": {
-                "Region": "me-south-1",
-                "UseFIPS": false,
+                "Region": "us-east-1",
+                "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.sa-east-1.amazonaws.com"
+                    "url": "https://streams-dynamodb.us-east-1.api.aws"
                 }
             },
             "params": {
-                "Region": "sa-east-1",
+                "Region": "us-east-1",
                 "UseFIPS": false,
-                "UseDualStack": false
+                "UseDualStack": true
             }
         },
         {
@@ -270,96 +86,44 @@
             }
         },
         {
-            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.us-east-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.us-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-west-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.us-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-west-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb-fips.us-east-1.api.aws"
+                    "url": "https://streams-dynamodb-fips.cn-northwest-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
-                "Region": "us-east-1",
+                "Region": "cn-northwest-1",
                 "UseFIPS": true,
                 "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb-fips.us-east-1.amazonaws.com"
+                    "url": "https://streams.dynamodb-fips.cn-northwest-1.amazonaws.com.cn"
                 }
             },
             "params": {
-                "Region": "us-east-1",
+                "Region": "cn-northwest-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.us-east-1.api.aws"
+                    "url": "https://streams-dynamodb.cn-northwest-1.api.amazonwebservices.com.cn"
                 }
             },
             "params": {
-                "Region": "us-east-1",
+                "Region": "cn-northwest-1",
                 "UseFIPS": false,
                 "UseDualStack": true
             }
         },
-        {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.cn-north-1.amazonaws.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
         {
             "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled",
             "expect": {
@@ -374,223 +138,185 @@
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
+            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb-fips.cn-north-1.api.amazonwebservices.com.cn"
+                    "url": "https://streams-dynamodb-fips.us-gov-west-1.api.aws"
                 }
             },
             "params": {
-                "Region": "cn-north-1",
+                "Region": "us-gov-west-1",
                 "UseFIPS": true,
                 "UseDualStack": true
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb-fips.cn-north-1.amazonaws.com.cn"
+                    "url": "https://streams.dynamodb.us-gov-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "Region": "cn-north-1",
+                "Region": "us-gov-west-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
+            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.cn-north-1.api.amazonwebservices.com.cn"
+                    "url": "https://streams-dynamodb.us-gov-west-1.api.aws"
                 }
             },
             "params": {
-                "Region": "cn-north-1",
+                "Region": "us-gov-west-1",
                 "UseFIPS": false,
                 "UseDualStack": true
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.us-gov-east-1.amazonaws.com"
+                    "url": "https://streams.dynamodb.us-gov-west-1.amazonaws.com"
                 }
             },
             "params": {
-                "Region": "us-gov-east-1",
+                "Region": "us-gov-west-1",
                 "UseFIPS": false,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.us-gov-east-1.amazonaws.com"
+                    "url": "https://streams.dynamodb-fips.us-iso-east-1.c2s.ic.gov"
                 }
             },
             "params": {
-                "Region": "us-gov-east-1",
+                "Region": "us-iso-east-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.us-gov-west-1.amazonaws.com"
+                    "url": "https://streams.dynamodb.us-iso-east-1.c2s.ic.gov"
                 }
             },
             "params": {
-                "Region": "us-gov-west-1",
+                "Region": "us-iso-east-1",
                 "UseFIPS": false,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.us-gov-west-1.amazonaws.com"
+                    "url": "https://streams.dynamodb-fips.us-isob-east-1.sc2s.sgov.gov"
                 }
             },
             "params": {
-                "Region": "us-gov-west-1",
+                "Region": "us-isob-east-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb-fips.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseFIPS": true,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://streams.dynamodb.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://streams.dynamodb.us-isob-east-1.sc2s.sgov.gov"
                 }
             },
             "params": {
-                "Region": "us-iso-east-1",
+                "Region": "us-isob-east-1",
                 "UseFIPS": false,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region eu-isoe-west-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb-fips.us-iso-east-1.c2s.ic.gov"
+                    "url": "https://streams.dynamodb-fips.eu-isoe-west-1.cloud.adc-e.uk"
                 }
             },
             "params": {
-                "Region": "us-iso-east-1",
+                "Region": "eu-isoe-west-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
+            "documentation": "For region eu-isoe-west-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb.us-isob-east-1.sc2s.sgov.gov"
+                    "url": "https://streams.dynamodb.eu-isoe-west-1.cloud.adc-e.uk"
                 }
             },
             "params": {
-                "Region": "us-isob-east-1",
+                "Region": "eu-isoe-west-1",
                 "UseFIPS": false,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
+            "documentation": "For region us-isof-south-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://streams.dynamodb-fips.us-isob-east-1.sc2s.sgov.gov"
+                    "url": "https://streams.dynamodb-fips.us-isof-south-1.csp.hci.ic.gov"
                 }
             },
             "params": {
-                "Region": "us-isob-east-1",
+                "Region": "us-isof-south-1",
                 "UseFIPS": true,
                 "UseDualStack": false
             }
         },
         {
-            "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
+            "documentation": "For region us-isof-south-1 with FIPS disabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://example.com"
+                    "url": "https://streams.dynamodb.us-isof-south-1.csp.hci.ic.gov"
                 }
             },
             "params": {
-                "Region": "us-east-1",
+                "Region": "us-isof-south-1",
                 "UseFIPS": false,
-                "UseDualStack": false,
-                "Endpoint": "https://example.com"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled",
+            "documentation": "For region eusc-de-east-1 with FIPS enabled and DualStack disabled",
             "expect": {
                 "endpoint": {
-                    "url": "https://example.com"
+                    "url": "https://streams.dynamodb-fips.eusc-de-east-1.amazonaws.eu"
                 }
             },
             "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Endpoint": "https://example.com"
-            }
-        },
-        {
-            "documentation": "For custom endpoint with fips enabled and dualstack disabled",
-            "expect": {
-                "error": "Invalid Configuration: FIPS and custom endpoint are not supported"
-            },
-            "params": {
-                "Region": "us-east-1",
+                "Region": "eusc-de-east-1",
                 "UseFIPS": true,
-                "UseDualStack": false,
-                "Endpoint": "https://example.com"
+                "UseDualStack": false
             }
         },
         {
-            "documentation": "For custom endpoint with fips disabled and dualstack enabled",
+            "documentation": "For region eusc-de-east-1 with FIPS disabled and DualStack disabled",
             "expect": {
-                "error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
+                "endpoint": {
+                    "url": "https://streams.dynamodb.eusc-de-east-1.amazonaws.eu"
+                }
             },
             "params": {
-                "Region": "us-east-1",
+                "Region": "eusc-de-east-1",
                 "UseFIPS": false,
-                "UseDualStack": true,
-                "Endpoint": "https://example.com"
+                "UseDualStack": false
             }
         },
         {
diff --git a/services/ebs/pom.xml b/services/ebs/pom.xml
index db2a9ad9608b..54ed1fc455e1 100644
--- a/services/ebs/pom.xml
+++ b/services/ebs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ebs</artifactId>
     <name>AWS Java SDK :: Services :: EBS</name>
diff --git a/services/ec2/pom.xml b/services/ec2/pom.xml
index ee6135630b60..7c27d62422fb 100644
--- a/services/ec2/pom.xml
+++ b/services/ec2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ec2</artifactId>
     <name>AWS Java SDK :: Services :: Amazon EC2</name>
diff --git a/services/ec2/src/main/resources/codegen-resources/service-2.json b/services/ec2/src/main/resources/codegen-resources/service-2.json
index 5105543b3fab..5b551cb77c3a 100644
--- a/services/ec2/src/main/resources/codegen-resources/service-2.json
+++ b/services/ec2/src/main/resources/codegen-resources/service-2.json
@@ -608,7 +608,7 @@
       },
       "input":{"shape":"CopySnapshotRequest"},
       "output":{"shape":"CopySnapshotResult"},
-      "documentation":"<p>Creates an exact copy of an Amazon EBS snapshot.</p> <p>The location of the source snapshot determines whether you can copy it or not, and the allowed destinations for the snapshot copy.</p> <ul> <li> <p>If the source snapshot is in a Region, you can copy it within that Region, to another Region, to an Outpost associated with that Region, or to a Local Zone in that Region.</p> </li> <li> <p>If the source snapshot is in a Local Zone, you can copy it within that Local Zone, to another Local Zone in the same zone group, or to the parent Region of the Local Zone.</p> </li> <li> <p>If the source snapshot is on an Outpost, you can't copy it.</p> </li> </ul> <p>When copying snapshots to a Region, copies of encrypted EBS snapshots remain encrypted. Copies of unencrypted snapshots remain unencrypted, unless you enable encryption for the snapshot copy operation. By default, encrypted snapshot copies use the default KMS key; however, you can specify a different KMS key. To copy an encrypted snapshot that has been shared from another account, you must have permissions for the KMS key used to encrypt the snapshot.</p> <p>Snapshots copied to an Outpost are encrypted by default using the default encryption key for the Region, or a different key that you specify in the request using <b>KmsKeyId</b>. Outposts do not support unencrypted snapshots. For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/snapshots-outposts.html#ami\">Amazon EBS local snapshots on Outposts</a> in the <i>Amazon EBS User Guide</i>.</p> <note> <p>Snapshots copies have an arbitrary source volume ID. Do not use this volume ID for any purpose.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/ebs-copy-snapshot.html\">Copy an Amazon EBS snapshot</a> in the <i>Amazon EBS User Guide</i>.</p>"
+      "documentation":"<p>Creates an exact copy of an Amazon EBS snapshot.</p> <p>The location of the source snapshot determines whether you can copy it or not, and the allowed destinations for the snapshot copy.</p> <ul> <li> <p>If the source snapshot is in a Region, you can copy it within that Region, to another Region, to an Outpost associated with that Region, or to a Local Zone in that Region.</p> </li> <li> <p>If the source snapshot is in a Local Zone, you can copy it within that Local Zone, to another Local Zone in the same zone group, or to the parent Region of the Local Zone.</p> </li> <li> <p>If the source snapshot is on an Outpost, you can't copy it.</p> </li> </ul> <p>When copying snapshots to a Region, the encryption outcome for the snapshot copy depends on the Amazon EBS encryption by default setting for the destination Region, the encryption status of the source snapshot, and the encryption parameters you specify in the request. For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/ebs-copy-snapshot.html#creating-encrypted-snapshots\"> Encryption and snapshot copying</a>.</p> <p>Snapshots copied to an Outpost must be encrypted. Unencrypted snapshots are not supported on Outposts. For more information, <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/snapshots-outposts.html#considerations\"> Amazon EBS local snapshots on Outposts</a>.</p> <note> <p>Snapshots copies have an arbitrary source volume ID. Do not use this volume ID for any purpose.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/ebs-copy-snapshot.html\">Copy an Amazon EBS snapshot</a> in the <i>Amazon EBS User Guide</i>.</p>"
     },
     "CreateCapacityReservation":{
       "name":"CreateCapacityReservation",
@@ -778,7 +778,7 @@
       },
       "input":{"shape":"CreateFpgaImageRequest"},
       "output":{"shape":"CreateFpgaImageResult"},
-      "documentation":"<p>Creates an Amazon FPGA Image (AFI) from the specified design checkpoint (DCP).</p> <p>The create operation is asynchronous. To verify that the AFI is ready for use, check the output logs.</p> <p>An AFI contains the FPGA bitstream that is ready to download to an FPGA. You can securely deploy an AFI on multiple FPGA-accelerated instances. For more information, see the <a href=\"https://github.com/aws/aws-fpga/\">Amazon Web Services FPGA Hardware Development Kit</a>.</p>"
+      "documentation":"<p>Creates an Amazon FPGA Image (AFI) from the specified design checkpoint (DCP).</p> <p>The create operation is asynchronous. To verify that the AFI was successfully created and is ready for use, check the output logs.</p> <p>An AFI contains the FPGA bitstream that is ready to download to an FPGA. You can securely deploy an AFI on multiple FPGA-accelerated instances. For more information, see the <a href=\"https://github.com/aws/aws-fpga/\">Amazon Web Services FPGA Hardware Development Kit</a>.</p>"
     },
     "CreateImage":{
       "name":"CreateImage",
@@ -4274,7 +4274,7 @@
       },
       "input":{"shape":"DisableImageBlockPublicAccessRequest"},
       "output":{"shape":"DisableImageBlockPublicAccessResult"},
-      "documentation":"<p>Disables <i>block public access for AMIs</i> at the account level in the specified Amazon Web Services Region. This removes the <i>block public access</i> restriction from your account. With the restriction removed, you can publicly share your AMIs in the specified Amazon Web Services Region.</p> <p>The API can take up to 10 minutes to configure this setting. During this time, if you run <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetImageBlockPublicAccessState.html\">GetImageBlockPublicAccessState</a>, the response will be <code>block-new-sharing</code>. When the API has completed the configuration, the response will be <code>unblocked</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-public-access-to-amis.html\">Block public access to your AMIs</a> in the <i>Amazon EC2 User Guide</i>.</p>"
+      "documentation":"<p>Disables <i>block public access for AMIs</i> at the account level in the specified Amazon Web Services Region. This removes the <i>block public access</i> restriction from your account. With the restriction removed, you can publicly share your AMIs in the specified Amazon Web Services Region.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-public-access-to-amis.html\">Block public access to your AMIs</a> in the <i>Amazon EC2 User Guide</i>.</p>"
     },
     "DisableImageDeprecation":{
       "name":"DisableImageDeprecation",
@@ -13664,7 +13664,7 @@
         },
         "Encrypted":{
           "shape":"Boolean",
-          "documentation":"<p>To encrypt a copy of an unencrypted snapshot if encryption by default is not enabled, enable encryption using this parameter. Otherwise, omit this parameter. Encrypted snapshots are encrypted, even if you omit this parameter and encryption by default is not enabled. You cannot set this parameter to false. For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption.html\">Amazon EBS encryption</a> in the <i>Amazon EBS User Guide</i>.</p>",
+          "documentation":"<p>To encrypt a copy of an unencrypted snapshot if encryption by default is not enabled, enable encryption using this parameter. Otherwise, omit this parameter. Copies of encrypted snapshots are encrypted, even if you omit this parameter and encryption by default is not enabled. You cannot set this parameter to false. For more information, see <a href=\"https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption.html\">Amazon EBS encryption</a> in the <i>Amazon EBS User Guide</i>.</p>",
           "locationName":"encrypted"
         },
         "KmsKeyId":{
@@ -18306,7 +18306,7 @@
         },
         "Iops":{
           "shape":"Integer",
-          "documentation":"<p>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 16,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>This parameter is required for <code>io1</code> and <code>io2</code> volumes. The default for <code>gp3</code> volumes is 3,000 IOPS. This parameter is not supported for <code>gp2</code>, <code>st1</code>, <code>sc1</code>, or <code>standard</code> volumes.</p>"
+          "documentation":"<p>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 80,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>This parameter is required for <code>io1</code> and <code>io2</code> volumes. The default for <code>gp3</code> volumes is 3,000 IOPS. This parameter is not supported for <code>gp2</code>, <code>st1</code>, <code>sc1</code>, or <code>standard</code> volumes.</p>"
         },
         "KmsKeyId":{
           "shape":"KmsKeyId",
@@ -18318,7 +18318,7 @@
         },
         "Size":{
           "shape":"Integer",
-          "documentation":"<p>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.</p> <p>The following are the supported volumes sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code> and <code>gp3</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul>"
+          "documentation":"<p>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.</p> <p>The following are the supported volumes sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>gp3</code>: 1 - 65,536 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul>"
         },
         "SnapshotId":{
           "shape":"SnapshotId",
@@ -18339,7 +18339,7 @@
         },
         "Throughput":{
           "shape":"Integer",
-          "documentation":"<p>The throughput to provision for a volume, with a maximum of 1,000 MiB/s.</p> <p>This parameter is valid only for <code>gp3</code> volumes.</p> <p>Valid Range: Minimum value of 125. Maximum value of 1000.</p>"
+          "documentation":"<p>The throughput to provision for a volume, with a maximum of 2,000 MiB/s.</p> <p>This parameter is valid only for <code>gp3</code> volumes.</p> <p>Valid Range: Minimum value of 125. Maximum value of 2,000.</p>"
         },
         "ClientToken":{
           "shape":"String",
@@ -18827,6 +18827,27 @@
       },
       "documentation":"<p>Contains the output of CreateVpnGateway.</p>"
     },
+    "CreationDateCondition":{
+      "type":"structure",
+      "members":{
+        "MaximumDaysSinceCreated":{
+          "shape":"MaximumDaysSinceCreatedValue",
+          "documentation":"<p>The maximum number of days that have elapsed since the image was created. For example, a value of <code>300</code> allows images that were created within the last 300 days.</p>",
+          "locationName":"maximumDaysSinceCreated"
+        }
+      },
+      "documentation":"<p>The maximum age for allowed images.</p>"
+    },
+    "CreationDateConditionRequest":{
+      "type":"structure",
+      "members":{
+        "MaximumDaysSinceCreated":{
+          "shape":"MaximumDaysSinceCreatedValue",
+          "documentation":"<p>The maximum number of days that have elapsed since the image was created. For example, a value of <code>300</code> allows images that were created within the last 300 days.</p>"
+        }
+      },
+      "documentation":"<p>The maximum age for allowed images.</p>"
+    },
     "CreditSpecification":{
       "type":"structure",
       "members":{
@@ -21314,6 +21335,27 @@
       },
       "documentation":"<p>Contains the parameters for DeleteVpnGateway.</p>"
     },
+    "DeprecationTimeCondition":{
+      "type":"structure",
+      "members":{
+        "MaximumDaysSinceDeprecated":{
+          "shape":"MaximumDaysSinceDeprecatedValue",
+          "documentation":"<p>The maximum number of days that have elapsed since the image was deprecated. When set to <code>0</code>, no deprecated images are allowed.</p>",
+          "locationName":"maximumDaysSinceDeprecated"
+        }
+      },
+      "documentation":"<p>The maximum period since deprecation for allowed images.</p>"
+    },
+    "DeprecationTimeConditionRequest":{
+      "type":"structure",
+      "members":{
+        "MaximumDaysSinceDeprecated":{
+          "shape":"MaximumDaysSinceDeprecatedValue",
+          "documentation":"<p>The maximum number of days that have elapsed since the image was deprecated. Set to <code>0</code> to exclude all deprecated images.</p>"
+        }
+      },
+      "documentation":"<p>The maximum period since deprecation for allowed images.</p>"
+    },
     "DeprovisionByoipCidrRequest":{
       "type":"structure",
       "required":["Cidr"],
@@ -23801,7 +23843,7 @@
         },
         "IncludeAllResourceTypes":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies whether to check all supported Amazon Web Services resource types for image references. When specified, default values are applied for <code>ResourceTypeOptions</code>. For the default values, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/how-ami-references-works.html\">How AMI reference checks work</a> in the <i>Amazon EC2 User Guide</i>. If you also specify <code>ResourceTypes</code> with <code>ResourceTypeOptions</code>, your specified values override the default values.</p> <p>Supported resource types: <code>ec2:Instance</code> | <code>ec2:LaunchTemplate</code> | <code>ssm:Parameter</code> | <code>imagebuilder:ImageRecipe</code> | <code>imagebuilder:ContainerRecipe</code> </p> <p>Either <code>IncludeAllResourceTypes</code> or <code>ResourceTypes</code> must be specified.</p>"
+          "documentation":"<p>Specifies whether to check all supported Amazon Web Services resource types for image references. When specified, default values are applied for <code>ResourceTypeOptions</code>. For the default values, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-ami-references.html#how-ami-references-works\">How AMI reference checks work</a> in the <i>Amazon EC2 User Guide</i>. If you also specify <code>ResourceTypes</code> with <code>ResourceTypeOptions</code>, your specified values override the default values.</p> <p>Supported resource types: <code>ec2:Instance</code> | <code>ec2:LaunchTemplate</code> | <code>ssm:Parameter</code> | <code>imagebuilder:ImageRecipe</code> | <code>imagebuilder:ContainerRecipe</code> </p> <p>Either <code>IncludeAllResourceTypes</code> or <code>ResourceTypes</code> must be specified.</p>"
         },
         "ResourceTypes":{
           "shape":"ResourceTypeRequestList",
@@ -24516,7 +24558,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>affinity</code> - The affinity setting for an instance running on a Dedicated Host (<code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>architecture</code> - The instance architecture (<code>i386</code> | <code>x86_64</code> | <code>arm64</code>).</p> </li> <li> <p> <code>availability-zone</code> - The Availability Zone of the instance.</p> </li> <li> <p> <code>availability-zone-id</code> - The ID of the Availability Zone of the instance.</p> </li> <li> <p> <code>block-device-mapping.attach-time</code> - The attach time for an EBS volume mapped to the instance, for example, <code>2022-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>block-device-mapping.delete-on-termination</code> - A Boolean that indicates whether the EBS volume is deleted on instance termination.</p> </li> <li> <p> <code>block-device-mapping.device-name</code> - The device name specified in the block device mapping (for example, <code>/dev/sdh</code> or <code>xvdh</code>).</p> </li> <li> <p> <code>block-device-mapping.status</code> - The status for the EBS volume (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>block-device-mapping.volume-id</code> - The volume ID of the EBS volume.</p> </li> <li> <p> <code>boot-mode</code> - The boot mode that was specified by the AMI (<code>legacy-bios</code> | <code>uefi</code> | <code>uefi-preferred</code>).</p> </li> <li> <p> <code>capacity-reservation-id</code> - The ID of the Capacity Reservation into which the instance was launched.</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-preference</code> - The instance's Capacity Reservation preference (<code>open</code> | <code>none</code>).</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-target.capacity-reservation-id</code> - The ID of the targeted Capacity Reservation.</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-target.capacity-reservation-resource-group-arn</code> - The ARN of the targeted Capacity Reservation group.</p> </li> <li> <p> <code>client-token</code> - The idempotency token you provided when you launched the instance.</p> </li> <li> <p> <code>current-instance-boot-mode</code> - The boot mode that is used to launch the instance at launch or start (<code>legacy-bios</code> | <code>uefi</code>).</p> </li> <li> <p> <code>dns-name</code> - The public DNS name of the instance.</p> </li> <li> <p> <code>ebs-optimized</code> - A Boolean that indicates whether the instance is optimized for Amazon EBS I/O.</p> </li> <li> <p> <code>ena-support</code> - A Boolean that indicates whether the instance is enabled for enhanced networking with ENA.</p> </li> <li> <p> <code>enclave-options.enabled</code> - A Boolean that indicates whether the instance is enabled for Amazon Web Services Nitro Enclaves.</p> </li> <li> <p> <code>hibernation-options.configured</code> - A Boolean that indicates whether the instance is enabled for hibernation. A value of <code>true</code> means that the instance is enabled for hibernation.</p> </li> <li> <p> <code>host-id</code> - The ID of the Dedicated Host on which the instance is running, if applicable.</p> </li> <li> <p> <code>hypervisor</code> - The hypervisor type of the instance (<code>ovm</code> | <code>xen</code>). The value <code>xen</code> is used for both Xen and Nitro hypervisors.</p> </li> <li> <p> <code>iam-instance-profile.arn</code> - The instance profile associated with the instance. Specified as an ARN.</p> </li> <li> <p> <code>iam-instance-profile.id</code> - The instance profile associated with the instance. Specified as an ID.</p> </li> <li> <p> <code>image-id</code> - The ID of the image used to launch the instance.</p> </li> <li> <p> <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p> <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a Scheduled Instance, or a Capacity Block (<code>spot</code> | <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit unsigned integer. The high byte is used for internal purposes and should be ignored. The low byte is set based on the state represented. The valid values are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).</p> </li> <li> <p> <code>instance-state-name</code> - The state of the instance (<code>pending</code> | <code>running</code> | <code>shutting-down</code> | <code>terminated</code> | <code>stopping</code> | <code>stopped</code>).</p> </li> <li> <p> <code>instance-type</code> - The type of instance (for example, <code>t2.micro</code>).</p> </li> <li> <p> <code>instance.group-id</code> - The ID of the security group for the instance. </p> </li> <li> <p> <code>instance.group-name</code> - The name of the security group for the instance. </p> </li> <li> <p> <code>ip-address</code> - The public IPv4 address of the instance.</p> </li> <li> <p> <code>ipv6-address</code> - The IPv6 address of the instance.</p> </li> <li> <p> <code>kernel-id</code> - The kernel ID.</p> </li> <li> <p> <code>key-name</code> - The name of the key pair used when the instance was launched.</p> </li> <li> <p> <code>launch-index</code> - When launching multiple instances, this is the index for the instance in the launch group (for example, 0, 1, 2, and so on). </p> </li> <li> <p> <code>launch-time</code> - The time when the instance was launched, in the ISO 8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for example, <code>2021-09-29T11:04:43.305Z</code>. You can use a wildcard (<code>*</code>), for example, <code>2021-09-29T*</code>, which matches an entire day.</p> </li> <li> <p> <code>maintenance-options.auto-recovery</code> - The current automatic recovery behavior of the instance (<code>disabled</code> | <code>default</code>).</p> </li> <li> <p> <code>metadata-options.http-endpoint</code> - The status of access to the HTTP metadata endpoint on your instance (<code>enabled</code> | <code>disabled</code>)</p> </li> <li> <p> <code>metadata-options.http-protocol-ipv4</code> - Indicates whether the IPv4 endpoint is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>metadata-options.http-protocol-ipv6</code> - Indicates whether the IPv6 endpoint is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>metadata-options.http-put-response-hop-limit</code> - The HTTP metadata request put response hop limit (integer, possible values <code>1</code> to <code>64</code>)</p> </li> <li> <p> <code>metadata-options.http-tokens</code> - The metadata request authorization state (<code>optional</code> | <code>required</code>)</p> </li> <li> <p> <code>metadata-options.instance-metadata-tags</code> - The status of access to instance tags from the instance metadata (<code>enabled</code> | <code>disabled</code>)</p> </li> <li> <p> <code>metadata-options.state</code> - The state of the metadata option changes (<code>pending</code> | <code>applied</code>).</p> </li> <li> <p> <code>monitoring-state</code> - Indicates whether detailed monitoring is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>network-interface.addresses.association.allocation-id</code> - The allocation ID.</p> </li> <li> <p> <code>network-interface.addresses.association.association-id</code> - The association ID.</p> </li> <li> <p> <code>network-interface.addresses.association.carrier-ip</code> - The carrier IP address.</p> </li> <li> <p> <code>network-interface.addresses.association.customer-owned-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.addresses.association.ip-owner-id</code> - The owner ID of the private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.addresses.association.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.addresses.association.public-ip</code> - The ID of the association of an Elastic IP address (IPv4) with a network interface.</p> </li> <li> <p> <code>network-interface.addresses.primary</code> - Specifies whether the IPv4 address of the network interface is the primary private IPv4 address.</p> </li> <li> <p> <code>network-interface.addresses.private-dns-name</code> - The private DNS name.</p> </li> <li> <p> <code>network-interface.addresses.private-ip-address</code> - The private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.allocation-id</code> - The allocation ID returned when you allocated the Elastic IP address (IPv4) for your network interface.</p> </li> <li> <p> <code>network-interface.association.association-id</code> - The association ID returned when the network interface was associated with an IPv4 address.</p> </li> <li> <p> <code>network-interface.association.carrier-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.association.customer-owned-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.association.ip-owner-id</code> - The owner of the Elastic IP address (IPv4) associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.association.public-ip</code> - The address of the Elastic IP address (IPv4) bound to the network interface.</p> </li> <li> <p> <code>network-interface.attachment.attach-time</code> - The time that the network interface was attached to an instance.</p> </li> <li> <p> <code>network-interface.attachment.attachment-id</code> - The ID of the interface attachment.</p> </li> <li> <p> <code>network-interface.attachment.delete-on-termination</code> - Specifies whether the attachment is deleted when an instance is terminated.</p> </li> <li> <p> <code>network-interface.attachment.device-index</code> - The device index to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-id</code> - The ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-owner-id</code> - The owner ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.network-card-index</code> - The index of the network card.</p> </li> <li> <p> <code>network-interface.attachment.status</code> - The status of the attachment (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>network-interface.availability-zone</code> - The Availability Zone for the network interface.</p> </li> <li> <p> <code>network-interface.deny-all-igw-traffic</code> - A Boolean that indicates whether a network interface with an IPv6 address is unreachable from the public internet.</p> </li> <li> <p> <code>network-interface.description</code> - The description of the network interface.</p> </li> <li> <p> <code>network-interface.group-id</code> - The ID of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.group-name</code> - The name of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv4-prefixes.ipv4-prefix</code> - The IPv4 prefixes that are assigned to the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.is-primary-ipv6</code> - A Boolean that indicates whether this is the primary IPv6 address.</p> </li> <li> <p> <code>network-interface.ipv6-native</code> - A Boolean that indicates whether this is an IPv6 only network interface.</p> </li> <li> <p> <code>network-interface.ipv6-prefixes.ipv6-prefix</code> - The IPv6 prefix assigned to the network interface.</p> </li> <li> <p> <code>network-interface.mac-address</code> - The MAC address of the network interface.</p> </li> <li> <p> <code>network-interface.network-interface-id</code> - The ID of the network interface.</p> </li> <li> <p> <code>network-interface.operator.managed</code> - A Boolean that indicates whether the instance has a managed network interface.</p> </li> <li> <p> <code>network-interface.operator.principal</code> - The principal that manages the network interface. Only valid for instances with managed network interfaces, where <code>managed</code> is <code>true</code>.</p> </li> <li> <p> <code>network-interface.outpost-arn</code> - The ARN of the Outpost.</p> </li> <li> <p> <code>network-interface.owner-id</code> - The ID of the owner of the network interface.</p> </li> <li> <p> <code>network-interface.private-dns-name</code> - The private DNS name of the network interface.</p> </li> <li> <p> <code>network-interface.private-ip-address</code> - The private IPv4 address.</p> </li> <li> <p> <code>network-interface.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.requester-id</code> - The requester ID for the network interface.</p> </li> <li> <p> <code>network-interface.requester-managed</code> - Indicates whether the network interface is being managed by Amazon Web Services.</p> </li> <li> <p> <code>network-interface.status</code> - The status of the network interface (<code>available</code>) | <code>in-use</code>).</p> </li> <li> <p> <code>network-interface.source-dest-check</code> - Whether the network interface performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the network interface to perform network address translation (NAT) in your VPC.</p> </li> <li> <p> <code>network-interface.subnet-id</code> - The ID of the subnet for the network interface.</p> </li> <li> <p> <code>network-interface.tag-key</code> - The key of a tag assigned to the network interface.</p> </li> <li> <p> <code>network-interface.tag-value</code> - The value of a tag assigned to the network interface.</p> </li> <li> <p> <code>network-interface.vpc-id</code> - The ID of the VPC for the network interface.</p> </li> <li> <p> <code>network-performance-options.bandwidth-weighting</code> - Where the performance boost is applied, if applicable. Valid values: <code>default</code>, <code>vpc-1</code>, <code>ebs-1</code>.</p> </li> <li> <p> <code>operator.managed</code> - A Boolean that indicates whether this is a managed instance.</p> </li> <li> <p> <code>operator.principal</code> - The principal that manages the instance. Only valid for managed instances, where <code>managed</code> is <code>true</code>.</p> </li> <li> <p> <code>outpost-arn</code> - The Amazon Resource Name (ARN) of the Outpost.</p> </li> <li> <p> <code>owner-id</code> - The Amazon Web Services account ID of the instance owner.</p> </li> <li> <p> <code>placement-group-name</code> - The name of the placement group for the instance.</p> </li> <li> <p> <code>placement-partition-number</code> - The partition in which the instance is located.</p> </li> <li> <p> <code>platform</code> - The platform. To list only Windows instances, use <code>windows</code>.</p> </li> <li> <p> <code>platform-details</code> - The platform (<code>Linux/UNIX</code> | <code>Red Hat BYOL Linux</code> | <code> Red Hat Enterprise Linux</code> | <code>Red Hat Enterprise Linux with HA</code> | <code>Red Hat Enterprise Linux with SQL Server Standard and HA</code> | <code>Red Hat Enterprise Linux with SQL Server Enterprise and HA</code> | <code>Red Hat Enterprise Linux with SQL Server Standard</code> | <code>Red Hat Enterprise Linux with SQL Server Web</code> | <code>Red Hat Enterprise Linux with SQL Server Enterprise</code> | <code>SQL Server Enterprise</code> | <code>SQL Server Standard</code> | <code>SQL Server Web</code> | <code>SUSE Linux</code> | <code>Ubuntu Pro</code> | <code>Windows</code> | <code>Windows BYOL</code> | <code>Windows with SQL Server Enterprise</code> | <code>Windows with SQL Server Standard</code> | <code>Windows with SQL Server Web</code>).</p> </li> <li> <p> <code>private-dns-name</code> - The private IPv4 DNS name of the instance.</p> </li> <li> <p> <code>private-dns-name-options.enable-resource-name-dns-a-record</code> - A Boolean that indicates whether to respond to DNS queries for instance hostnames with DNS A records.</p> </li> <li> <p> <code>private-dns-name-options.enable-resource-name-dns-aaaa-record</code> - A Boolean that indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records.</p> </li> <li> <p> <code>private-dns-name-options.hostname-type</code> - The type of hostname (<code>ip-name</code> | <code>resource-name</code>).</p> </li> <li> <p> <code>private-ip-address</code> - The private IPv4 address of the instance. This can only be used to filter by the primary IP address of the network interface attached to the instance. To filter by additional IP addresses assigned to the network interface, use the filter <code>network-interface.addresses.private-ip-address</code>.</p> </li> <li> <p> <code>product-code</code> - The product code associated with the AMI used to launch the instance.</p> </li> <li> <p> <code>product-code.type</code> - The type of product code (<code>devpay</code> | <code>marketplace</code>).</p> </li> <li> <p> <code>ramdisk-id</code> - The RAM disk ID.</p> </li> <li> <p> <code>reason</code> - The reason for the current state of the instance (for example, shows \"User Initiated [date]\" when you stop or terminate the instance). Similar to the state-reason-code filter.</p> </li> <li> <p> <code>requester-id</code> - The ID of the entity that launched the instance on your behalf (for example, Amazon Web Services Management Console, Auto Scaling, and so on).</p> </li> <li> <p> <code>reservation-id</code> - The ID of the instance's reservation. A reservation ID is created any time you launch an instance. A reservation ID has a one-to-one relationship with an instance launch request, but can be associated with more than one instance if you launch multiple instances using the same launch request. For example, if you launch one instance, you get one reservation ID. If you launch ten instances using the same launch request, you also get one reservation ID.</p> </li> <li> <p> <code>root-device-name</code> - The device name of the root device volume (for example, <code>/dev/sda1</code>).</p> </li> <li> <p> <code>root-device-type</code> - The type of the root device volume (<code>ebs</code> | <code>instance-store</code>).</p> </li> <li> <p> <code>source-dest-check</code> - Indicates whether the instance performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the instance to perform network address translation (NAT) in your VPC. </p> </li> <li> <p> <code>spot-instance-request-id</code> - The ID of the Spot Instance request.</p> </li> <li> <p> <code>state-reason-code</code> - The reason code for the state change.</p> </li> <li> <p> <code>state-reason-message</code> - A message that describes the state change.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet for the instance.</p> </li> <li> <p> <code>tag:&lt;key&gt;</code> - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources that have a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>tenancy</code> - The tenancy of an instance (<code>dedicated</code> | <code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>tpm-support</code> - Indicates if the instance is configured for NitroTPM support (<code>v2.0</code>). </p> </li> <li> <p> <code>usage-operation</code> - The usage operation value for the instance (<code>RunInstances</code> | <code>RunInstances:00g0</code> | <code>RunInstances:0010</code> | <code>RunInstances:1010</code> | <code>RunInstances:1014</code> | <code>RunInstances:1110</code> | <code>RunInstances:0014</code> | <code>RunInstances:0210</code> | <code>RunInstances:0110</code> | <code>RunInstances:0100</code> | <code>RunInstances:0004</code> | <code>RunInstances:0200</code> | <code>RunInstances:000g</code> | <code>RunInstances:0g00</code> | <code>RunInstances:0002</code> | <code>RunInstances:0800</code> | <code>RunInstances:0102</code> | <code>RunInstances:0006</code> | <code>RunInstances:0202</code>).</p> </li> <li> <p> <code>usage-operation-update-time</code> - The time that the usage operation was last updated, for example, <code>2022-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>virtualization-type</code> - The virtualization type of the instance (<code>paravirtual</code> | <code>hvm</code>).</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC that the instance is running in.</p> </li> </ul>",
+          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>affinity</code> - The affinity setting for an instance running on a Dedicated Host (<code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>architecture</code> - The instance architecture (<code>i386</code> | <code>x86_64</code> | <code>arm64</code>).</p> </li> <li> <p> <code>availability-zone</code> - The Availability Zone of the instance.</p> </li> <li> <p> <code>availability-zone-id</code> - The ID of the Availability Zone of the instance.</p> </li> <li> <p> <code>block-device-mapping.attach-time</code> - The attach time for an EBS volume mapped to the instance, for example, <code>2022-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>block-device-mapping.delete-on-termination</code> - A Boolean that indicates whether the EBS volume is deleted on instance termination.</p> </li> <li> <p> <code>block-device-mapping.device-name</code> - The device name specified in the block device mapping (for example, <code>/dev/sdh</code> or <code>xvdh</code>).</p> </li> <li> <p> <code>block-device-mapping.status</code> - The status for the EBS volume (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>block-device-mapping.volume-id</code> - The volume ID of the EBS volume.</p> </li> <li> <p> <code>boot-mode</code> - The boot mode that was specified by the AMI (<code>legacy-bios</code> | <code>uefi</code> | <code>uefi-preferred</code>).</p> </li> <li> <p> <code>capacity-reservation-id</code> - The ID of the Capacity Reservation into which the instance was launched.</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-preference</code> - The instance's Capacity Reservation preference (<code>open</code> | <code>none</code>).</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-target.capacity-reservation-id</code> - The ID of the targeted Capacity Reservation.</p> </li> <li> <p> <code>capacity-reservation-specification.capacity-reservation-target.capacity-reservation-resource-group-arn</code> - The ARN of the targeted Capacity Reservation group.</p> </li> <li> <p> <code>client-token</code> - The idempotency token you provided when you launched the instance.</p> </li> <li> <p> <code>current-instance-boot-mode</code> - The boot mode that is used to launch the instance at launch or start (<code>legacy-bios</code> | <code>uefi</code>).</p> </li> <li> <p> <code>dns-name</code> - The public DNS name of the instance.</p> </li> <li> <p> <code>ebs-optimized</code> - A Boolean that indicates whether the instance is optimized for Amazon EBS I/O.</p> </li> <li> <p> <code>ena-support</code> - A Boolean that indicates whether the instance is enabled for enhanced networking with ENA.</p> </li> <li> <p> <code>enclave-options.enabled</code> - A Boolean that indicates whether the instance is enabled for Amazon Web Services Nitro Enclaves.</p> </li> <li> <p> <code>hibernation-options.configured</code> - A Boolean that indicates whether the instance is enabled for hibernation. A value of <code>true</code> means that the instance is enabled for hibernation.</p> </li> <li> <p> <code>host-id</code> - The ID of the Dedicated Host on which the instance is running, if applicable.</p> </li> <li> <p> <code>hypervisor</code> - The hypervisor type of the instance (<code>ovm</code> | <code>xen</code>). The value <code>xen</code> is used for both Xen and Nitro hypervisors.</p> </li> <li> <p> <code>iam-instance-profile.arn</code> - The instance profile associated with the instance. Specified as an ARN.</p> </li> <li> <p> <code>iam-instance-profile.id</code> - The instance profile associated with the instance. Specified as an ID.</p> </li> <li> <p> <code>image-id</code> - The ID of the image used to launch the instance.</p> </li> <li> <p> <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p> <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance, a Scheduled Instance, or a Capacity Block (<code>spot</code> | <code>scheduled</code> | <code>capacity-block</code>).</p> </li> <li> <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit unsigned integer. The high byte is used for internal purposes and should be ignored. The low byte is set based on the state represented. The valid values are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).</p> </li> <li> <p> <code>instance-state-name</code> - The state of the instance (<code>pending</code> | <code>running</code> | <code>shutting-down</code> | <code>terminated</code> | <code>stopping</code> | <code>stopped</code>).</p> </li> <li> <p> <code>instance-type</code> - The type of instance (for example, <code>t2.micro</code>).</p> </li> <li> <p> <code>instance.group-id</code> - The ID of the security group for the instance. </p> </li> <li> <p> <code>instance.group-name</code> - The name of the security group for the instance. </p> </li> <li> <p> <code>ip-address</code> - The public IPv4 address of the instance.</p> </li> <li> <p> <code>ipv6-address</code> - The IPv6 address of the instance.</p> </li> <li> <p> <code>kernel-id</code> - The kernel ID.</p> </li> <li> <p> <code>key-name</code> - The name of the key pair used when the instance was launched.</p> </li> <li> <p> <code>launch-index</code> - When launching multiple instances, this is the index for the instance in the launch group (for example, 0, 1, 2, and so on). </p> </li> <li> <p> <code>launch-time</code> - The time when the instance was launched, in the ISO 8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for example, <code>2021-09-29T11:04:43.305Z</code>. You can use a wildcard (<code>*</code>), for example, <code>2021-09-29T*</code>, which matches an entire day.</p> </li> <li> <p> <code>maintenance-options.auto-recovery</code> - The current automatic recovery behavior of the instance (<code>disabled</code> | <code>default</code>).</p> </li> <li> <p> <code>metadata-options.http-endpoint</code> - The status of access to the HTTP metadata endpoint on your instance (<code>enabled</code> | <code>disabled</code>)</p> </li> <li> <p> <code>metadata-options.http-protocol-ipv4</code> - Indicates whether the IPv4 endpoint is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>metadata-options.http-protocol-ipv6</code> - Indicates whether the IPv6 endpoint is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>metadata-options.http-put-response-hop-limit</code> - The HTTP metadata request put response hop limit (integer, possible values <code>1</code> to <code>64</code>)</p> </li> <li> <p> <code>metadata-options.http-tokens</code> - The metadata request authorization state (<code>optional</code> | <code>required</code>)</p> </li> <li> <p> <code>metadata-options.instance-metadata-tags</code> - The status of access to instance tags from the instance metadata (<code>enabled</code> | <code>disabled</code>)</p> </li> <li> <p> <code>metadata-options.state</code> - The state of the metadata option changes (<code>pending</code> | <code>applied</code>).</p> </li> <li> <p> <code>monitoring-state</code> - Indicates whether detailed monitoring is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>network-interface.addresses.association.allocation-id</code> - The allocation ID.</p> </li> <li> <p> <code>network-interface.addresses.association.association-id</code> - The association ID.</p> </li> <li> <p> <code>network-interface.addresses.association.carrier-ip</code> - The carrier IP address.</p> </li> <li> <p> <code>network-interface.addresses.association.customer-owned-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.addresses.association.ip-owner-id</code> - The owner ID of the private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.addresses.association.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.addresses.association.public-ip</code> - The ID of the association of an Elastic IP address (IPv4) with a network interface.</p> </li> <li> <p> <code>network-interface.addresses.primary</code> - Specifies whether the IPv4 address of the network interface is the primary private IPv4 address.</p> </li> <li> <p> <code>network-interface.addresses.private-dns-name</code> - The private DNS name.</p> </li> <li> <p> <code>network-interface.addresses.private-ip-address</code> - The private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.allocation-id</code> - The allocation ID returned when you allocated the Elastic IP address (IPv4) for your network interface.</p> </li> <li> <p> <code>network-interface.association.association-id</code> - The association ID returned when the network interface was associated with an IPv4 address.</p> </li> <li> <p> <code>network-interface.association.carrier-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.association.customer-owned-ip</code> - The customer-owned IP address.</p> </li> <li> <p> <code>network-interface.association.ip-owner-id</code> - The owner of the Elastic IP address (IPv4) associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.association.public-ip</code> - The address of the Elastic IP address (IPv4) bound to the network interface.</p> </li> <li> <p> <code>network-interface.attachment.attach-time</code> - The time that the network interface was attached to an instance.</p> </li> <li> <p> <code>network-interface.attachment.attachment-id</code> - The ID of the interface attachment.</p> </li> <li> <p> <code>network-interface.attachment.delete-on-termination</code> - Specifies whether the attachment is deleted when an instance is terminated.</p> </li> <li> <p> <code>network-interface.attachment.device-index</code> - The device index to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-id</code> - The ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-owner-id</code> - The owner ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.network-card-index</code> - The index of the network card.</p> </li> <li> <p> <code>network-interface.attachment.status</code> - The status of the attachment (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>network-interface.availability-zone</code> - The Availability Zone for the network interface.</p> </li> <li> <p> <code>network-interface.deny-all-igw-traffic</code> - A Boolean that indicates whether a network interface with an IPv6 address is unreachable from the public internet.</p> </li> <li> <p> <code>network-interface.description</code> - The description of the network interface.</p> </li> <li> <p> <code>network-interface.group-id</code> - The ID of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.group-name</code> - The name of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv4-prefixes.ipv4-prefix</code> - The IPv4 prefixes that are assigned to the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.is-primary-ipv6</code> - A Boolean that indicates whether this is the primary IPv6 address.</p> </li> <li> <p> <code>network-interface.ipv6-native</code> - A Boolean that indicates whether this is an IPv6 only network interface.</p> </li> <li> <p> <code>network-interface.ipv6-prefixes.ipv6-prefix</code> - The IPv6 prefix assigned to the network interface.</p> </li> <li> <p> <code>network-interface.mac-address</code> - The MAC address of the network interface.</p> </li> <li> <p> <code>network-interface.network-interface-id</code> - The ID of the network interface.</p> </li> <li> <p> <code>network-interface.operator.managed</code> - A Boolean that indicates whether the instance has a managed network interface.</p> </li> <li> <p> <code>network-interface.operator.principal</code> - The principal that manages the network interface. Only valid for instances with managed network interfaces, where <code>managed</code> is <code>true</code>.</p> </li> <li> <p> <code>network-interface.outpost-arn</code> - The ARN of the Outpost.</p> </li> <li> <p> <code>network-interface.owner-id</code> - The ID of the owner of the network interface.</p> </li> <li> <p> <code>network-interface.private-dns-name</code> - The private DNS name of the network interface.</p> </li> <li> <p> <code>network-interface.private-ip-address</code> - The private IPv4 address.</p> </li> <li> <p> <code>network-interface.public-dns-name</code> - The public DNS name.</p> </li> <li> <p> <code>network-interface.requester-id</code> - The requester ID for the network interface.</p> </li> <li> <p> <code>network-interface.requester-managed</code> - Indicates whether the network interface is being managed by Amazon Web Services.</p> </li> <li> <p> <code>network-interface.status</code> - The status of the network interface (<code>available</code>) | <code>in-use</code>).</p> </li> <li> <p> <code>network-interface.source-dest-check</code> - Whether the network interface performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the network interface to perform network address translation (NAT) in your VPC.</p> </li> <li> <p> <code>network-interface.subnet-id</code> - The ID of the subnet for the network interface.</p> </li> <li> <p> <code>network-interface.tag-key</code> - The key of a tag assigned to the network interface.</p> </li> <li> <p> <code>network-interface.tag-value</code> - The value of a tag assigned to the network interface.</p> </li> <li> <p> <code>network-interface.vpc-id</code> - The ID of the VPC for the network interface.</p> </li> <li> <p> <code>network-performance-options.bandwidth-weighting</code> - Where the performance boost is applied, if applicable. Valid values: <code>default</code>, <code>vpc-1</code>, <code>ebs-1</code>.</p> </li> <li> <p> <code>operator.managed</code> - A Boolean that indicates whether this is a managed instance.</p> </li> <li> <p> <code>operator.principal</code> - The principal that manages the instance. Only valid for managed instances, where <code>managed</code> is <code>true</code>.</p> </li> <li> <p> <code>outpost-arn</code> - The Amazon Resource Name (ARN) of the Outpost.</p> </li> <li> <p> <code>owner-id</code> - The Amazon Web Services account ID of the instance owner.</p> </li> <li> <p> <code>placement-group-name</code> - The name of the placement group for the instance.</p> </li> <li> <p> <code>placement-partition-number</code> - The partition in which the instance is located.</p> </li> <li> <p> <code>platform</code> - The platform. To list only Windows instances, use <code>windows</code>.</p> </li> <li> <p> <code>platform-details</code> - The platform (<code>Linux/UNIX</code> | <code>Red Hat BYOL Linux</code> | <code> Red Hat Enterprise Linux</code> | <code>Red Hat Enterprise Linux with HA</code> | <code>Red Hat Enterprise Linux with High Availability</code> | <code>Red Hat Enterprise Linux with SQL Server Standard and HA</code> | <code>Red Hat Enterprise Linux with SQL Server Enterprise and HA</code> | <code>Red Hat Enterprise Linux with SQL Server Standard</code> | <code>Red Hat Enterprise Linux with SQL Server Web</code> | <code>Red Hat Enterprise Linux with SQL Server Enterprise</code> | <code>SQL Server Enterprise</code> | <code>SQL Server Standard</code> | <code>SQL Server Web</code> | <code>SUSE Linux</code> | <code>Ubuntu Pro</code> | <code>Windows</code> | <code>Windows BYOL</code> | <code>Windows with SQL Server Enterprise</code> | <code>Windows with SQL Server Standard</code> | <code>Windows with SQL Server Web</code>).</p> </li> <li> <p> <code>private-dns-name</code> - The private IPv4 DNS name of the instance.</p> </li> <li> <p> <code>private-dns-name-options.enable-resource-name-dns-a-record</code> - A Boolean that indicates whether to respond to DNS queries for instance hostnames with DNS A records.</p> </li> <li> <p> <code>private-dns-name-options.enable-resource-name-dns-aaaa-record</code> - A Boolean that indicates whether to respond to DNS queries for instance hostnames with DNS AAAA records.</p> </li> <li> <p> <code>private-dns-name-options.hostname-type</code> - The type of hostname (<code>ip-name</code> | <code>resource-name</code>).</p> </li> <li> <p> <code>private-ip-address</code> - The private IPv4 address of the instance. This can only be used to filter by the primary IP address of the network interface attached to the instance. To filter by additional IP addresses assigned to the network interface, use the filter <code>network-interface.addresses.private-ip-address</code>.</p> </li> <li> <p> <code>product-code</code> - The product code associated with the AMI used to launch the instance.</p> </li> <li> <p> <code>product-code.type</code> - The type of product code (<code>devpay</code> | <code>marketplace</code>).</p> </li> <li> <p> <code>ramdisk-id</code> - The RAM disk ID.</p> </li> <li> <p> <code>reason</code> - The reason for the current state of the instance (for example, shows \"User Initiated [date]\" when you stop or terminate the instance). Similar to the state-reason-code filter.</p> </li> <li> <p> <code>requester-id</code> - The ID of the entity that launched the instance on your behalf (for example, Amazon Web Services Management Console, Auto Scaling, and so on).</p> </li> <li> <p> <code>reservation-id</code> - The ID of the instance's reservation. A reservation ID is created any time you launch an instance. A reservation ID has a one-to-one relationship with an instance launch request, but can be associated with more than one instance if you launch multiple instances using the same launch request. For example, if you launch one instance, you get one reservation ID. If you launch ten instances using the same launch request, you also get one reservation ID.</p> </li> <li> <p> <code>root-device-name</code> - The device name of the root device volume (for example, <code>/dev/sda1</code>).</p> </li> <li> <p> <code>root-device-type</code> - The type of the root device volume (<code>ebs</code> | <code>instance-store</code>).</p> </li> <li> <p> <code>source-dest-check</code> - Indicates whether the instance performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the instance to perform network address translation (NAT) in your VPC. </p> </li> <li> <p> <code>spot-instance-request-id</code> - The ID of the Spot Instance request.</p> </li> <li> <p> <code>state-reason-code</code> - The reason code for the state change.</p> </li> <li> <p> <code>state-reason-message</code> - A message that describes the state change.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet for the instance.</p> </li> <li> <p> <code>tag:&lt;key&gt;</code> - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources that have a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>tenancy</code> - The tenancy of an instance (<code>dedicated</code> | <code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>tpm-support</code> - Indicates if the instance is configured for NitroTPM support (<code>v2.0</code>). </p> </li> <li> <p> <code>usage-operation</code> - The usage operation value for the instance (<code>RunInstances</code> | <code>RunInstances:00g0</code> | <code>RunInstances:0010</code> | <code>RunInstances:1010</code> | <code>RunInstances:1014</code> | <code>RunInstances:1110</code> | <code>RunInstances:0014</code> | <code>RunInstances:0210</code> | <code>RunInstances:0110</code> | <code>RunInstances:0100</code> | <code>RunInstances:0004</code> | <code>RunInstances:0200</code> | <code>RunInstances:000g</code> | <code>RunInstances:0g00</code> | <code>RunInstances:0002</code> | <code>RunInstances:0800</code> | <code>RunInstances:0102</code> | <code>RunInstances:0006</code> | <code>RunInstances:0202</code>).</p> </li> <li> <p> <code>usage-operation-update-time</code> - The time that the usage operation was last updated, for example, <code>2022-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>virtualization-type</code> - The virtualization type of the instance (<code>paravirtual</code> | <code>hvm</code>).</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC that the instance is running in.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "NextToken":{
@@ -31047,7 +31089,7 @@
         },
         "Iops":{
           "shape":"Integer",
-          "documentation":"<p>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 16,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>This parameter is required for <code>io1</code> and <code>io2</code> volumes. The default for <code>gp3</code> volumes is 3,000 IOPS.</p>",
+          "documentation":"<p>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 80,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>This parameter is required for <code>io1</code> and <code>io2</code> volumes. The default for <code>gp3</code> volumes is 3,000 IOPS.</p>",
           "locationName":"iops"
         },
         "SnapshotId":{
@@ -31057,7 +31099,7 @@
         },
         "VolumeSize":{
           "shape":"Integer",
-          "documentation":"<p>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.</p> <p>The following are the supported sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code> and <code>gp3</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul>",
+          "documentation":"<p>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.</p> <p>The following are the supported sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>gp3</code>: 1 - 65,536 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul>",
           "locationName":"volumeSize"
         },
         "VolumeType":{
@@ -31072,7 +31114,7 @@
         },
         "Throughput":{
           "shape":"Integer",
-          "documentation":"<p>The throughput that the volume supports, in MiB/s.</p> <p>This parameter is valid only for <code>gp3</code> volumes.</p> <p>Valid Range: Minimum value of 125. Maximum value of 1000.</p>",
+          "documentation":"<p>The throughput that the volume supports, in MiB/s.</p> <p>This parameter is valid only for <code>gp3</code> volumes.</p> <p>Valid Range: Minimum value of 125. Maximum value of 2,000.</p>",
           "locationName":"throughput"
         },
         "OutpostArn":{
@@ -33900,11 +33942,11 @@
         },
         "Iops":{
           "shape":"Integer",
-          "documentation":"<p>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 16,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>This parameter is required for <code>io1</code> and <code>io2</code> volumes. The default for <code>gp3</code> volumes is 3,000 IOPS.</p>"
+          "documentation":"<p>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 80,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>This parameter is required for <code>io1</code> and <code>io2</code> volumes. The default for <code>gp3</code> volumes is 3,000 IOPS.</p>"
         },
         "Throughput":{
           "shape":"Integer",
-          "documentation":"<p>The throughput that the volume supports, in MiB/s.</p> <p>This parameter is valid only for <code>gp3</code> volumes.</p> <p>Valid Range: Minimum value of 125. Maximum value of 1000.</p>"
+          "documentation":"<p>The throughput that the volume supports, in MiB/s.</p> <p>This parameter is valid only for <code>gp3</code> volumes.</p> <p>Valid Range: Minimum value of 125. Maximum value of 2,000.</p>"
         },
         "KmsKeyId":{
           "shape":"KmsKeyId",
@@ -33916,7 +33958,7 @@
         },
         "VolumeSize":{
           "shape":"Integer",
-          "documentation":"<p>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.</p> <p>The following are the supported sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code> and <code>gp3</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul>"
+          "documentation":"<p>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.</p> <p>The following are the supported sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>gp3</code>: 1 - 65,536 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul>"
         },
         "VolumeType":{
           "shape":"VolumeType",
@@ -37895,11 +37937,31 @@
       "members":{
         "ImageProviders":{
           "shape":"ImageProviderList",
-          "documentation":"<p>A list of AMI providers whose AMIs are discoverable and useable in the account. Up to a total of 200 values can be specified.</p> <p>Possible values:</p> <p> <code>amazon</code>: Allow AMIs created by Amazon Web Services.</p> <p> <code>aws-marketplace</code>: Allow AMIs created by verified providers in the Amazon Web Services Marketplace.</p> <p> <code>aws-backup-vault</code>: Allow AMIs created by Amazon Web Services Backup. </p> <p>12-digit account ID: Allow AMIs created by this account. One or more account IDs can be specified.</p> <p> <code>none</code>: Allow AMIs created by your own account only.</p>",
+          "documentation":"<p>The image providers whose images are allowed.</p> <p>Possible values:</p> <ul> <li> <p> <code>amazon</code>: Allow AMIs created by Amazon or verified providers.</p> </li> <li> <p> <code>aws-marketplace</code>: Allow AMIs created by verified providers in the Amazon Web Services Marketplace.</p> </li> <li> <p> <code>aws-backup-vault</code>: Allow AMIs created by Amazon Web Services Backup. </p> </li> <li> <p>12-digit account ID: Allow AMIs created by this account. One or more account IDs can be specified.</p> </li> <li> <p> <code>none</code>: Allow AMIs created by your own account only.</p> </li> </ul> <p>Maximum: 200 values</p>",
           "locationName":"imageProviderSet"
+        },
+        "MarketplaceProductCodes":{
+          "shape":"MarketplaceProductCodeList",
+          "documentation":"<p>The Amazon Web Services Marketplace product codes for allowed images.</p> <p>Length: 1-25 characters</p> <p>Valid characters: Letters (<code>A–Z, a–z</code>) and numbers (<code>0–9</code>)</p> <p>Maximum: 50 values</p>",
+          "locationName":"marketplaceProductCodeSet"
+        },
+        "ImageNames":{
+          "shape":"ImageNameList",
+          "documentation":"<p>The names of allowed images. Names can include wildcards (<code>?</code> and <code>*</code>).</p> <p>Length: 1–128 characters. With <code>?</code>, the minimum is 3 characters.</p> <p>Valid characters:</p> <ul> <li> <p>Letters: <code>A–Z, a–z</code> </p> </li> <li> <p>Numbers: <code>0–9</code> </p> </li> <li> <p>Special characters: <code>( ) [ ] . / - ' @ _ * ?</code> </p> </li> <li> <p>Spaces</p> </li> </ul> <p>Maximum: 50 values</p>",
+          "locationName":"imageNameSet"
+        },
+        "DeprecationTimeCondition":{
+          "shape":"DeprecationTimeCondition",
+          "documentation":"<p>The maximum period since deprecation for allowed images.</p>",
+          "locationName":"deprecationTimeCondition"
+        },
+        "CreationDateCondition":{
+          "shape":"CreationDateCondition",
+          "documentation":"<p>The maximum age for allowed images.</p>",
+          "locationName":"creationDateCondition"
         }
       },
-      "documentation":"<p>The list of criteria that are evaluated to determine whch AMIs are discoverable and usable in the account in the specified Amazon Web Services Region. Currently, the only criteria that can be specified are AMI providers. </p> <p>Up to 10 <code>imageCriteria</code> objects can be specified, and up to a total of 200 values for all <code>imageProviders</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-allowed-amis.html#allowed-amis-json-configuration\">JSON configuration for the Allowed AMIs criteria</a> in the <i>Amazon EC2 User Guide</i>.</p>"
+      "documentation":"<p>The criteria that are evaluated to determine which AMIs are discoverable and usable in your account for the specified Amazon Web Services Region.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-allowed-amis.html#how-allowed-amis-works\">How Allowed AMIs works</a> in the <i>Amazon EC2 User Guide</i>.</p>"
     },
     "ImageCriterionList":{
       "type":"list",
@@ -37913,11 +37975,29 @@
       "members":{
         "ImageProviders":{
           "shape":"ImageProviderRequestList",
-          "documentation":"<p>A list of image providers whose AMIs are discoverable and useable in the account. Up to a total of 200 values can be specified.</p> <p>Possible values:</p> <p> <code>amazon</code>: Allow AMIs created by Amazon Web Services.</p> <p> <code>aws-marketplace</code>: Allow AMIs created by verified providers in the Amazon Web Services Marketplace.</p> <p> <code>aws-backup-vault</code>: Allow AMIs created by Amazon Web Services Backup. </p> <p>12-digit account ID: Allow AMIs created by this account. One or more account IDs can be specified.</p> <p> <code>none</code>: Allow AMIs created by your own account only. When <code>none</code> is specified, no other values can be specified.</p>",
+          "documentation":"<p>The image providers whose images are allowed.</p> <p>Possible values:</p> <ul> <li> <p> <code>amazon</code>: Allow AMIs created by Amazon or verified providers.</p> </li> <li> <p> <code>aws-marketplace</code>: Allow AMIs created by verified providers in the Amazon Web Services Marketplace.</p> </li> <li> <p> <code>aws-backup-vault</code>: Allow AMIs created by Amazon Web Services Backup. </p> </li> <li> <p>12-digit account ID: Allow AMIs created by the specified accounts. One or more account IDs can be specified.</p> </li> <li> <p> <code>none</code>: Allow AMIs created by your own account only. When <code>none</code> is specified, no other values can be specified.</p> </li> </ul> <p>Maximum: 200 values</p>",
           "locationName":"ImageProvider"
+        },
+        "MarketplaceProductCodes":{
+          "shape":"MarketplaceProductCodeRequestList",
+          "documentation":"<p>The Amazon Web Services Marketplace product codes for allowed images.</p> <p>Length: 1-25 characters</p> <p>Valid characters: Letters (<code>A–Z, a–z</code>) and numbers (<code>0–9</code>)</p> <p>Maximum: 50 values</p>",
+          "locationName":"MarketplaceProductCode"
+        },
+        "ImageNames":{
+          "shape":"ImageNameRequestList",
+          "documentation":"<p>The names of allowed images. Names can include wildcards (<code>?</code> and <code>*</code>).</p> <p>Length: 1–128 characters. With <code>?</code>, the minimum is 3 characters.</p> <p>Valid characters:</p> <ul> <li> <p>Letters: <code>A–Z, a–z</code> </p> </li> <li> <p>Numbers: <code>0–9</code> </p> </li> <li> <p>Special characters: <code>( ) [ ] . / - ' @ _ * ?</code> </p> </li> <li> <p>Spaces</p> </li> </ul> <p>Maximum: 50 values</p>",
+          "locationName":"ImageName"
+        },
+        "DeprecationTimeCondition":{
+          "shape":"DeprecationTimeConditionRequest",
+          "documentation":"<p>The maximum period since deprecation for allowed images.</p>"
+        },
+        "CreationDateCondition":{
+          "shape":"CreationDateConditionRequest",
+          "documentation":"<p>The maximum age for allowed images.</p>"
         }
       },
-      "documentation":"<p>The list of criteria that are evaluated to determine whch AMIs are discoverable and usable in the account in the specified Amazon Web Services Region. Currently, the only criteria that can be specified are AMI providers. </p> <p>Up to 10 <code>imageCriteria</code> objects can be specified, and up to a total of 200 values for all <code>imageProviders</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-allowed-amis.html#allowed-amis-json-configuration\">JSON configuration for the Allowed AMIs criteria</a> in the <i>Amazon EC2 User Guide</i>.</p>"
+      "documentation":"<p>The criteria that are evaluated to determine which AMIs are discoverable and usable in your account for the specified Amazon Web Services Region.</p> <p>The <code>ImageCriteria</code> can include up to:</p> <ul> <li> <p>10 <code>ImageCriterion</code> </p> </li> </ul> <p>Each <code>ImageCriterion</code> can include up to:</p> <ul> <li> <p>200 values for <code>ImageProviders</code> </p> </li> <li> <p>50 values for <code>ImageNames</code> </p> </li> <li> <p>50 values for <code>MarketplaceProductCodes</code> </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-allowed-amis.html#how-allowed-amis-works\">How Allowed AMIs works</a> in the <i>Amazon EC2 User Guide</i>.</p>"
     },
     "ImageCriterionRequestList":{
       "type":"list",
@@ -38036,6 +38116,22 @@
       },
       "documentation":"<p>Information about the AMI.</p>"
     },
+    "ImageName":{"type":"string"},
+    "ImageNameList":{
+      "type":"list",
+      "member":{
+        "shape":"ImageName",
+        "locationName":"item"
+      }
+    },
+    "ImageNameRequest":{"type":"string"},
+    "ImageNameRequestList":{
+      "type":"list",
+      "member":{
+        "shape":"ImageNameRequest",
+        "locationName":"item"
+      }
+    },
     "ImageProvider":{"type":"string"},
     "ImageProviderList":{
       "type":"list",
@@ -42529,7 +42625,21 @@
         "i8ge.24xlarge",
         "i8ge.48xlarge",
         "i8ge.metal-24xl",
-        "i8ge.metal-48xl"
+        "i8ge.metal-48xl",
+        "mac-m4.metal",
+        "mac-m4pro.metal",
+        "r8gn.medium",
+        "r8gn.large",
+        "r8gn.xlarge",
+        "r8gn.2xlarge",
+        "r8gn.4xlarge",
+        "r8gn.8xlarge",
+        "r8gn.12xlarge",
+        "r8gn.16xlarge",
+        "r8gn.24xlarge",
+        "r8gn.48xlarge",
+        "r8gn.metal-24xl",
+        "r8gn.metal-48xl"
       ]
     },
     "InstanceTypeHypervisor":{
@@ -45313,7 +45423,7 @@
         },
         "Iops":{
           "shape":"Integer",
-          "documentation":"<p>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 16,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>This parameter is supported for <code>io1</code>, <code>io2</code>, and <code>gp3</code> volumes only.</p>"
+          "documentation":"<p>The number of I/O operations per second (IOPS). For <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 80,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>This parameter is supported for <code>io1</code>, <code>io2</code>, and <code>gp3</code> volumes only.</p>"
         },
         "KmsKeyId":{
           "shape":"KmsKeyId",
@@ -45325,7 +45435,7 @@
         },
         "VolumeSize":{
           "shape":"Integer",
-          "documentation":"<p>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. The following are the supported volumes sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code> and <code>gp3</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul>"
+          "documentation":"<p>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. The following are the supported volumes sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>gp3</code>: 1 - 65,536 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul>"
         },
         "VolumeType":{
           "shape":"VolumeType",
@@ -45333,7 +45443,7 @@
         },
         "Throughput":{
           "shape":"Integer",
-          "documentation":"<p>The throughput to provision for a <code>gp3</code> volume, with a maximum of 1,000 MiB/s.</p> <p>Valid Range: Minimum value of 125. Maximum value of 1000.</p>"
+          "documentation":"<p>The throughput to provision for a <code>gp3</code> volume, with a maximum of 2,000 MiB/s.</p> <p>Valid Range: Minimum value of 125. Maximum value of 2,000.</p>"
         },
         "VolumeInitializationRate":{
           "shape":"Integer",
@@ -45352,7 +45462,7 @@
         },
         "Count":{
           "shape":"LaunchTemplateElasticInferenceAcceleratorCount",
-          "documentation":"<p> The number of elastic inference accelerators to attach to the instance. </p> <p>Default: 1</p>"
+          "documentation":"<p>The number of elastic inference accelerators to attach to the instance. </p>"
         }
       },
       "documentation":"<note> <p>Amazon Elastic Inference is no longer available.</p> </note> <p> Describes an elastic inference accelerator. </p>"
@@ -45373,12 +45483,12 @@
       "members":{
         "Type":{
           "shape":"String",
-          "documentation":"<p> The type of elastic inference accelerator. The possible values are eia1.medium, eia1.large, and eia1.xlarge. </p>",
+          "documentation":"<p>The type of elastic inference accelerator. The possible values are eia1.medium, eia1.large, and eia1.xlarge. </p>",
           "locationName":"type"
         },
         "Count":{
           "shape":"Integer",
-          "documentation":"<p> The number of elastic inference accelerators to attach to the instance. </p> <p>Default: 1</p>",
+          "documentation":"<p>The number of elastic inference accelerators to attach to the instance. </p>",
           "locationName":"count"
         }
       },
@@ -45589,7 +45699,7 @@
         },
         "HttpPutResponseHopLimit":{
           "shape":"Integer",
-          "documentation":"<p>The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.</p> <p>Default: 1</p> <p>Possible values: Integers from 1 to 64</p>",
+          "documentation":"<p>The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.</p> <p>Possible values: Integers from 1 to 64</p>",
           "locationName":"httpPutResponseHopLimit"
         },
         "HttpEndpoint":{
@@ -47556,6 +47666,22 @@
         "capacity-block"
       ]
     },
+    "MarketplaceProductCode":{"type":"string"},
+    "MarketplaceProductCodeList":{
+      "type":"list",
+      "member":{
+        "shape":"MarketplaceProductCode",
+        "locationName":"item"
+      }
+    },
+    "MarketplaceProductCodeRequest":{"type":"string"},
+    "MarketplaceProductCodeRequestList":{
+      "type":"list",
+      "member":{
+        "shape":"MarketplaceProductCodeRequest",
+        "locationName":"item"
+      }
+    },
     "MaxIpv4AddrPerInterface":{"type":"integer"},
     "MaxIpv6AddrPerInterface":{"type":"integer"},
     "MaxNetworkInterfaces":{"type":"integer"},
@@ -47566,6 +47692,16 @@
       "min":0
     },
     "MaximumBandwidthInMbps":{"type":"integer"},
+    "MaximumDaysSinceCreatedValue":{
+      "type":"integer",
+      "max":2147483647,
+      "min":0
+    },
+    "MaximumDaysSinceDeprecatedValue":{
+      "type":"integer",
+      "max":2147483647,
+      "min":0
+    },
     "MaximumEbsAttachments":{"type":"integer"},
     "MaximumEfaInterfaces":{"type":"integer"},
     "MaximumEnaQueueCount":{"type":"integer"},
@@ -50440,7 +50576,7 @@
         },
         "Size":{
           "shape":"Integer",
-          "documentation":"<p>The target size of the volume, in GiB. The target volume size must be greater than or equal to the existing size of the volume.</p> <p>The following are the supported volumes sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code> and <code>gp3</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul> <p>Default: The existing size is retained.</p>"
+          "documentation":"<p>The target size of the volume, in GiB. The target volume size must be greater than or equal to the existing size of the volume.</p> <p>The following are the supported volumes sizes for each volume type:</p> <ul> <li> <p> <code>gp2</code>: 1 - 16,384 GiB</p> </li> <li> <p> <code>gp3</code>: 1 - 65,536 GiB</p> </li> <li> <p> <code>io1</code>: 4 - 16,384 GiB</p> </li> <li> <p> <code>io2</code>: 4 - 65,536 GiB</p> </li> <li> <p> <code>st1</code> and <code>sc1</code>: 125 - 16,384 GiB</p> </li> <li> <p> <code>standard</code>: 1 - 1024 GiB</p> </li> </ul> <p>Default: The existing size is retained.</p>"
         },
         "VolumeType":{
           "shape":"VolumeType",
@@ -50448,11 +50584,11 @@
         },
         "Iops":{
           "shape":"Integer",
-          "documentation":"<p>The target IOPS rate of the volume. This parameter is valid only for <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 16,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>Default: The existing value is retained if you keep the same volume type. If you change the volume type to <code>io1</code>, <code>io2</code>, or <code>gp3</code>, the default is 3,000.</p>"
+          "documentation":"<p>The target IOPS rate of the volume. This parameter is valid only for <code>gp3</code>, <code>io1</code>, and <code>io2</code> volumes.</p> <p>The following are the supported values for each volume type:</p> <ul> <li> <p> <code>gp3</code>: 3,000 - 80,000 IOPS</p> </li> <li> <p> <code>io1</code>: 100 - 64,000 IOPS</p> </li> <li> <p> <code>io2</code>: 100 - 256,000 IOPS</p> </li> </ul> <p>For <code>io2</code> volumes, you can achieve up to 256,000 IOPS on <a href=\"https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html\">instances built on the Nitro System</a>. On other instances, you can achieve performance up to 32,000 IOPS.</p> <p>Default: The existing value is retained if you keep the same volume type. If you change the volume type to <code>io1</code>, <code>io2</code>, or <code>gp3</code>, the default is 3,000.</p>"
         },
         "Throughput":{
           "shape":"Integer",
-          "documentation":"<p>The target throughput of the volume, in MiB/s. This parameter is valid only for <code>gp3</code> volumes. The maximum value is 1,000.</p> <p>Default: The existing value is retained if the source and target volume type is <code>gp3</code>. Otherwise, the default value is 125.</p> <p>Valid Range: Minimum value of 125. Maximum value of 1000.</p>"
+          "documentation":"<p>The target throughput of the volume, in MiB/s. This parameter is valid only for <code>gp3</code> volumes. The maximum value is 2,000.</p> <p>Default: The existing value is retained if the source and target volume type is <code>gp3</code>. Otherwise, the default value is 125.</p> <p>Valid Range: Minimum value of 125. Maximum value of 2,000.</p>"
         },
         "MultiAttachEnabled":{
           "shape":"Boolean",
@@ -58507,7 +58643,7 @@
         },
         "Origin":{
           "shape":"RouteOrigin",
-          "documentation":"<p>Describes how the route was created.</p> <ul> <li> <p> <code>CreateRouteTable</code> - The route was automatically created when the route table was created.</p> </li> <li> <p> <code>CreateRoute</code> - The route was manually added to the route table.</p> </li> <li> <p> <code>EnableVgwRoutePropagation</code> - The route was propagated by route propagation.</p> </li> </ul>",
+          "documentation":"<p>Describes how the route was created.</p> <ul> <li> <p> <code>CreateRouteTable</code> - The route was automatically created when the route table was created.</p> </li> <li> <p> <code>CreateRoute</code> - The route was manually added to the route table.</p> </li> <li> <p> <code>EnableVgwRoutePropagation</code> - The route was propagated by route propagation.</p> </li> <li> <p> <code>Advertisement</code> - The route was created dynamically by Amazon VPC Route Server.</p> </li> </ul>",
           "locationName":"origin"
         },
         "State":{
diff --git a/services/ec2instanceconnect/pom.xml b/services/ec2instanceconnect/pom.xml
index ac5f9a04be7d..de7c82d7e593 100644
--- a/services/ec2instanceconnect/pom.xml
+++ b/services/ec2instanceconnect/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ec2instanceconnect</artifactId>
     <name>AWS Java SDK :: Services :: EC2 Instance Connect</name>
diff --git a/services/ecr/pom.xml b/services/ecr/pom.xml
index 0f7eaa81a261..46c5a0a78383 100644
--- a/services/ecr/pom.xml
+++ b/services/ecr/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ecr</artifactId>
     <name>AWS Java SDK :: Services :: Amazon EC2 Container Registry</name>
diff --git a/services/ecrpublic/pom.xml b/services/ecrpublic/pom.xml
index 70584719026f..4bad2022b1d4 100644
--- a/services/ecrpublic/pom.xml
+++ b/services/ecrpublic/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ecrpublic</artifactId>
     <name>AWS Java SDK :: Services :: ECR PUBLIC</name>
diff --git a/services/ecs/pom.xml b/services/ecs/pom.xml
index 2738de7370d2..eba4516f580e 100644
--- a/services/ecs/pom.xml
+++ b/services/ecs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ecs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon EC2 Container Service</name>
diff --git a/services/ecs/src/main/resources/codegen-resources/service-2.json b/services/ecs/src/main/resources/codegen-resources/service-2.json
index 3fbfc76759ca..08191546dd9b 100644
--- a/services/ecs/src/main/resources/codegen-resources/service-2.json
+++ b/services/ecs/src/main/resources/codegen-resources/service-2.json
@@ -1686,7 +1686,7 @@
         },
         "portMappings":{
           "shape":"PortMappingList",
-          "documentation":"<p>The list of port mappings for the container. Port mappings allow containers to access ports on the host container instance to send or receive traffic.</p> <p>For task definitions that use the <code>awsvpc</code> network mode, only specify the <code>containerPort</code>. The <code>hostPort</code> can be left blank or it must be the same value as the <code>containerPort</code>.</p> <p>Port mappings on Windows use the <code>NetNAT</code> gateway address rather than <code>localhost</code>. There's no loopback for port mappings on Windows, so you can't access a container's mapped port from the host itself. </p> <p>This parameter maps to <code>PortBindings</code> in the the docker container create command and the <code>--publish</code> option to docker run. If the network mode of a task definition is set to <code>none</code>, then you can't specify port mappings. If the network mode of a task definition is set to <code>host</code>, then host ports must either be undefined or they must match the container port in the port mapping.</p> <note> <p>After a task reaches the <code>RUNNING</code> status, manual and automatic host and container port assignments are visible in the <b>Network Bindings</b> section of a container description for a selected task in the Amazon ECS console. The assignments are also visible in the <code>networkBindings</code> section <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_DescribeTasks.html\">DescribeTasks</a> responses.</p> </note>"
+          "documentation":"<p>The list of port mappings for the container. Port mappings allow containers to access ports on the host container instance to send or receive traffic.</p> <p>For task definitions that use the <code>awsvpc</code> network mode, only specify the <code>containerPort</code>. The <code>hostPort</code> can be left blank or it must be the same value as the <code>containerPort</code>.</p> <p>Port mappings on Windows use the <code>NetNAT</code> gateway address rather than <code>localhost</code>. There's no loopback for port mappings on Windows, so you can't access a container's mapped port from the host itself. </p> <p>This parameter maps to <code>PortBindings</code> in the docker container create command and the <code>--publish</code> option to docker run. If the network mode of a task definition is set to <code>none</code>, then you can't specify port mappings. If the network mode of a task definition is set to <code>host</code>, then host ports must either be undefined or they must match the container port in the port mapping.</p> <note> <p>After a task reaches the <code>RUNNING</code> status, manual and automatic host and container port assignments are visible in the <b>Network Bindings</b> section of a container description for a selected task in the Amazon ECS console. The assignments are also visible in the <code>networkBindings</code> section <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_DescribeTasks.html\">DescribeTasks</a> responses.</p> </note>"
         },
         "essential":{
           "shape":"BoxedBoolean",
@@ -2185,7 +2185,7 @@
         },
         "availabilityZoneRebalancing":{
           "shape":"AvailabilityZoneRebalancing",
-          "documentation":"<p>Indicates whether to use Availability Zone rebalancing for the service.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-rebalancing.html\">Balancing an Amazon ECS service across Availability Zones</a> in the <i> <i>Amazon Elastic Container Service Developer Guide</i> </i>.</p> <p>The default behavior of <code>AvailabilityZoneRebalancing</code> differs between create and update requests:</p> <ul> <li> <p>For create service requests, when when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults the value to to <code>ENABLED</code>.</p> </li> <li> <p>For update service requests, when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults to the existing service’s <code>AvailabilityZoneRebalancing</code> value. If the service never had an <code>AvailabilityZoneRebalancing</code> value set, Amazon ECS treats this as <code>DISABLED</code>.</p> </li> </ul>"
+          "documentation":"<p>Indicates whether to use Availability Zone rebalancing for the service.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-rebalancing.html\">Balancing an Amazon ECS service across Availability Zones</a> in the <i> <i>Amazon Elastic Container Service Developer Guide</i> </i>.</p> <p>The default behavior of <code>AvailabilityZoneRebalancing</code> differs between create and update requests:</p> <ul> <li> <p>For create service requests, when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults the value to <code>ENABLED</code>.</p> </li> <li> <p>For update service requests, when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults to the existing service’s <code>AvailabilityZoneRebalancing</code> value. If the service never had an <code>AvailabilityZoneRebalancing</code> value set, Amazon ECS treats this as <code>DISABLED</code>.</p> </li> </ul>"
         },
         "loadBalancers":{
           "shape":"LoadBalancers",
@@ -2748,6 +2748,10 @@
         "lifecycleStages":{
           "shape":"DeploymentLifecycleHookStageList",
           "documentation":"<p>The lifecycle stages at which to run the hook. Choose from these valid values:</p> <ul> <li> <p>RECONCILE_SERVICE</p> <p>The reconciliation stage that only happens when you start a new service deployment with more than 1 service revision in an ACTIVE state.</p> <p>You can use a lifecycle hook for this stage.</p> </li> <li> <p>PRE_SCALE_UP</p> <p>The green service revision has not started. The blue service revision is handling 100% of the production traffic. There is no test traffic.</p> <p>You can use a lifecycle hook for this stage.</p> </li> <li> <p>POST_SCALE_UP</p> <p>The green service revision has started. The blue service revision is handling 100% of the production traffic. There is no test traffic.</p> <p>You can use a lifecycle hook for this stage.</p> </li> <li> <p>TEST_TRAFFIC_SHIFT</p> <p>The blue and green service revisions are running. The blue service revision handles 100% of the production traffic. The green service revision is migrating from 0% to 100% of test traffic.</p> <p>You can use a lifecycle hook for this stage.</p> </li> <li> <p>POST_TEST_TRAFFIC_SHIFT</p> <p>The test traffic shift is complete. The green service revision handles 100% of the test traffic.</p> <p>You can use a lifecycle hook for this stage.</p> </li> <li> <p>PRODUCTION_TRAFFIC_SHIFT</p> <p>Production traffic is shifting to the green service revision. The green service revision is migrating from 0% to 100% of production traffic.</p> <p>You can use a lifecycle hook for this stage.</p> </li> <li> <p>POST_PRODUCTION_TRAFFIC_SHIFT</p> <p>The production traffic shift is complete.</p> <p>You can use a lifecycle hook for this stage.</p> </li> </ul> <p>You must provide this parameter when configuring a deployment lifecycle hook.</p>"
+        },
+        "hookDetails":{
+          "shape":"HookDetails",
+          "documentation":"<p>Use this field to specify custom parameters that Amazon ECS will pass to your hook target invocations (such as a Lambda function).</p>"
         }
       },
       "documentation":"<p>A deployment lifecycle hook runs custom logic at specific stages of the deployment process. Currently, you can use Lambda functions as hook targets.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-lifecycle-hooks.html\">Lifecycle hooks for Amazon ECS service deployments</a> in the <i> Amazon Elastic Container Service Developer Guide</i>.</p>"
@@ -3609,6 +3613,11 @@
         "UNKNOWN"
       ]
     },
+    "HookDetails":{
+      "type":"structure",
+      "members":{},
+      "document":true
+    },
     "HostEntry":{
       "type":"structure",
       "required":[
@@ -5205,7 +5214,7 @@
         },
         "volumeConfigurations":{
           "shape":"TaskVolumeConfigurations",
-          "documentation":"<p>The details of the volume that was <code>configuredAtLaunch</code>. You can configure the size, volumeType, IOPS, throughput, snapshot and encryption in in <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_TaskManagedEBSVolumeConfiguration.html\">TaskManagedEBSVolumeConfiguration</a>. The <code>name</code> of the volume must match the <code>name</code> from the task definition.</p>"
+          "documentation":"<p>The details of the volume that was <code>configuredAtLaunch</code>. You can configure the size, volumeType, IOPS, throughput, snapshot and encryption in <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_TaskManagedEBSVolumeConfiguration.html\">TaskManagedEBSVolumeConfiguration</a>. The <code>name</code> of the volume must match the <code>name</code> from the task definition.</p>"
         }
       }
     },
@@ -5435,7 +5444,7 @@
         },
         "availabilityZoneRebalancing":{
           "shape":"AvailabilityZoneRebalancing",
-          "documentation":"<p>Indicates whether to use Availability Zone rebalancing for the service.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-rebalancing.html\">Balancing an Amazon ECS service across Availability Zones</a> in the <i> <i>Amazon Elastic Container Service Developer Guide</i> </i>.</p> <p>The default behavior of <code>AvailabilityZoneRebalancing</code> differs between create and update requests:</p> <ul> <li> <p>For create service requests, when when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults the value to to <code>ENABLED</code>.</p> </li> <li> <p>For update service requests, when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults to the existing service’s <code>AvailabilityZoneRebalancing</code> value. If the service never had an <code>AvailabilityZoneRebalancing</code> value set, Amazon ECS treats this as <code>DISABLED</code>.</p> </li> </ul>"
+          "documentation":"<p>Indicates whether to use Availability Zone rebalancing for the service.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-rebalancing.html\">Balancing an Amazon ECS service across Availability Zones</a> in the <i> <i>Amazon Elastic Container Service Developer Guide</i> </i>.</p> <p>The default behavior of <code>AvailabilityZoneRebalancing</code> differs between create and update requests:</p> <ul> <li> <p>For create service requests, when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults the value to <code>ENABLED</code>.</p> </li> <li> <p>For update service requests, when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults to the existing service’s <code>AvailabilityZoneRebalancing</code> value. If the service never had an <code>AvailabilityZoneRebalancing</code> value set, Amazon ECS treats this as <code>DISABLED</code>.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Details on a service within a cluster.</p>"
@@ -7437,7 +7446,7 @@
         },
         "availabilityZoneRebalancing":{
           "shape":"AvailabilityZoneRebalancing",
-          "documentation":"<p>Indicates whether to use Availability Zone rebalancing for the service.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-rebalancing.html\">Balancing an Amazon ECS service across Availability Zones</a> in the <i> <i>Amazon Elastic Container Service Developer Guide</i> </i>.</p> <p>The default behavior of <code>AvailabilityZoneRebalancing</code> differs between create and update requests:</p> <ul> <li> <p>For create service requests, when when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults the value to to <code>ENABLED</code>.</p> </li> <li> <p>For update service requests, when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults to the existing service’s <code>AvailabilityZoneRebalancing</code> value. If the service never had an <code>AvailabilityZoneRebalancing</code> value set, Amazon ECS treats this as <code>DISABLED</code>.</p> </li> </ul> <p>This parameter doesn't trigger a new service deployment.</p>"
+          "documentation":"<p>Indicates whether to use Availability Zone rebalancing for the service.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-rebalancing.html\">Balancing an Amazon ECS service across Availability Zones</a> in the <i> <i>Amazon Elastic Container Service Developer Guide</i> </i>.</p> <p>The default behavior of <code>AvailabilityZoneRebalancing</code> differs between create and update requests:</p> <ul> <li> <p>For create service requests, when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults the value to <code>ENABLED</code>.</p> </li> <li> <p>For update service requests, when no value is specified for <code>AvailabilityZoneRebalancing</code>, Amazon ECS defaults to the existing service’s <code>AvailabilityZoneRebalancing</code> value. If the service never had an <code>AvailabilityZoneRebalancing</code> value set, Amazon ECS treats this as <code>DISABLED</code>.</p> </li> </ul> <p>This parameter doesn't trigger a new service deployment.</p>"
         },
         "networkConfiguration":{
           "shape":"NetworkConfiguration",
diff --git a/services/efs/pom.xml b/services/efs/pom.xml
index fa93703aa1b2..33635531be76 100644
--- a/services/efs/pom.xml
+++ b/services/efs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>efs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Elastic File System</name>
diff --git a/services/eks/pom.xml b/services/eks/pom.xml
index 049a170645c9..cacc234e4317 100644
--- a/services/eks/pom.xml
+++ b/services/eks/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>eks</artifactId>
     <name>AWS Java SDK :: Services :: EKS</name>
diff --git a/services/eks/src/main/resources/codegen-resources/service-2.json b/services/eks/src/main/resources/codegen-resources/service-2.json
index 6c982deee0c2..57ab7d587b4d 100644
--- a/services/eks/src/main/resources/codegen-resources/service-2.json
+++ b/services/eks/src/main/resources/codegen-resources/service-2.json
@@ -4688,10 +4688,56 @@
         "enabled":{
           "shape":"BoxedBoolean",
           "documentation":"<p>Specifies whether to enable node auto repair for the node group. Node auto repair is disabled by default.</p>"
+        },
+        "maxUnhealthyNodeThresholdCount":{
+          "shape":"NonZeroInteger",
+          "documentation":"<p>Specify a count threshold of unhealthy nodes, above which node auto repair actions will stop. When using this, you cannot also set <code>maxUnhealthyNodeThresholdPercentage</code> at the same time.</p>"
+        },
+        "maxUnhealthyNodeThresholdPercentage":{
+          "shape":"PercentCapacity",
+          "documentation":"<p>Specify a percentage threshold of unhealthy nodes, above which node auto repair actions will stop. When using this, you cannot also set <code>maxUnhealthyNodeThresholdCount</code> at the same time.</p>"
+        },
+        "maxParallelNodesRepairedCount":{
+          "shape":"NonZeroInteger",
+          "documentation":"<p>Specify the maximum number of nodes that can be repaired concurrently or in parallel, expressed as a count of unhealthy nodes. This gives you finer-grained control over the pace of node replacements. When using this, you cannot also set <code>maxParallelNodesRepairedPercentage</code> at the same time.</p>"
+        },
+        "maxParallelNodesRepairedPercentage":{
+          "shape":"PercentCapacity",
+          "documentation":"<p>Specify the maximum number of nodes that can be repaired concurrently or in parallel, expressed as a percentage of unhealthy nodes. This gives you finer-grained control over the pace of node replacements. When using this, you cannot also set <code>maxParallelNodesRepairedCount</code> at the same time.</p>"
+        },
+        "nodeRepairConfigOverrides":{
+          "shape":"NodeRepairConfigOverridesList",
+          "documentation":"<p>Specify granular overrides for specific repair actions. These overrides control the repair action and the repair delay time before a node is considered eligible for repair. If you use this, you must specify all the values.</p>"
         }
       },
       "documentation":"<p>The node auto repair configuration for the node group.</p>"
     },
+    "NodeRepairConfigOverrides":{
+      "type":"structure",
+      "members":{
+        "nodeMonitoringCondition":{
+          "shape":"String",
+          "documentation":"<p>Specify an unhealthy condition reported by the node monitoring agent that this override would apply to.</p>"
+        },
+        "nodeUnhealthyReason":{
+          "shape":"String",
+          "documentation":"<p>Specify a reason reported by the node monitoring agent that this override would apply to.</p>"
+        },
+        "minRepairWaitTimeMins":{
+          "shape":"NonZeroInteger",
+          "documentation":"<p>Specify the minimum time in minutes to wait before attempting to repair a node with this specific <code>nodeMonitoringCondition</code> and <code>nodeUnhealthyReason</code>.</p>"
+        },
+        "repairAction":{
+          "shape":"RepairAction",
+          "documentation":"<p>Specify the repair action to take for nodes when all of the specified conditions are met.</p>"
+        }
+      },
+      "documentation":"<p>Specify granular overrides for specific repair actions. These overrides control the repair action and the repair delay time before a node is considered eligible for repair. If you use this, you must specify all the values.</p>"
+    },
+    "NodeRepairConfigOverridesList":{
+      "type":"list",
+      "member":{"shape":"NodeRepairConfigOverrides"}
+    },
     "Nodegroup":{
       "type":"structure",
       "members":{
@@ -5294,6 +5340,14 @@
       "member":{"shape":"RemotePodNetwork"},
       "max":1
     },
+    "RepairAction":{
+      "type":"string",
+      "enum":[
+        "Replace",
+        "Reboot",
+        "NoAction"
+      ]
+    },
     "ResolveConflicts":{
       "type":"string",
       "enum":[
@@ -6061,7 +6115,8 @@
         "StorageConfig",
         "KubernetesNetworkConfig",
         "RemoteNetworkConfig",
-        "DeletionProtection"
+        "DeletionProtection",
+        "NodeRepairConfig"
       ]
     },
     "UpdateParams":{
diff --git a/services/eksauth/pom.xml b/services/eksauth/pom.xml
index 719c692ca496..169470d6e0a4 100644
--- a/services/eksauth/pom.xml
+++ b/services/eksauth/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>eksauth</artifactId>
     <name>AWS Java SDK :: Services :: EKS Auth</name>
diff --git a/services/elasticache/pom.xml b/services/elasticache/pom.xml
index 7df35f491cd8..5e36beaa6fb1 100644
--- a/services/elasticache/pom.xml
+++ b/services/elasticache/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>elasticache</artifactId>
     <name>AWS Java SDK :: Services :: Amazon ElastiCache</name>
diff --git a/services/elasticbeanstalk/pom.xml b/services/elasticbeanstalk/pom.xml
index fedcea9a57c4..24a553c7dddb 100644
--- a/services/elasticbeanstalk/pom.xml
+++ b/services/elasticbeanstalk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>elasticbeanstalk</artifactId>
     <name>AWS Java SDK :: Services :: AWS Elastic Beanstalk</name>
diff --git a/services/elasticloadbalancing/pom.xml b/services/elasticloadbalancing/pom.xml
index a4fec8c547af..823d75b44286 100644
--- a/services/elasticloadbalancing/pom.xml
+++ b/services/elasticloadbalancing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>elasticloadbalancing</artifactId>
     <name>AWS Java SDK :: Services :: Elastic Load Balancing</name>
diff --git a/services/elasticloadbalancingv2/pom.xml b/services/elasticloadbalancingv2/pom.xml
index 55efd5039482..353325b78607 100644
--- a/services/elasticloadbalancingv2/pom.xml
+++ b/services/elasticloadbalancingv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>elasticloadbalancingv2</artifactId>
     <name>AWS Java SDK :: Services :: Elastic Load Balancing V2</name>
diff --git a/services/elasticsearch/pom.xml b/services/elasticsearch/pom.xml
index 242f596db7a8..bd35ded815b0 100644
--- a/services/elasticsearch/pom.xml
+++ b/services/elasticsearch/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>elasticsearch</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Elasticsearch Service</name>
diff --git a/services/elastictranscoder/pom.xml b/services/elastictranscoder/pom.xml
index 8f196f96b90b..592e69768097 100644
--- a/services/elastictranscoder/pom.xml
+++ b/services/elastictranscoder/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>elastictranscoder</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Elastic Transcoder</name>
diff --git a/services/emr/pom.xml b/services/emr/pom.xml
index 82f6c47d1eea..303ac30e65ad 100644
--- a/services/emr/pom.xml
+++ b/services/emr/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>emr</artifactId>
     <name>AWS Java SDK :: Services :: Amazon EMR</name>
diff --git a/services/emrcontainers/pom.xml b/services/emrcontainers/pom.xml
index aa3ed4ac641b..2ba59695b9a8 100644
--- a/services/emrcontainers/pom.xml
+++ b/services/emrcontainers/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>emrcontainers</artifactId>
     <name>AWS Java SDK :: Services :: EMR Containers</name>
diff --git a/services/emrcontainers/src/main/resources/codegen-resources/service-2.json b/services/emrcontainers/src/main/resources/codegen-resources/service-2.json
index e429fed17b4f..1af2d28c2942 100644
--- a/services/emrcontainers/src/main/resources/codegen-resources/service-2.json
+++ b/services/emrcontainers/src/main/resources/codegen-resources/service-2.json
@@ -702,6 +702,10 @@
           "shape":"ResourceNameString",
           "documentation":"<p>The name of the security configuration.</p>"
         },
+        "containerProvider":{
+          "shape":"ContainerProvider",
+          "documentation":"<p>The container provider associated with the security configuration.</p>"
+        },
         "securityConfigurationData":{
           "shape":"SecurityConfigurationData",
           "documentation":"<p>Security configuration input for the request.</p>"
@@ -1012,6 +1016,10 @@
         "namespace":{
           "shape":"KubernetesNamespace",
           "documentation":"<p>The namespaces of the Amazon EKS cluster.</p>"
+        },
+        "nodeLabel":{
+          "shape":"ResourceNameString",
+          "documentation":"<p>The nodeLabel of the nodes where the resources of this virtual cluster can get scheduled. It requires relevant scaling and policy engine addons.</p>"
         }
       },
       "documentation":"<p>The information about the Amazon EKS cluster.</p>"
diff --git a/services/emrserverless/pom.xml b/services/emrserverless/pom.xml
index b0f49c474e96..7a965e7da491 100644
--- a/services/emrserverless/pom.xml
+++ b/services/emrserverless/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>emrserverless</artifactId>
     <name>AWS Java SDK :: Services :: EMR Serverless</name>
diff --git a/services/entityresolution/pom.xml b/services/entityresolution/pom.xml
index a83166fb79c5..60cb30549838 100644
--- a/services/entityresolution/pom.xml
+++ b/services/entityresolution/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>entityresolution</artifactId>
     <name>AWS Java SDK :: Services :: Entity Resolution</name>
diff --git a/services/entityresolution/src/main/resources/codegen-resources/service-2.json b/services/entityresolution/src/main/resources/codegen-resources/service-2.json
index 4a8c313da884..2f2e463e11cb 100644
--- a/services/entityresolution/src/main/resources/codegen-resources/service-2.json
+++ b/services/entityresolution/src/main/resources/codegen-resources/service-2.json
@@ -68,7 +68,7 @@
         {"shape":"ConflictException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Creates an <code>IdMappingWorkflow</code> object which stores the configuration of the data processing job to be run. Each <code>IdMappingWorkflow</code> must have a unique workflow name. To modify an existing workflow, use the UpdateIdMappingWorkflow API.</p>"
+      "documentation":"<p>Creates an <code>IdMappingWorkflow</code> object which stores the configuration of the data processing job to be run. Each <code>IdMappingWorkflow</code> must have a unique workflow name. To modify an existing workflow, use the UpdateIdMappingWorkflow API.</p> <important> <p>Incremental processing is not supported for ID mapping workflows. </p> </important>"
     },
     "CreateIdNamespace":{
       "name":"CreateIdNamespace",
@@ -106,7 +106,7 @@
         {"shape":"ConflictException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Creates a matching workflow that defines the configuration for a data processing job. The workflow name must be unique. To modify an existing workflow, use <code>UpdateMatchingWorkflow</code>. </p> <important> <p>For workflows where <code>resolutionType</code> is ML_MATCHING, incremental processing is not supported. </p> </important>"
+      "documentation":"<p>Creates a matching workflow that defines the configuration for a data processing job. The workflow name must be unique. To modify an existing workflow, use <code>UpdateMatchingWorkflow</code>. </p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code> or <code>PROVIDER</code>, incremental processing is not supported. </p> </important>"
     },
     "CreateSchemaMapping":{
       "name":"CreateSchemaMapping",
@@ -310,7 +310,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Returns the corresponding Match ID of a customer record if the record has been processed in a rule-based matching workflow or ML matching workflow.</p> <p>You can call this API as a dry run of an incremental load on the rule-based matching workflow.</p>"
+      "documentation":"<p>Returns the corresponding Match ID of a customer record if the record has been processed in a rule-based matching workflow.</p> <p>You can call this API as a dry run of an incremental load on the rule-based matching workflow.</p>"
     },
     "GetMatchingJob":{
       "name":"GetMatchingJob",
@@ -647,7 +647,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Updates an existing <code>IdMappingWorkflow</code>. This method is identical to CreateIdMappingWorkflow, except it uses an HTTP <code>PUT</code> request instead of a <code>POST</code> request, and the <code>IdMappingWorkflow</code> must already exist for the method to succeed.</p>",
+      "documentation":"<p>Updates an existing <code>IdMappingWorkflow</code>. This method is identical to CreateIdMappingWorkflow, except it uses an HTTP <code>PUT</code> request instead of a <code>POST</code> request, and the <code>IdMappingWorkflow</code> must already exist for the method to succeed.</p> <important> <p>Incremental processing is not supported for ID mapping workflows. </p> </important>",
       "idempotent":true
     },
     "UpdateIdNamespace":{
@@ -685,7 +685,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Updates an existing matching workflow. The workflow must already exist for this operation to succeed.</p> <important> <p>For workflows where <code>resolutionType</code> is ML_MATCHING, incremental processing is not supported. </p> </important>",
+      "documentation":"<p>Updates an existing matching workflow. The workflow must already exist for this operation to succeed.</p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code> or <code>PROVIDER</code>, incremental processing is not supported. </p> </important>",
       "idempotent":true
     },
     "UpdateSchemaMapping":{
@@ -871,7 +871,7 @@
       "members":{
         "message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>The request could not be processed because of conflict in the current state of the resource. Example: Workflow already exists, Schema already exists, Workflow is currently running, etc. </p>",
+      "documentation":"<p>The request couldn't be processed because of conflict in the current state of the resource. Example: Workflow already exists, Schema already exists, Workflow is currently running, etc. </p>",
       "error":{
         "httpStatusCode":400,
         "senderFault":true
@@ -906,6 +906,10 @@
           "shape":"IdMappingTechniques",
           "documentation":"<p>An object which defines the ID mapping technique and any additional configurations.</p>"
         },
+        "incrementalRunConfig":{
+          "shape":"IdMappingIncrementalRunConfig",
+          "documentation":"<p> The incremental run configuration for the ID mapping workflow.</p>"
+        },
         "roleArn":{
           "shape":"IdMappingRoleArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role. Entity Resolution assumes this role to create resources on your behalf as part of workflow execution.</p>"
@@ -949,6 +953,10 @@
           "shape":"IdMappingTechniques",
           "documentation":"<p>An object which defines the ID mapping technique and any additional configurations.</p>"
         },
+        "incrementalRunConfig":{
+          "shape":"IdMappingIncrementalRunConfig",
+          "documentation":"<p> The incremental run configuration for the ID mapping workflow.</p>"
+        },
         "roleArn":{
           "shape":"IdMappingRoleArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role. Entity Resolution assumes this role to create resources on your behalf as part of workflow execution.</p>"
@@ -1076,7 +1084,7 @@
         },
         "incrementalRunConfig":{
           "shape":"IncrementalRunConfig",
-          "documentation":"<p>Optional. An object that defines the incremental run type. This object contains only the <code>incrementalRunType</code> field, which appears as \"Automatic\" in the console. </p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code>, incremental processing is not supported. </p> </important>"
+          "documentation":"<p>Optional. An object that defines the incremental run type. This object contains only the <code>incrementalRunType</code> field, which appears as \"Automatic\" in the console. </p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code> or <code>PROVIDER</code>, incremental processing is not supported. </p> </important>"
         },
         "roleArn":{
           "shape":"String",
@@ -1324,14 +1332,14 @@
       "members":{
         "uniqueId":{
           "shape":"HeaderSafeUniqueId",
-          "documentation":"<p>The unique ID that could not be deleted.</p>"
+          "documentation":"<p>The unique ID that couldn't be deleted.</p>"
         },
         "errorType":{
           "shape":"DeleteUniqueIdErrorType",
-          "documentation":"<p> The error type for the batch delete unique ID operation.</p>"
+          "documentation":"<p> The error type for the delete unique ID operation.</p> <p>The <code>SERVICE_ERROR</code> value indicates that an internal service-side problem occurred during the deletion operation.</p> <p>The <code>VALIDATION_ERROR</code> value indicates that the deletion operation couldn't complete because of invalid input parameters or data.</p>"
         }
       },
-      "documentation":"<p>The Delete Unique Id error.</p>"
+      "documentation":"<p>The error information provided when the delete unique ID operation doesn't complete.</p>"
     },
     "DeleteUniqueIdErrorType":{
       "type":"string",
@@ -1438,7 +1446,7 @@
       ],
       "members":{
         "inputSourceARN":{
-          "shape":"FailedRecordInputSourceARNString",
+          "shape":"InputSourceARN",
           "documentation":"<p> The input source ARN of the record that didn't generate a Match ID.</p>"
         },
         "uniqueId":{
@@ -1452,10 +1460,6 @@
       },
       "documentation":"<p>The record that didn't generate a Match ID.</p>"
     },
-    "FailedRecordInputSourceARNString":{
-      "type":"string",
-      "pattern":"arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(idnamespace/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(matchingworkflow/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):glue:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(table/[a-zA-Z_0-9-]{1,255}/[a-zA-Z_0-9-]{1,255})"
-    },
     "FailedRecordsList":{
       "type":"list",
       "member":{"shape":"FailedRecord"}
@@ -1559,6 +1563,10 @@
         "outputSourceConfig":{
           "shape":"IdMappingJobOutputSourceConfig",
           "documentation":"<p>A list of <code>OutputSource</code> objects.</p>"
+        },
+        "jobType":{
+          "shape":"JobType",
+          "documentation":"<p> The job type of the ID mapping job.</p> <p>A value of <code>INCREMENTAL</code> indicates that only new or changed data was processed since the last job run. This is the default job type if the workflow was created with an <code>incrementalRunConfig</code>.</p> <p>A value of <code>BATCH</code> indicates that all data was processed from the input source, regardless of previous job runs. This is the default job type if the workflow wasn't created with an <code>incrementalRunConfig</code>.</p> <p>A value of <code>DELETE_ONLY</code> indicates that only deletion requests from <code>BatchDeleteUniqueIds</code> were processed.</p>"
         }
       }
     },
@@ -1617,6 +1625,10 @@
           "shape":"Timestamp",
           "documentation":"<p>The timestamp of when the workflow was last updated.</p>"
         },
+        "incrementalRunConfig":{
+          "shape":"IdMappingIncrementalRunConfig",
+          "documentation":"<p> The incremental run configuration for the ID mapping workflow.</p>"
+        },
         "roleArn":{
           "shape":"IdMappingRoleArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role. Entity Resolution assumes this role to access Amazon Web Services resources on your behalf.</p>"
@@ -2041,6 +2053,20 @@
       "min":1,
       "pattern":"[a-zA-Z_0-9-+=/,]*"
     },
+    "IdMappingIncrementalRunConfig":{
+      "type":"structure",
+      "members":{
+        "incrementalRunType":{
+          "shape":"IdMappingIncrementalRunType",
+          "documentation":"<p> The incremental run type for an ID mapping workflow.</p> <p>It takes only one value: <code>ON_DEMAND</code>. This setting runs the ID mapping workflow when it's manually triggered through the <code>StartIdMappingJob</code> API.</p>"
+        }
+      },
+      "documentation":"<p> Incremental run configuration for an ID mapping workflow.</p>"
+    },
+    "IdMappingIncrementalRunType":{
+      "type":"string",
+      "enum":["ON_DEMAND"]
+    },
     "IdMappingJobMetrics":{
       "type":"structure",
       "members":{
@@ -2056,6 +2082,10 @@
           "shape":"Integer",
           "documentation":"<p>The total number of records that did not get processed.</p>"
         },
+        "deleteRecordsProcessed":{
+          "shape":"Integer",
+          "documentation":"<p>The number of records processed that were marked for deletion in the input file using the DELETE schema mapping field. These are the records to be removed from the ID mapping table.</p>"
+        },
         "totalMappedRecords":{
           "shape":"Integer",
           "documentation":"<p> The total number of records that were mapped.</p>"
@@ -2070,7 +2100,35 @@
         },
         "uniqueRecordsLoaded":{
           "shape":"Integer",
-          "documentation":"<p>The number of records remaining after loading and aggregating duplicate records. Duplicates are determined by the field marked as UNIQUE_ID in your schema mapping - records sharing the same value in this field are considered duplicates. For example, if you specified \"customer_id\" as a UNIQUE_ID field and had three records with the same customer_id value, they would count as one unique record in this metric. </p>"
+          "documentation":"<p>The number of de-duplicated processed records across all runs, excluding deletion-related records. Duplicates are determined by the field marked as UNIQUE_ID in your schema mapping. Records sharing the same value in this field are considered duplicates. For example, if you specified \"customer_id\" as a UNIQUE_ID field and had three records with the same customer_id value, they would count as one unique record in this metric. </p>"
+        },
+        "newMappedRecords":{
+          "shape":"Integer",
+          "documentation":"<p> The number of new mapped records.</p>"
+        },
+        "newMappedSourceRecords":{
+          "shape":"Integer",
+          "documentation":"<p> The number of new source records mapped.</p>"
+        },
+        "newMappedTargetRecords":{
+          "shape":"Integer",
+          "documentation":"<p> The number of new mapped target records.</p>"
+        },
+        "newUniqueRecordsLoaded":{
+          "shape":"Integer",
+          "documentation":"<p>The number of new unique records processed in the current job run, after removing duplicates. This metric excludes deletion-related records. Duplicates are determined by the field marked as UNIQUE_ID in your schema mapping. Records sharing the same value in this field are considered duplicates. For example, if your current run processes five new records with the same UNIQUE_ID value, they would count as one new unique record in this metric.</p>"
+        },
+        "mappedRecordsRemoved":{
+          "shape":"Integer",
+          "documentation":"<p> The number of mapped records removed.</p>"
+        },
+        "mappedSourceRecordsRemoved":{
+          "shape":"Integer",
+          "documentation":"<p> The number of source records removed due to ID mapping.</p>"
+        },
+        "mappedTargetRecordsRemoved":{
+          "shape":"Integer",
+          "documentation":"<p> The number of mapped target records removed.</p>"
         }
       },
       "documentation":"<p>An object that contains metrics about an ID mapping job, including counts of input records, processed records, and mapped records between source and target identifiers. </p>"
@@ -2177,7 +2235,7 @@
       "required":["inputSourceARN"],
       "members":{
         "inputSourceARN":{
-          "shape":"IdMappingWorkflowInputSourceInputSourceARNString",
+          "shape":"InputSourceARN",
           "documentation":"<p>An Glue table Amazon Resource Name (ARN) or a matching workflow ARN for the input source table.</p>"
         },
         "schemaName":{
@@ -2197,10 +2255,6 @@
       "max":20,
       "min":1
     },
-    "IdMappingWorkflowInputSourceInputSourceARNString":{
-      "type":"string",
-      "pattern":"arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(idnamespace/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(matchingworkflow/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):glue:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(table/[a-zA-Z_0-9-]{1,255}/[a-zA-Z_0-9-]{1,255})"
-    },
     "IdMappingWorkflowList":{
       "type":"list",
       "member":{"shape":"IdMappingWorkflowSummary"}
@@ -2316,7 +2370,7 @@
       "required":["inputSourceARN"],
       "members":{
         "inputSourceARN":{
-          "shape":"IdNamespaceInputSourceInputSourceARNString",
+          "shape":"InputSourceARN",
           "documentation":"<p>An Glue table Amazon Resource Name (ARN) or a matching workflow ARN for the input source table.</p>"
         },
         "schemaName":{
@@ -2332,10 +2386,6 @@
       "max":20,
       "min":0
     },
-    "IdNamespaceInputSourceInputSourceARNString":{
-      "type":"string",
-      "pattern":"arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(idnamespace/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(matchingworkflow/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):glue:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(table/[a-zA-Z_0-9-]{1,255}/[a-zA-Z_0-9-]{1,255})"
-    },
     "IdNamespaceList":{
       "type":"list",
       "member":{"shape":"IdNamespaceSummary"}
@@ -2393,10 +2443,10 @@
       "members":{
         "incrementalRunType":{
           "shape":"IncrementalRunType",
-          "documentation":"<p>The type of incremental run. The only valid value is <code>IMMEDIATE</code>. This appears as \"Automatic\" in the console.</p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code>, incremental processing is not supported. </p> </important>"
+          "documentation":"<p>The type of incremental run. The only valid value is <code>IMMEDIATE</code>. This appears as \"Automatic\" in the console.</p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code> or <code>PROVIDER</code>, incremental processing is not supported. </p> </important>"
         }
       },
-      "documentation":"<p>Optional. An object that defines the incremental run type. This object contains only the <code>incrementalRunType</code> field, which appears as \"Automatic\" in the console. </p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code>, incremental processing is not supported. </p> </important>"
+      "documentation":"<p>Optional. An object that defines the incremental run type. This object contains only the <code>incrementalRunType</code> field, which appears as \"Automatic\" in the console. </p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code> or <code>PROVIDER</code>, incremental processing is not supported. </p> </important>"
     },
     "IncrementalRunType":{
       "type":"string",
@@ -2410,7 +2460,7 @@
       ],
       "members":{
         "inputSourceARN":{
-          "shape":"InputSourceInputSourceARNString",
+          "shape":"InputSourceARN",
           "documentation":"<p>An Glue table Amazon Resource Name (ARN) for the input source table.</p>"
         },
         "schemaName":{
@@ -2424,16 +2474,16 @@
       },
       "documentation":"<p>An object containing <code>inputSourceARN</code>, <code>schemaName</code>, and <code>applyNormalization</code>.</p>"
     },
+    "InputSourceARN":{
+      "type":"string",
+      "pattern":"arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(idnamespace/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(matchingworkflow/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):glue:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(table/[a-zA-Z_0-9-]{1,255}/[a-zA-Z_0-9-]{1,255})"
+    },
     "InputSourceConfig":{
       "type":"list",
       "member":{"shape":"InputSource"},
       "max":20,
       "min":1
     },
-    "InputSourceInputSourceARNString":{
-      "type":"string",
-      "pattern":"arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(idnamespace/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(matchingworkflow/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):glue:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(table/[a-zA-Z_0-9-]{1,255}/[a-zA-Z_0-9-]{1,255})"
-    },
     "Integer":{
       "type":"integer",
       "box":true
@@ -2483,6 +2533,10 @@
           "shape":"Integer",
           "documentation":"<p>The total number of records that did not get processed.</p>"
         },
+        "deleteRecordsProcessed":{
+          "shape":"Integer",
+          "documentation":"<p>The number of records processed that were marked for deletion (<code>DELETE</code> = True) in the input file. This metric tracks records flagged for removal during the job execution.</p>"
+        },
         "matchIDs":{
           "shape":"Integer",
           "documentation":"<p>The total number of <code>matchID</code>s generated.</p>"
@@ -2554,6 +2608,14 @@
       },
       "documentation":"<p>An object containing the <code>jobId</code>, <code>status</code>, <code>startTime</code>, and <code>endTime</code> of a job.</p>"
     },
+    "JobType":{
+      "type":"string",
+      "enum":[
+        "BATCH",
+        "INCREMENTAL",
+        "DELETE_ONLY"
+      ]
+    },
     "KMSArn":{
       "type":"string",
       "pattern":"arn:aws:kms:.*:[0-9]+:.*"
@@ -2890,7 +2952,7 @@
       ],
       "members":{
         "inputSourceARN":{
-          "shape":"MatchedRecordInputSourceARNString",
+          "shape":"InputSourceARN",
           "documentation":"<p> The input source ARN of the matched record.</p>"
         },
         "recordId":{
@@ -2900,10 +2962,6 @@
       },
       "documentation":"<p> The matched record.</p>"
     },
-    "MatchedRecordInputSourceARNString":{
-      "type":"string",
-      "pattern":"arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(idnamespace/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(matchingworkflow/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):glue:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(table/[a-zA-Z_0-9-]{1,255}/[a-zA-Z_0-9-]{1,255})"
-    },
     "MatchedRecordsList":{
       "type":"list",
       "member":{"shape":"MatchedRecord"}
@@ -3305,7 +3363,7 @@
       ],
       "members":{
         "inputSourceARN":{
-          "shape":"RecordInputSourceARNString",
+          "shape":"InputSourceARN",
           "documentation":"<p> The input source ARN of the record.</p>"
         },
         "uniqueId":{
@@ -3353,10 +3411,6 @@
       "min":0,
       "pattern":"[a-zA-Z_0-9-./@ ()+\\t]*"
     },
-    "RecordInputSourceARNString":{
-      "type":"string",
-      "pattern":"arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(idnamespace/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(matchingworkflow/[a-zA-Z_0-9-]{1,255})$|^arn:(aws|aws-us-gov|aws-cn):glue:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:(table/[a-zA-Z_0-9-]{1,255}/[a-zA-Z_0-9-]{1,255})"
-    },
     "RecordMatchingModel":{
       "type":"string",
       "enum":[
@@ -3378,7 +3432,7 @@
       "members":{
         "resolutionType":{
           "shape":"ResolutionType",
-          "documentation":"<p>The type of matching. There are three types of matching: <code>RULE_MATCHING</code>, <code>ML_MATCHING</code>, and <code>PROVIDER</code>.</p>"
+          "documentation":"<p>The type of matching workflow to create. Specify one of the following types: </p> <ul> <li> <p> <code>RULE_MATCHING</code>: Match records using configurable rule-based criteria </p> </li> <li> <p> <code>ML_MATCHING</code>: Match records using machine learning models </p> </li> <li> <p> <code>PROVIDER</code>: Match records using a third-party matching provider</p> </li> </ul>"
         },
         "ruleBasedProperties":{
           "shape":"RuleBasedProperties",
@@ -3408,7 +3462,7 @@
       "members":{
         "message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>The resource could not be found. </p>",
+      "documentation":"<p>The resource couldn't be found. </p>",
       "error":{
         "httpStatusCode":404,
         "senderFault":true
@@ -3668,6 +3722,10 @@
         "outputSourceConfig":{
           "shape":"IdMappingJobOutputSourceConfig",
           "documentation":"<p>A list of <code>OutputSource</code> objects.</p>"
+        },
+        "jobType":{
+          "shape":"JobType",
+          "documentation":"<p> The job type for the ID mapping job.</p> <p>If the <code>jobType</code> value is set to <code>INCREMENTAL</code>, only new or changed data is processed since the last job run. This is the default value if the <code>CreateIdMappingWorkflow</code> API is configured with an <code>incrementalRunConfig</code>.</p> <p>If the <code>jobType</code> value is set to <code>BATCH</code>, all data is processed from the input source, regardless of previous job runs. This is the default value if the <code>CreateIdMappingWorkflow</code> API isn't configured with an <code>incrementalRunConfig</code>.</p> <p>If the <code>jobType</code> value is set to <code>DELETE_ONLY</code>, only deletion requests from <code>BatchDeleteUniqueIds</code> are processed.</p>"
         }
       }
     },
@@ -3682,6 +3740,10 @@
         "outputSourceConfig":{
           "shape":"IdMappingJobOutputSourceConfig",
           "documentation":"<p>A list of <code>OutputSource</code> objects.</p>"
+        },
+        "jobType":{
+          "shape":"JobType",
+          "documentation":"<p> The job type for the started ID mapping job.</p> <p>A value of <code>INCREMENTAL</code> indicates that only new or changed data was processed since the last job run. This is the default job type if the workflow was created with an <code>incrementalRunConfig</code>.</p> <p>A value of <code>BATCH</code> indicates that all data was processed from the input source, regardless of previous job runs. This is the default job type if the workflow wasn't created with an <code>incrementalRunConfig</code>.</p> <p>A value of <code>DELETE_ONLY</code> indicates that only deletion requests from <code>BatchDeleteUniqueIds</code> were processed.</p>"
         }
       }
     },
@@ -3873,6 +3935,10 @@
           "shape":"IdMappingTechniques",
           "documentation":"<p>An object which defines the ID mapping technique and any additional configurations.</p>"
         },
+        "incrementalRunConfig":{
+          "shape":"IdMappingIncrementalRunConfig",
+          "documentation":"<p> The incremental run configuration for the update ID mapping workflow.</p>"
+        },
         "roleArn":{
           "shape":"IdMappingRoleArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role. Entity Resolution assumes this role to access Amazon Web Services resources on your behalf.</p>"
@@ -3912,6 +3978,10 @@
           "shape":"IdMappingTechniques",
           "documentation":"<p>An object which defines the ID mapping technique and any additional configurations.</p>"
         },
+        "incrementalRunConfig":{
+          "shape":"IdMappingIncrementalRunConfig",
+          "documentation":"<p> The incremental run configuration for the update ID mapping workflow output.</p>"
+        },
         "roleArn":{
           "shape":"IdMappingRoleArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role. Entity Resolution assumes this role to access Amazon Web Services resources on your behalf.</p>"
@@ -4028,7 +4098,7 @@
         },
         "incrementalRunConfig":{
           "shape":"IncrementalRunConfig",
-          "documentation":"<p>Optional. An object that defines the incremental run type. This object contains only the <code>incrementalRunType</code> field, which appears as \"Automatic\" in the console. </p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code>, incremental processing is not supported. </p> </important>"
+          "documentation":"<p>Optional. An object that defines the incremental run type. This object contains only the <code>incrementalRunType</code> field, which appears as \"Automatic\" in the console. </p> <important> <p>For workflows where <code>resolutionType</code> is <code>ML_MATCHING</code> or <code>PROVIDER</code>, incremental processing is not supported. </p> </important>"
         },
         "roleArn":{
           "shape":"String",
diff --git a/services/eventbridge/pom.xml b/services/eventbridge/pom.xml
index 1012437a531e..d07c9ed08258 100644
--- a/services/eventbridge/pom.xml
+++ b/services/eventbridge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>eventbridge</artifactId>
     <name>AWS Java SDK :: Services :: EventBridge</name>
diff --git a/services/evidently/pom.xml b/services/evidently/pom.xml
index 21aada5799c8..916022f69757 100644
--- a/services/evidently/pom.xml
+++ b/services/evidently/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>evidently</artifactId>
     <name>AWS Java SDK :: Services :: Evidently</name>
diff --git a/services/evs/pom.xml b/services/evs/pom.xml
index 917f947996a9..58a379131fb2 100644
--- a/services/evs/pom.xml
+++ b/services/evs/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>evs</artifactId>
     <name>AWS Java SDK :: Services :: Evs</name>
diff --git a/services/evs/src/main/resources/codegen-resources/service-2.json b/services/evs/src/main/resources/codegen-resources/service-2.json
index 30f1f68395b8..93253a1629d0 100644
--- a/services/evs/src/main/resources/codegen-resources/service-2.json
+++ b/services/evs/src/main/resources/codegen-resources/service-2.json
@@ -16,6 +16,22 @@
     "uid":"evs-2023-07-27"
   },
   "operations":{
+    "AssociateEipToVlan":{
+      "name":"AssociateEipToVlan",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AssociateEipToVlanRequest"},
+      "output":{"shape":"AssociateEipToVlanResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Associates an Elastic IP address with a public HCX VLAN. This operation is only allowed for public HCX VLANs at this time.</p>",
+      "idempotent":true
+    },
     "CreateEnvironment":{
       "name":"CreateEnvironment",
       "http":{
@@ -75,6 +91,22 @@
       "documentation":"<p>Deletes a host from an Amazon EVS environment.</p> <note> <p>Before deleting a host, you must unassign and decommission the host from within the SDDC Manager user interface. Not doing so could impact the availability of your virtual machines or result in data loss.</p> </note>",
       "idempotent":true
     },
+    "DisassociateEipFromVlan":{
+      "name":"DisassociateEipFromVlan",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisassociateEipFromVlanRequest"},
+      "output":{"shape":"DisassociateEipFromVlanResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Disassociates an Elastic IP address from a public HCX VLAN. This operation is only allowed for public HCX VLANs at this time.</p>",
+      "idempotent":true
+    },
     "GetEnvironment":{
       "name":"GetEnvironment",
       "http":{
@@ -177,12 +209,62 @@
     }
   },
   "shapes":{
+    "AllocationId":{
+      "type":"string",
+      "max":26,
+      "min":9,
+      "pattern":"eipalloc-[a-zA-Z0-9_-]+"
+    },
     "Arn":{
       "type":"string",
       "max":1011,
       "min":1,
       "pattern":"arn:aws:evs:[a-z]{2}-[a-z]+-[0-9]:[0-9]{12}:environment/[a-zA-Z0-9_-]+"
     },
+    "AssociateEipToVlanRequest":{
+      "type":"structure",
+      "required":[
+        "environmentId",
+        "vlanName",
+        "allocationId"
+      ],
+      "members":{
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p><note> <p>This parameter is not used in Amazon EVS currently. If you supply input for this parameter, it will have no effect.</p> </note> <p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the environment creation request. If you do not specify a client token, a randomly generated token is used for the request to ensure idempotency.</p></p>",
+          "idempotencyToken":true
+        },
+        "environmentId":{
+          "shape":"EnvironmentId",
+          "documentation":"<p>A unique ID for the environment containing the VLAN that the Elastic IP address associates with.</p>"
+        },
+        "vlanName":{
+          "shape":"AssociateEipToVlanRequestVlanNameString",
+          "documentation":"<p>The name of the VLAN. <code>hcx</code> is the only accepted VLAN name at this time.</p>"
+        },
+        "allocationId":{
+          "shape":"AllocationId",
+          "documentation":"<p>The Elastic IP address allocation ID.</p>"
+        }
+      }
+    },
+    "AssociateEipToVlanRequestVlanNameString":{
+      "type":"string",
+      "max":200,
+      "min":1
+    },
+    "AssociateEipToVlanResponse":{
+      "type":"structure",
+      "members":{
+        "vlan":{"shape":"Vlan"}
+      }
+    },
+    "AssociationId":{
+      "type":"string",
+      "max":26,
+      "min":9,
+      "pattern":"eipassoc-[a-zA-Z0-9_-]+"
+    },
     "Boolean":{
       "type":"boolean",
       "box":true
@@ -434,6 +516,66 @@
         }
       }
     },
+    "DisassociateEipFromVlanRequest":{
+      "type":"structure",
+      "required":[
+        "environmentId",
+        "vlanName",
+        "associationId"
+      ],
+      "members":{
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p><note> <p>This parameter is not used in Amazon EVS currently. If you supply input for this parameter, it will have no effect.</p> </note> <p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the environment creation request. If you do not specify a client token, a randomly generated token is used for the request to ensure idempotency.</p></p>",
+          "idempotencyToken":true
+        },
+        "environmentId":{
+          "shape":"EnvironmentId",
+          "documentation":"<p>A unique ID for the environment containing the VLAN that the Elastic IP address disassociates from.</p>"
+        },
+        "vlanName":{
+          "shape":"DisassociateEipFromVlanRequestVlanNameString",
+          "documentation":"<p>The name of the VLAN. <code>hcx</code> is the only accepted VLAN name at this time.</p>"
+        },
+        "associationId":{
+          "shape":"AssociationId",
+          "documentation":"<p> A unique ID for the Elastic IP address association.</p>"
+        }
+      }
+    },
+    "DisassociateEipFromVlanRequestVlanNameString":{
+      "type":"string",
+      "max":200,
+      "min":1
+    },
+    "DisassociateEipFromVlanResponse":{
+      "type":"structure",
+      "members":{
+        "vlan":{"shape":"Vlan"}
+      }
+    },
+    "EipAssociation":{
+      "type":"structure",
+      "members":{
+        "associationId":{
+          "shape":"AssociationId",
+          "documentation":"<p>A unique ID for the elastic IP address association with the VLAN subnet.</p>"
+        },
+        "allocationId":{
+          "shape":"AllocationId",
+          "documentation":"<p>The Elastic IP address allocation ID.</p>"
+        },
+        "ipAddress":{
+          "shape":"IpAddress",
+          "documentation":"<p>The Elastic IP address.</p>"
+        }
+      },
+      "documentation":"<p>An Elastic IP address association with the elastic network interface in the VLAN subnet.</p>"
+    },
+    "EipAssociationList":{
+      "type":"list",
+      "member":{"shape":"EipAssociation"}
+    },
     "Environment":{
       "type":"structure",
       "members":{
@@ -772,7 +914,7 @@
         },
         "hcx":{
           "shape":"InitialVlanInfo",
-          "documentation":"<p>The HCX VLAN subnet. This VLAN subnet allows the HCX Interconnnect (IX) and HCX Network Extension (NE) to reach their peers and enable HCX Service Mesh creation.</p>"
+          "documentation":"<p>The HCX VLAN subnet. This VLAN subnet allows the HCX Interconnnect (IX) and HCX Network Extension (NE) to reach their peers and enable HCX Service Mesh creation.</p> <p>If you plan to use a public HCX VLAN subnet, the following requirements must be met:</p> <ul> <li> <p>Must have a /28 netmask and be allocated from the IPAM public pool. Required for HCX internet access configuration.</p> </li> <li> <p>The HCX public VLAN CIDR block must be added to the VPC as a secondary CIDR block.</p> </li> <li> <p>Must have at least three Elastic IP addresses to be allocated from the public IPAM pool for HCX components.</p> </li> </ul>"
         },
         "expansionVlan1":{
           "shape":"InitialVlanInfo",
@@ -781,6 +923,14 @@
         "expansionVlan2":{
           "shape":"InitialVlanInfo",
           "documentation":"<p>An additional VLAN subnet that can be used to extend VCF capabilities once configured. For example, you can configure an expansion VLAN subnet to use NSX Federation for centralized management and synchronization of multiple NSX deployments across different locations.</p>"
+        },
+        "isHcxPublic":{
+          "shape":"Boolean",
+          "documentation":"<p>Determines if the HCX VLAN that Amazon EVS provisions is public or private.</p>"
+        },
+        "hcxNetworkAclId":{
+          "shape":"NetworkAclId",
+          "documentation":"<p>A unique ID for a network access control list that the HCX VLAN uses. Required when <code>isHcxPublic</code> is set to <code>true</code>.</p>"
         }
       },
       "documentation":"<p>The initial VLAN subnets for the environment. Amazon EVS VLAN subnets have a minimum CIDR block size of /28 and a maximum size of /24. Amazon EVS VLAN subnet CIDR blocks must not overlap with other subnets in the VPC.</p>"
@@ -944,6 +1094,12 @@
       "max":100,
       "min":1
     },
+    "NetworkAclId":{
+      "type":"string",
+      "max":21,
+      "min":4,
+      "pattern":"acl-[a-zA-Z0-9_-]+"
+    },
     "NetworkInterface":{
       "type":"structure",
       "members":{
@@ -1143,7 +1299,7 @@
           "documentation":"<p>The seconds to wait to retry.</p>"
         }
       },
-      "documentation":"<p>The <code>CreateEnvironmentHost</code> operation couldn't be performed because the service is throttling requests. This exception is thrown when the <code>CreateEnvironmentHost</code> request exceeds concurrency of 1 transaction per second (TPS).</p>",
+      "documentation":"<p>The operation couldn't be performed because the service is throttling requests. This exception is thrown when there are too many requests accepted concurrently from the service endpoint.</p>",
       "exception":true,
       "retryable":{"throttling":false}
     },
@@ -1334,6 +1490,18 @@
         "stateDetails":{
           "shape":"StateDetails",
           "documentation":"<p>The state details of the VLAN.</p>"
+        },
+        "eipAssociations":{
+          "shape":"EipAssociationList",
+          "documentation":"<p>An array of Elastic IP address associations.</p>"
+        },
+        "isPublic":{
+          "shape":"Boolean",
+          "documentation":"<p>Determines if the VLAN that Amazon EVS provisions is public or private.</p>"
+        },
+        "networkAclId":{
+          "shape":"NetworkAclId",
+          "documentation":"<p>A unique ID for a network access control list.</p>"
         }
       },
       "documentation":"<p>The VLANs that Amazon EVS creates during environment creation.</p>"
diff --git a/services/finspace/pom.xml b/services/finspace/pom.xml
index e10d4587eb0e..244976049c66 100644
--- a/services/finspace/pom.xml
+++ b/services/finspace/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>finspace</artifactId>
     <name>AWS Java SDK :: Services :: Finspace</name>
diff --git a/services/finspacedata/pom.xml b/services/finspacedata/pom.xml
index 0442c2f7690b..54f1aa4db658 100644
--- a/services/finspacedata/pom.xml
+++ b/services/finspacedata/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>finspacedata</artifactId>
     <name>AWS Java SDK :: Services :: Finspace Data</name>
diff --git a/services/firehose/pom.xml b/services/firehose/pom.xml
index 0b4cb64164ee..217320464894 100644
--- a/services/firehose/pom.xml
+++ b/services/firehose/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>firehose</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Kinesis Firehose</name>
diff --git a/services/fis/pom.xml b/services/fis/pom.xml
index 6d010e39b1e8..08a37b2a68d4 100644
--- a/services/fis/pom.xml
+++ b/services/fis/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>fis</artifactId>
     <name>AWS Java SDK :: Services :: Fis</name>
diff --git a/services/fms/pom.xml b/services/fms/pom.xml
index 663ba2ddc164..bfe3e22afd82 100644
--- a/services/fms/pom.xml
+++ b/services/fms/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>fms</artifactId>
     <name>AWS Java SDK :: Services :: FMS</name>
diff --git a/services/forecast/pom.xml b/services/forecast/pom.xml
index 159e3eaf4506..0c7ec19891bf 100644
--- a/services/forecast/pom.xml
+++ b/services/forecast/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>forecast</artifactId>
     <name>AWS Java SDK :: Services :: Forecast</name>
diff --git a/services/forecastquery/pom.xml b/services/forecastquery/pom.xml
index 08d22c5129a8..e1c269ba6192 100644
--- a/services/forecastquery/pom.xml
+++ b/services/forecastquery/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>forecastquery</artifactId>
     <name>AWS Java SDK :: Services :: Forecastquery</name>
diff --git a/services/frauddetector/pom.xml b/services/frauddetector/pom.xml
index 2458724517df..6cdda26fc268 100644
--- a/services/frauddetector/pom.xml
+++ b/services/frauddetector/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>frauddetector</artifactId>
     <name>AWS Java SDK :: Services :: FraudDetector</name>
diff --git a/services/freetier/pom.xml b/services/freetier/pom.xml
index 0b17482c3947..46da19b0422c 100644
--- a/services/freetier/pom.xml
+++ b/services/freetier/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>freetier</artifactId>
     <name>AWS Java SDK :: Services :: Free Tier</name>
diff --git a/services/fsx/pom.xml b/services/fsx/pom.xml
index 4d842ca0ff84..1fd4a90b66f3 100644
--- a/services/fsx/pom.xml
+++ b/services/fsx/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>fsx</artifactId>
     <name>AWS Java SDK :: Services :: FSx</name>
diff --git a/services/gamelift/pom.xml b/services/gamelift/pom.xml
index 704662613bae..5e887f229ca9 100644
--- a/services/gamelift/pom.xml
+++ b/services/gamelift/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>gamelift</artifactId>
     <name>AWS Java SDK :: Services :: AWS GameLift</name>
diff --git a/services/gameliftstreams/pom.xml b/services/gameliftstreams/pom.xml
index a1586aedc524..4d9b508f2fa3 100644
--- a/services/gameliftstreams/pom.xml
+++ b/services/gameliftstreams/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>gameliftstreams</artifactId>
     <name>AWS Java SDK :: Services :: Game Lift Streams</name>
diff --git a/services/geomaps/pom.xml b/services/geomaps/pom.xml
index 17c4333b2f4f..2b5c5535ee8f 100644
--- a/services/geomaps/pom.xml
+++ b/services/geomaps/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>geomaps</artifactId>
     <name>AWS Java SDK :: Services :: Geo Maps</name>
diff --git a/services/geoplaces/pom.xml b/services/geoplaces/pom.xml
index da5193111dfe..044f5185de8f 100644
--- a/services/geoplaces/pom.xml
+++ b/services/geoplaces/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>geoplaces</artifactId>
     <name>AWS Java SDK :: Services :: Geo Places</name>
diff --git a/services/georoutes/pom.xml b/services/georoutes/pom.xml
index 3f396054a830..01de9e3bfb08 100644
--- a/services/georoutes/pom.xml
+++ b/services/georoutes/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>georoutes</artifactId>
     <name>AWS Java SDK :: Services :: Geo Routes</name>
diff --git a/services/glacier/pom.xml b/services/glacier/pom.xml
index e09e19048ac9..e352dca043c1 100644
--- a/services/glacier/pom.xml
+++ b/services/glacier/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>glacier</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Glacier</name>
diff --git a/services/globalaccelerator/pom.xml b/services/globalaccelerator/pom.xml
index 84786dbd0bb1..3cd0008a2208 100644
--- a/services/globalaccelerator/pom.xml
+++ b/services/globalaccelerator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>globalaccelerator</artifactId>
     <name>AWS Java SDK :: Services :: Global Accelerator</name>
diff --git a/services/glue/pom.xml b/services/glue/pom.xml
index d03c4d9037b0..5517bca0fe36 100644
--- a/services/glue/pom.xml
+++ b/services/glue/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>glue</artifactId>
diff --git a/services/glue/src/main/resources/codegen-resources/service-2.json b/services/glue/src/main/resources/codegen-resources/service-2.json
index 5acf8828216e..f58d466b7363 100644
--- a/services/glue/src/main/resources/codegen-resources/service-2.json
+++ b/services/glue/src/main/resources/codegen-resources/service-2.json
@@ -4919,6 +4919,10 @@
           "shape":"SecretArn",
           "documentation":"<p>The secret manager ARN to store credentials.</p>"
         },
+        "KmsKeyArn":{
+          "shape":"KmsKeyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the KMS key used to encrypt sensitive authentication information. This key is used to protect credentials and other sensitive data stored within the authentication configuration.</p>"
+        },
         "OAuth2Properties":{
           "shape":"OAuth2Properties",
           "documentation":"<p>The properties for OAuth2 authentication.</p>"
@@ -7840,7 +7844,7 @@
         },
         "ConnectionProperties":{
           "shape":"ConnectionProperties",
-          "documentation":"<p>These key-value pairs define parameters for the connection when using the version 1 Connection schema:</p> <ul> <li> <p> <code>HOST</code> - The host URI: either the fully qualified domain name (FQDN) or the IPv4 address of the database host.</p> </li> <li> <p> <code>PORT</code> - The port number, between 1024 and 65535, of the port on which the database host is listening for database connections.</p> </li> <li> <p> <code>USER_NAME</code> - The name under which to log in to the database. The value string for <code>USER_NAME</code> is \"<code>USERNAME</code>\".</p> </li> <li> <p> <code>PASSWORD</code> - A password, if one is used, for the user name.</p> </li> <li> <p> <code>ENCRYPTED_PASSWORD</code> - When you enable connection password protection by setting <code>ConnectionPasswordEncryption</code> in the Data Catalog encryption settings, this field stores the encrypted password.</p> </li> <li> <p> <code>JDBC_DRIVER_JAR_URI</code> - The Amazon Simple Storage Service (Amazon S3) path of the JAR file that contains the JDBC driver to use.</p> </li> <li> <p> <code>JDBC_DRIVER_CLASS_NAME</code> - The class name of the JDBC driver to use.</p> </li> <li> <p> <code>JDBC_ENGINE</code> - The name of the JDBC engine to use.</p> </li> <li> <p> <code>JDBC_ENGINE_VERSION</code> - The version of the JDBC engine to use.</p> </li> <li> <p> <code>CONFIG_FILES</code> - (Reserved for future use.)</p> </li> <li> <p> <code>INSTANCE_ID</code> - The instance ID to use.</p> </li> <li> <p> <code>JDBC_CONNECTION_URL</code> - The URL for connecting to a JDBC data source.</p> </li> <li> <p> <code>JDBC_ENFORCE_SSL</code> - A Boolean string (true, false) specifying whether Secure Sockets Layer (SSL) with hostname matching is enforced for the JDBC connection on the client. The default is false.</p> </li> <li> <p> <code>CUSTOM_JDBC_CERT</code> - An Amazon S3 location specifying the customer's root certificate. Glue uses this root certificate to validate the customer’s certificate when connecting to the customer database. Glue only handles X.509 certificates. The certificate provided must be DER-encoded and supplied in Base64 encoding PEM format.</p> </li> <li> <p> <code>SKIP_CUSTOM_JDBC_CERT_VALIDATION</code> - By default, this is <code>false</code>. Glue validates the Signature algorithm and Subject Public Key Algorithm for the customer certificate. The only permitted algorithms for the Signature algorithm are SHA256withRSA, SHA384withRSA or SHA512withRSA. For the Subject Public Key Algorithm, the key length must be at least 2048. You can set the value of this property to <code>true</code> to skip Glue’s validation of the customer certificate.</p> </li> <li> <p> <code>CUSTOM_JDBC_CERT_STRING</code> - A custom JDBC certificate string which is used for domain match or distinguished name match to prevent a man-in-the-middle attack. In Oracle database, this is used as the <code>SSL_SERVER_CERT_DN</code>; in Microsoft SQL Server, this is used as the <code>hostNameInCertificate</code>.</p> </li> <li> <p> <code>CONNECTION_URL</code> - The URL for connecting to a general (non-JDBC) data source.</p> </li> <li> <p> <code>SECRET_ID</code> - The secret ID used for the secret manager of credentials.</p> </li> <li> <p> <code>CONNECTOR_URL</code> - The connector URL for a MARKETPLACE or CUSTOM connection.</p> </li> <li> <p> <code>CONNECTOR_TYPE</code> - The connector type for a MARKETPLACE or CUSTOM connection.</p> </li> <li> <p> <code>CONNECTOR_CLASS_NAME</code> - The connector class name for a MARKETPLACE or CUSTOM connection.</p> </li> <li> <p> <code>KAFKA_BOOTSTRAP_SERVERS</code> - A comma-separated list of host and port pairs that are the addresses of the Apache Kafka brokers in a Kafka cluster to which a Kafka client will connect to and bootstrap itself.</p> </li> <li> <p> <code>KAFKA_SSL_ENABLED</code> - Whether to enable or disable SSL on an Apache Kafka connection. Default value is \"true\".</p> </li> <li> <p> <code>KAFKA_CUSTOM_CERT</code> - The Amazon S3 URL for the private CA cert file (.pem format). The default is an empty string.</p> </li> <li> <p> <code>KAFKA_SKIP_CUSTOM_CERT_VALIDATION</code> - Whether to skip the validation of the CA cert file or not. Glue validates for three algorithms: SHA256withRSA, SHA384withRSA and SHA512withRSA. Default value is \"false\".</p> </li> <li> <p> <code>KAFKA_CLIENT_KEYSTORE</code> - The Amazon S3 location of the client keystore file for Kafka client side authentication (Optional).</p> </li> <li> <p> <code>KAFKA_CLIENT_KEYSTORE_PASSWORD</code> - The password to access the provided keystore (Optional).</p> </li> <li> <p> <code>KAFKA_CLIENT_KEY_PASSWORD</code> - A keystore can consist of multiple keys, so this is the password to access the client key to be used with the Kafka server side key (Optional).</p> </li> <li> <p> <code>ENCRYPTED_KAFKA_CLIENT_KEYSTORE_PASSWORD</code> - The encrypted version of the Kafka client keystore password (if the user has the Glue encrypt passwords setting selected).</p> </li> <li> <p> <code>ENCRYPTED_KAFKA_CLIENT_KEY_PASSWORD</code> - The encrypted version of the Kafka client key password (if the user has the Glue encrypt passwords setting selected).</p> </li> <li> <p> <code>KAFKA_SASL_MECHANISM</code> - <code>\"SCRAM-SHA-512\"</code>, <code>\"GSSAPI\"</code>, <code>\"AWS_MSK_IAM\"</code>, or <code>\"PLAIN\"</code>. These are the supported <a href=\"https://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml\">SASL Mechanisms</a>.</p> </li> <li> <p> <code>KAFKA_SASL_PLAIN_USERNAME</code> - A plaintext username used to authenticate with the \"PLAIN\" mechanism.</p> </li> <li> <p> <code>KAFKA_SASL_PLAIN_PASSWORD</code> - A plaintext password used to authenticate with the \"PLAIN\" mechanism.</p> </li> <li> <p> <code>ENCRYPTED_KAFKA_SASL_PLAIN_PASSWORD</code> - The encrypted version of the Kafka SASL PLAIN password (if the user has the Glue encrypt passwords setting selected).</p> </li> <li> <p> <code>KAFKA_SASL_SCRAM_USERNAME</code> - A plaintext username used to authenticate with the \"SCRAM-SHA-512\" mechanism.</p> </li> <li> <p> <code>KAFKA_SASL_SCRAM_PASSWORD</code> - A plaintext password used to authenticate with the \"SCRAM-SHA-512\" mechanism.</p> </li> <li> <p> <code>ENCRYPTED_KAFKA_SASL_SCRAM_PASSWORD</code> - The encrypted version of the Kafka SASL SCRAM password (if the user has the Glue encrypt passwords setting selected).</p> </li> <li> <p> <code>KAFKA_SASL_SCRAM_SECRETS_ARN</code> - The Amazon Resource Name of a secret in Amazon Web Services Secrets Manager.</p> </li> <li> <p> <code>KAFKA_SASL_GSSAPI_KEYTAB</code> - The S3 location of a Kerberos <code>keytab</code> file. A keytab stores long-term keys for one or more principals. For more information, see <a href=\"https://web.mit.edu/kerberos/krb5-latest/doc/basic/keytab_def.html\">MIT Kerberos Documentation: Keytab</a>.</p> </li> <li> <p> <code>KAFKA_SASL_GSSAPI_KRB5_CONF</code> - The S3 location of a Kerberos <code>krb5.conf</code> file. A krb5.conf stores Kerberos configuration information, such as the location of the KDC server. For more information, see <a href=\"https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html\">MIT Kerberos Documentation: krb5.conf</a>.</p> </li> <li> <p> <code>KAFKA_SASL_GSSAPI_SERVICE</code> - The Kerberos service name, as set with <code>sasl.kerberos.service.name</code> in your <a href=\"https://kafka.apache.org/documentation/#brokerconfigs_sasl.kerberos.service.name\">Kafka Configuration</a>.</p> </li> <li> <p> <code>KAFKA_SASL_GSSAPI_PRINCIPAL</code> - The name of the Kerberos princial used by Glue. For more information, see <a href=\"https://kafka.apache.org/documentation/#security_sasl_kerberos_clientconfig\">Kafka Documentation: Configuring Kafka Brokers</a>.</p> </li> <li> <p> <code>ROLE_ARN</code> - The role to be used for running queries.</p> </li> <li> <p> <code>REGION</code> - The Amazon Web Services Region where queries will be run.</p> </li> <li> <p> <code>WORKGROUP_NAME</code> - The name of an Amazon Redshift serverless workgroup or Amazon Athena workgroup in which queries will run.</p> </li> <li> <p> <code>CLUSTER_IDENTIFIER</code> - The cluster identifier of an Amazon Redshift cluster in which queries will run.</p> </li> <li> <p> <code>DATABASE</code> - The Amazon Redshift database that you are connecting to.</p> </li> </ul>"
+          "documentation":"<p>These key-value pairs define parameters for the connection when using the version 1 Connection schema:</p> <ul> <li> <p> <code>HOST</code> - The host URI: either the fully qualified domain name (FQDN) or the IPv4 address of the database host.</p> </li> <li> <p> <code>PORT</code> - The port number, between 1024 and 65535, of the port on which the database host is listening for database connections.</p> </li> <li> <p> <code>USER_NAME</code> - The name under which to log in to the database. The value string for <code>USER_NAME</code> is \"<code>USERNAME</code>\".</p> </li> <li> <p> <code>PASSWORD</code> - A password, if one is used, for the user name.</p> </li> <li> <p> <code>ENCRYPTED_PASSWORD</code> - When you enable connection password protection by setting <code>ConnectionPasswordEncryption</code> in the Data Catalog encryption settings, this field stores the encrypted password.</p> </li> <li> <p> <code>JDBC_DRIVER_JAR_URI</code> - The Amazon Simple Storage Service (Amazon S3) path of the JAR file that contains the JDBC driver to use.</p> </li> <li> <p> <code>JDBC_DRIVER_CLASS_NAME</code> - The class name of the JDBC driver to use.</p> </li> <li> <p> <code>JDBC_ENGINE</code> - The name of the JDBC engine to use.</p> </li> <li> <p> <code>JDBC_ENGINE_VERSION</code> - The version of the JDBC engine to use.</p> </li> <li> <p> <code>CONFIG_FILES</code> - (Reserved for future use.)</p> </li> <li> <p> <code>INSTANCE_ID</code> - The instance ID to use.</p> </li> <li> <p> <code>JDBC_CONNECTION_URL</code> - The URL for connecting to a JDBC data source.</p> </li> <li> <p> <code>JDBC_ENFORCE_SSL</code> - A case-insensitive Boolean string (true, false) specifying whether Secure Sockets Layer (SSL) with hostname matching is enforced for the JDBC connection on the client. The default is false.</p> </li> <li> <p> <code>CUSTOM_JDBC_CERT</code> - An Amazon S3 location specifying the customer's root certificate. Glue uses this root certificate to validate the customer’s certificate when connecting to the customer database. Glue only handles X.509 certificates. The certificate provided must be DER-encoded and supplied in Base64 encoding PEM format.</p> </li> <li> <p> <code>SKIP_CUSTOM_JDBC_CERT_VALIDATION</code> - By default, this is <code>false</code>. Glue validates the Signature algorithm and Subject Public Key Algorithm for the customer certificate. The only permitted algorithms for the Signature algorithm are SHA256withRSA, SHA384withRSA or SHA512withRSA. For the Subject Public Key Algorithm, the key length must be at least 2048. You can set the value of this property to <code>true</code> to skip Glue’s validation of the customer certificate.</p> </li> <li> <p> <code>CUSTOM_JDBC_CERT_STRING</code> - A custom JDBC certificate string which is used for domain match or distinguished name match to prevent a man-in-the-middle attack. In Oracle database, this is used as the <code>SSL_SERVER_CERT_DN</code>; in Microsoft SQL Server, this is used as the <code>hostNameInCertificate</code>.</p> </li> <li> <p> <code>CONNECTION_URL</code> - The URL for connecting to a general (non-JDBC) data source.</p> </li> <li> <p> <code>SECRET_ID</code> - The secret ID used for the secret manager of credentials.</p> </li> <li> <p> <code>CONNECTOR_URL</code> - The connector URL for a MARKETPLACE or CUSTOM connection.</p> </li> <li> <p> <code>CONNECTOR_TYPE</code> - The connector type for a MARKETPLACE or CUSTOM connection.</p> </li> <li> <p> <code>CONNECTOR_CLASS_NAME</code> - The connector class name for a MARKETPLACE or CUSTOM connection.</p> </li> <li> <p> <code>KAFKA_BOOTSTRAP_SERVERS</code> - A comma-separated list of host and port pairs that are the addresses of the Apache Kafka brokers in a Kafka cluster to which a Kafka client will connect to and bootstrap itself.</p> </li> <li> <p> <code>KAFKA_SSL_ENABLED</code> - Whether to enable or disable SSL on an Apache Kafka connection. Default value is \"true\".</p> </li> <li> <p> <code>KAFKA_CUSTOM_CERT</code> - The Amazon S3 URL for the private CA cert file (.pem format). The default is an empty string.</p> </li> <li> <p> <code>KAFKA_SKIP_CUSTOM_CERT_VALIDATION</code> - Whether to skip the validation of the CA cert file or not. Glue validates for three algorithms: SHA256withRSA, SHA384withRSA and SHA512withRSA. Default value is \"false\".</p> </li> <li> <p> <code>KAFKA_CLIENT_KEYSTORE</code> - The Amazon S3 location of the client keystore file for Kafka client side authentication (Optional).</p> </li> <li> <p> <code>KAFKA_CLIENT_KEYSTORE_PASSWORD</code> - The password to access the provided keystore (Optional).</p> </li> <li> <p> <code>KAFKA_CLIENT_KEY_PASSWORD</code> - A keystore can consist of multiple keys, so this is the password to access the client key to be used with the Kafka server side key (Optional).</p> </li> <li> <p> <code>ENCRYPTED_KAFKA_CLIENT_KEYSTORE_PASSWORD</code> - The encrypted version of the Kafka client keystore password (if the user has the Glue encrypt passwords setting selected).</p> </li> <li> <p> <code>ENCRYPTED_KAFKA_CLIENT_KEY_PASSWORD</code> - The encrypted version of the Kafka client key password (if the user has the Glue encrypt passwords setting selected).</p> </li> <li> <p> <code>KAFKA_SASL_MECHANISM</code> - <code>\"SCRAM-SHA-512\"</code>, <code>\"GSSAPI\"</code>, <code>\"AWS_MSK_IAM\"</code>, or <code>\"PLAIN\"</code>. These are the supported <a href=\"https://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml\">SASL Mechanisms</a>.</p> </li> <li> <p> <code>KAFKA_SASL_PLAIN_USERNAME</code> - A plaintext username used to authenticate with the \"PLAIN\" mechanism.</p> </li> <li> <p> <code>KAFKA_SASL_PLAIN_PASSWORD</code> - A plaintext password used to authenticate with the \"PLAIN\" mechanism.</p> </li> <li> <p> <code>ENCRYPTED_KAFKA_SASL_PLAIN_PASSWORD</code> - The encrypted version of the Kafka SASL PLAIN password (if the user has the Glue encrypt passwords setting selected).</p> </li> <li> <p> <code>KAFKA_SASL_SCRAM_USERNAME</code> - A plaintext username used to authenticate with the \"SCRAM-SHA-512\" mechanism.</p> </li> <li> <p> <code>KAFKA_SASL_SCRAM_PASSWORD</code> - A plaintext password used to authenticate with the \"SCRAM-SHA-512\" mechanism.</p> </li> <li> <p> <code>ENCRYPTED_KAFKA_SASL_SCRAM_PASSWORD</code> - The encrypted version of the Kafka SASL SCRAM password (if the user has the Glue encrypt passwords setting selected).</p> </li> <li> <p> <code>KAFKA_SASL_SCRAM_SECRETS_ARN</code> - The Amazon Resource Name of a secret in Amazon Web Services Secrets Manager.</p> </li> <li> <p> <code>KAFKA_SASL_GSSAPI_KEYTAB</code> - The S3 location of a Kerberos <code>keytab</code> file. A keytab stores long-term keys for one or more principals. For more information, see <a href=\"https://web.mit.edu/kerberos/krb5-latest/doc/basic/keytab_def.html\">MIT Kerberos Documentation: Keytab</a>.</p> </li> <li> <p> <code>KAFKA_SASL_GSSAPI_KRB5_CONF</code> - The S3 location of a Kerberos <code>krb5.conf</code> file. A krb5.conf stores Kerberos configuration information, such as the location of the KDC server. For more information, see <a href=\"https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html\">MIT Kerberos Documentation: krb5.conf</a>.</p> </li> <li> <p> <code>KAFKA_SASL_GSSAPI_SERVICE</code> - The Kerberos service name, as set with <code>sasl.kerberos.service.name</code> in your <a href=\"https://kafka.apache.org/documentation/#brokerconfigs_sasl.kerberos.service.name\">Kafka Configuration</a>.</p> </li> <li> <p> <code>KAFKA_SASL_GSSAPI_PRINCIPAL</code> - The name of the Kerberos princial used by Glue. For more information, see <a href=\"https://kafka.apache.org/documentation/#security_sasl_kerberos_clientconfig\">Kafka Documentation: Configuring Kafka Brokers</a>.</p> </li> <li> <p> <code>ROLE_ARN</code> - The role to be used for running queries.</p> </li> <li> <p> <code>REGION</code> - The Amazon Web Services Region where queries will be run.</p> </li> <li> <p> <code>WORKGROUP_NAME</code> - The name of an Amazon Redshift serverless workgroup or Amazon Athena workgroup in which queries will run.</p> </li> <li> <p> <code>CLUSTER_IDENTIFIER</code> - The cluster identifier of an Amazon Redshift cluster in which queries will run.</p> </li> <li> <p> <code>DATABASE</code> - The Amazon Redshift database that you are connecting to.</p> </li> </ul>"
         },
         "SparkProperties":{
           "shape":"PropertyMap",
@@ -8095,10 +8099,73 @@
         "ZOHOCRM",
         "SALESFORCEPARDOT",
         "SALESFORCEMARKETINGCLOUD",
+        "ADOBEANALYTICS",
         "SLACK",
+        "LINKEDIN",
+        "MIXPANEL",
+        "ASANA",
         "STRIPE",
+        "SMARTSHEET",
+        "DATADOG",
+        "WOOCOMMERCE",
         "INTERCOM",
-        "SNAPCHATADS"
+        "SNAPCHATADS",
+        "PAYPAL",
+        "QUICKBOOKS",
+        "FACEBOOKPAGEINSIGHTS",
+        "FRESHDESK",
+        "TWILIO",
+        "DOCUSIGNMONITOR",
+        "FRESHSALES",
+        "ZOOM",
+        "GOOGLESEARCHCONSOLE",
+        "SALESFORCECOMMERCECLOUD",
+        "SAPCONCUR",
+        "DYNATRACE",
+        "MICROSOFTDYNAMIC365FINANCEANDOPS",
+        "MICROSOFTTEAMS",
+        "BLACKBAUDRAISEREDGENXT",
+        "MAILCHIMP",
+        "GITLAB",
+        "PENDO",
+        "PRODUCTBOARD",
+        "CIRCLECI",
+        "PIPEDIVE",
+        "SENDGRID",
+        "AZURECOSMOS",
+        "AZURESQL",
+        "BIGQUERY",
+        "BLACKBAUD",
+        "CLOUDERAHIVE",
+        "CLOUDERAIMPALA",
+        "CLOUDWATCH",
+        "CLOUDWATCHMETRICS",
+        "CMDB",
+        "DATALAKEGEN2",
+        "DB2",
+        "DB2AS400",
+        "DOCUMENTDB",
+        "DOMO",
+        "DYNAMODB",
+        "GOOGLECLOUDSTORAGE",
+        "HBASE",
+        "KUSTOMER",
+        "MICROSOFTDYNAMICS365CRM",
+        "MONDAY",
+        "MYSQL",
+        "OKTA",
+        "OPENSEARCH",
+        "ORACLE",
+        "PIPEDRIVE",
+        "POSTGRESQL",
+        "SAPHANA",
+        "SQLSERVER",
+        "SYNAPSE",
+        "TERADATA",
+        "TERADATANOS",
+        "TIMESTREAM",
+        "TPCDS",
+        "VERTICA"
       ]
     },
     "ConnectionTypeBrief":{
diff --git a/services/grafana/pom.xml b/services/grafana/pom.xml
index 089977610fba..caf1db0b98ea 100644
--- a/services/grafana/pom.xml
+++ b/services/grafana/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>grafana</artifactId>
     <name>AWS Java SDK :: Services :: Grafana</name>
diff --git a/services/greengrass/pom.xml b/services/greengrass/pom.xml
index 973f9f88fdf3..e7abf91b1e67 100644
--- a/services/greengrass/pom.xml
+++ b/services/greengrass/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>greengrass</artifactId>
     <name>AWS Java SDK :: Services :: AWS Greengrass</name>
diff --git a/services/greengrassv2/pom.xml b/services/greengrassv2/pom.xml
index 8abae9122e0b..ac1129ad79f8 100644
--- a/services/greengrassv2/pom.xml
+++ b/services/greengrassv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>greengrassv2</artifactId>
     <name>AWS Java SDK :: Services :: Greengrass V2</name>
diff --git a/services/groundstation/pom.xml b/services/groundstation/pom.xml
index 31ca92dcfa9c..f923f1c575d0 100644
--- a/services/groundstation/pom.xml
+++ b/services/groundstation/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>groundstation</artifactId>
     <name>AWS Java SDK :: Services :: GroundStation</name>
diff --git a/services/guardduty/pom.xml b/services/guardduty/pom.xml
index 916a3b2d55c6..6a6247ffcd96 100644
--- a/services/guardduty/pom.xml
+++ b/services/guardduty/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>guardduty</artifactId>
diff --git a/services/guardduty/src/main/resources/codegen-resources/service-2.json b/services/guardduty/src/main/resources/codegen-resources/service-2.json
index 36ec021a1e2b..3ff3920c8f11 100644
--- a/services/guardduty/src/main/resources/codegen-resources/service-2.json
+++ b/services/guardduty/src/main/resources/codegen-resources/service-2.json
@@ -1472,7 +1472,7 @@
         },
         "Email":{
           "shape":"Email",
-          "documentation":"<p>The email address of the member account.</p> <p>The rules for a valid email address:</p> <ul> <li> <p>The email address must be a minimum of 6 and a maximum of 64 characters long.</p> </li> <li> <p>All characters must be 7-bit ASCII characters.</p> </li> <li> <p>There must be one and only one @ symbol, which separates the local name from the domain name.</p> </li> <li> <p>The local name can't contain any of the following characters:</p> <p>whitespace, \" ' ( ) &lt; &gt; [ ] : ' , \\ | % &amp;</p> </li> <li> <p>The local name can't begin with a dot (.).</p> </li> <li> <p>The domain name can consist of only the characters [a-z], [A-Z], [0-9], hyphen (-), or dot (.).</p> </li> <li> <p>The domain name can't begin or end with a dot (.) or hyphen (-).</p> </li> <li> <p>The domain name must contain at least one dot. </p> </li> </ul>",
+          "documentation":"<p>The email address of the member account. The following list includes the rules for a valid email address:</p> <ul> <li> <p>The email address must be a minimum of 6 and a maximum of 64 characters long.</p> </li> <li> <p>All characters must be 7-bit ASCII characters.</p> </li> <li> <p>There must be one and only one @ symbol, which separates the local name from the domain name.</p> </li> <li> <p>The local name can't contain any of the following characters:</p> <p>whitespace, \" ' ( ) &lt; &gt; [ ] : ' , \\ | % &amp;</p> </li> <li> <p>The local name can't begin with a dot (.).</p> </li> <li> <p>The domain name can consist of only the characters [a-z], [A-Z], [0-9], hyphen (-), or dot (.).</p> </li> <li> <p>The domain name can't begin or end with a dot (.) or hyphen (-).</p> </li> <li> <p>The domain name must contain at least one dot. </p> </li> </ul>",
           "locationName":"email"
         }
       },
diff --git a/services/health/pom.xml b/services/health/pom.xml
index c75020bfdd2b..81edbd291d79 100644
--- a/services/health/pom.xml
+++ b/services/health/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>health</artifactId>
     <name>AWS Java SDK :: Services :: AWS Health APIs and Notifications</name>
diff --git a/services/healthlake/pom.xml b/services/healthlake/pom.xml
index cb0ee8dfa6f6..749c60a127d7 100644
--- a/services/healthlake/pom.xml
+++ b/services/healthlake/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>healthlake</artifactId>
     <name>AWS Java SDK :: Services :: Health Lake</name>
diff --git a/services/iam/pom.xml b/services/iam/pom.xml
index f1c04709556b..7324b509f785 100644
--- a/services/iam/pom.xml
+++ b/services/iam/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iam</artifactId>
     <name>AWS Java SDK :: Services :: AWS IAM</name>
diff --git a/services/identitystore/pom.xml b/services/identitystore/pom.xml
index 31e5367216fd..e3ac217dec28 100644
--- a/services/identitystore/pom.xml
+++ b/services/identitystore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>identitystore</artifactId>
     <name>AWS Java SDK :: Services :: Identitystore</name>
diff --git a/services/imagebuilder/pom.xml b/services/imagebuilder/pom.xml
index 9550682e3c1f..af05e5054831 100644
--- a/services/imagebuilder/pom.xml
+++ b/services/imagebuilder/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>imagebuilder</artifactId>
     <name>AWS Java SDK :: Services :: Imagebuilder</name>
diff --git a/services/imagebuilder/src/main/resources/codegen-resources/service-2.json b/services/imagebuilder/src/main/resources/codegen-resources/service-2.json
index 2b9f42135eb0..04416dcbebcd 100644
--- a/services/imagebuilder/src/main/resources/codegen-resources/service-2.json
+++ b/services/imagebuilder/src/main/resources/codegen-resources/service-2.json
@@ -5805,7 +5805,6 @@
     },
     "ListComponentBuildVersionsRequest":{
       "type":"structure",
-      "required":["componentVersionArn"],
       "members":{
         "componentVersionArn":{
           "shape":"ComponentVersionArn",
@@ -5958,7 +5957,6 @@
     },
     "ListImageBuildVersionsRequest":{
       "type":"structure",
-      "required":["imageVersionArn"],
       "members":{
         "imageVersionArn":{
           "shape":"ImageVersionArn",
@@ -6451,7 +6449,6 @@
     },
     "ListWorkflowBuildVersionsRequest":{
       "type":"structure",
-      "required":["workflowVersionArn"],
       "members":{
         "workflowVersionArn":{
           "shape":"WorkflowWildcardVersionArn",
diff --git a/services/inspector/pom.xml b/services/inspector/pom.xml
index 331992117bfa..2675170caba8 100644
--- a/services/inspector/pom.xml
+++ b/services/inspector/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>inspector</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Inspector Service</name>
diff --git a/services/inspector2/pom.xml b/services/inspector2/pom.xml
index 00c576f4c85f..908f1a8c53b9 100644
--- a/services/inspector2/pom.xml
+++ b/services/inspector2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>inspector2</artifactId>
     <name>AWS Java SDK :: Services :: Inspector2</name>
diff --git a/services/inspectorscan/pom.xml b/services/inspectorscan/pom.xml
index 626e82033d06..55e7314729c3 100644
--- a/services/inspectorscan/pom.xml
+++ b/services/inspectorscan/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>inspectorscan</artifactId>
     <name>AWS Java SDK :: Services :: Inspector Scan</name>
diff --git a/services/internetmonitor/pom.xml b/services/internetmonitor/pom.xml
index 36d744f1c01c..1df6591f3da1 100644
--- a/services/internetmonitor/pom.xml
+++ b/services/internetmonitor/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>internetmonitor</artifactId>
     <name>AWS Java SDK :: Services :: Internet Monitor</name>
diff --git a/services/invoicing/pom.xml b/services/invoicing/pom.xml
index 5ac3cb3a6baf..26bf39c90cde 100644
--- a/services/invoicing/pom.xml
+++ b/services/invoicing/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>invoicing</artifactId>
     <name>AWS Java SDK :: Services :: Invoicing</name>
diff --git a/services/iot/pom.xml b/services/iot/pom.xml
index afbabf8cec1a..7333447c93e3 100644
--- a/services/iot/pom.xml
+++ b/services/iot/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iot</artifactId>
     <name>AWS Java SDK :: Services :: AWS IoT</name>
diff --git a/services/iotanalytics/pom.xml b/services/iotanalytics/pom.xml
index 8eae83c28bd6..fc517b9be128 100644
--- a/services/iotanalytics/pom.xml
+++ b/services/iotanalytics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotanalytics</artifactId>
     <name>AWS Java SDK :: Services :: IoTAnalytics</name>
diff --git a/services/iotdataplane/pom.xml b/services/iotdataplane/pom.xml
index 2a794c834704..44d8e105161a 100644
--- a/services/iotdataplane/pom.xml
+++ b/services/iotdataplane/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotdataplane</artifactId>
     <name>AWS Java SDK :: Services :: AWS IoT Data Plane</name>
diff --git a/services/iotdeviceadvisor/pom.xml b/services/iotdeviceadvisor/pom.xml
index 0cd3cbcb80d6..d64b7dad3efe 100644
--- a/services/iotdeviceadvisor/pom.xml
+++ b/services/iotdeviceadvisor/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotdeviceadvisor</artifactId>
     <name>AWS Java SDK :: Services :: Iot Device Advisor</name>
diff --git a/services/iotevents/pom.xml b/services/iotevents/pom.xml
index ddee84d7a330..9db9681aa062 100644
--- a/services/iotevents/pom.xml
+++ b/services/iotevents/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotevents</artifactId>
     <name>AWS Java SDK :: Services :: IoT Events</name>
diff --git a/services/ioteventsdata/pom.xml b/services/ioteventsdata/pom.xml
index b83e7e941c39..6159fae55388 100644
--- a/services/ioteventsdata/pom.xml
+++ b/services/ioteventsdata/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ioteventsdata</artifactId>
     <name>AWS Java SDK :: Services :: IoT Events Data</name>
diff --git a/services/iotfleethub/pom.xml b/services/iotfleethub/pom.xml
index 8547909a2798..e53dfc671a57 100644
--- a/services/iotfleethub/pom.xml
+++ b/services/iotfleethub/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotfleethub</artifactId>
     <name>AWS Java SDK :: Services :: Io T Fleet Hub</name>
diff --git a/services/iotfleetwise/pom.xml b/services/iotfleetwise/pom.xml
index ea687ec1132c..89174b6415b9 100644
--- a/services/iotfleetwise/pom.xml
+++ b/services/iotfleetwise/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotfleetwise</artifactId>
     <name>AWS Java SDK :: Services :: Io T Fleet Wise</name>
diff --git a/services/iotjobsdataplane/pom.xml b/services/iotjobsdataplane/pom.xml
index 53c831bf0513..5242eb5c1559 100644
--- a/services/iotjobsdataplane/pom.xml
+++ b/services/iotjobsdataplane/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotjobsdataplane</artifactId>
     <name>AWS Java SDK :: Services :: IoT Jobs Data Plane</name>
diff --git a/services/iotmanagedintegrations/pom.xml b/services/iotmanagedintegrations/pom.xml
index 286477c28787..69df2a484612 100644
--- a/services/iotmanagedintegrations/pom.xml
+++ b/services/iotmanagedintegrations/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotmanagedintegrations</artifactId>
     <name>AWS Java SDK :: Services :: IoT Managed Integrations</name>
diff --git a/services/iotsecuretunneling/pom.xml b/services/iotsecuretunneling/pom.xml
index 6ae85d3b3b0d..8b31f3cda423 100644
--- a/services/iotsecuretunneling/pom.xml
+++ b/services/iotsecuretunneling/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotsecuretunneling</artifactId>
     <name>AWS Java SDK :: Services :: IoTSecureTunneling</name>
diff --git a/services/iotsitewise/pom.xml b/services/iotsitewise/pom.xml
index c7796bd2b45c..a8abeed7d6e8 100644
--- a/services/iotsitewise/pom.xml
+++ b/services/iotsitewise/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotsitewise</artifactId>
     <name>AWS Java SDK :: Services :: Io T Site Wise</name>
diff --git a/services/iotthingsgraph/pom.xml b/services/iotthingsgraph/pom.xml
index c47837d52e56..878148f55f40 100644
--- a/services/iotthingsgraph/pom.xml
+++ b/services/iotthingsgraph/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotthingsgraph</artifactId>
     <name>AWS Java SDK :: Services :: IoTThingsGraph</name>
diff --git a/services/iottwinmaker/pom.xml b/services/iottwinmaker/pom.xml
index 8af820192d25..aec72857c701 100644
--- a/services/iottwinmaker/pom.xml
+++ b/services/iottwinmaker/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iottwinmaker</artifactId>
     <name>AWS Java SDK :: Services :: Io T Twin Maker</name>
diff --git a/services/iotwireless/pom.xml b/services/iotwireless/pom.xml
index 5998539acd4e..70e6523188ed 100644
--- a/services/iotwireless/pom.xml
+++ b/services/iotwireless/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>iotwireless</artifactId>
     <name>AWS Java SDK :: Services :: IoT Wireless</name>
diff --git a/services/ivs/pom.xml b/services/ivs/pom.xml
index 1c1c62efcd35..8a22439eed26 100644
--- a/services/ivs/pom.xml
+++ b/services/ivs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ivs</artifactId>
     <name>AWS Java SDK :: Services :: Ivs</name>
diff --git a/services/ivschat/pom.xml b/services/ivschat/pom.xml
index 947949034c9d..310a50608e61 100644
--- a/services/ivschat/pom.xml
+++ b/services/ivschat/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ivschat</artifactId>
     <name>AWS Java SDK :: Services :: Ivschat</name>
diff --git a/services/ivsrealtime/pom.xml b/services/ivsrealtime/pom.xml
index 3fede36a2f0a..6b334f7b0a71 100644
--- a/services/ivsrealtime/pom.xml
+++ b/services/ivsrealtime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ivsrealtime</artifactId>
     <name>AWS Java SDK :: Services :: IVS Real Time</name>
diff --git a/services/ivsrealtime/src/main/resources/codegen-resources/service-2.json b/services/ivsrealtime/src/main/resources/codegen-resources/service-2.json
index 2a82fdd4ada3..5ba7b327f042 100644
--- a/services/ivsrealtime/src/main/resources/codegen-resources/service-2.json
+++ b/services/ivsrealtime/src/main/resources/codegen-resources/service-2.json
@@ -1534,7 +1534,7 @@
         },
         "replica":{
           "shape":"Replica",
-          "documentation":"<p>If true, this indicates the <code>participantId</code> is a replicated participant. If this is a subscribe event, then this flag refers to <code>remoteParticipantId</code>.</p>"
+          "documentation":"<p>If true, this indicates the <code>participantId</code> is a replicated participant. If this is a subscribe event, then this flag refers to <code>remoteParticipantId</code>. Default: <code>false</code>.</p>"
         }
       },
       "documentation":"<p>An occurrence during a stage session.</p>"
@@ -1777,6 +1777,10 @@
         "gridGap":{
           "shape":"GridGap",
           "documentation":"<p>Specifies the spacing between participant tiles in pixels. Default: <code>2</code>.</p>"
+        },
+        "participantOrderAttribute":{
+          "shape":"AttributeKey",
+          "documentation":"<p>Attribute name in <a>ParticipantTokenConfiguration</a> identifying the participant ordering key. Participants with <code>participantOrderAttribute</code> set to <code>\"\"</code> or not specified are ordered based on their arrival time into the stage.</p>"
         }
       },
       "documentation":"<p>Configuration information specific to Grid layout, for server-side composition. See \"Layouts\" in <a href=\"https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/server-side-composition.html\">Server-Side Composition</a>.</p>"
@@ -2732,7 +2736,7 @@
         },
         "sourceStageArn":{
           "shape":"StageArn",
-          "documentation":"<p>ARN of the stage from which this participant is replicated.</p>"
+          "documentation":"<p>Source stage ARN from which this participant is replicated, if <code>replicationType</code> is <code>REPLICA</code>.</p>"
         },
         "sourceSessionId":{
           "shape":"StageSessionId",
@@ -2980,6 +2984,10 @@
         "pipHeight":{
           "shape":"PipHeight",
           "documentation":"<p>Specifies the height of the PiP window in pixels. When this is not set explicitly, <code>pipHeight</code>’s value will be based on the size of the composition and the aspect ratio of the participant’s video.</p>"
+        },
+        "participantOrderAttribute":{
+          "shape":"AttributeKey",
+          "documentation":"<p>Attribute name in <a>ParticipantTokenConfiguration</a> identifying the participant ordering key. Participants with <code>participantOrderAttribute</code> set to <code>\"\"</code> or not specified are ordered based on their arrival time into the stage.</p>"
         }
       },
       "documentation":"<p>Configuration information specific to Picture-in-Picture (PiP) layout, for <a href=\"https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/server-side-composition.html\">server-side composition</a>. </p>"
diff --git a/services/kafka/pom.xml b/services/kafka/pom.xml
index 72e788d5dd99..68cc6928f0e2 100644
--- a/services/kafka/pom.xml
+++ b/services/kafka/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kafka</artifactId>
     <name>AWS Java SDK :: Services :: Kafka</name>
diff --git a/services/kafkaconnect/pom.xml b/services/kafkaconnect/pom.xml
index a24d17871280..14a778c48e3a 100644
--- a/services/kafkaconnect/pom.xml
+++ b/services/kafkaconnect/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kafkaconnect</artifactId>
     <name>AWS Java SDK :: Services :: Kafka Connect</name>
diff --git a/services/kendra/pom.xml b/services/kendra/pom.xml
index afe4feb5f24b..7b0b098e2c27 100644
--- a/services/kendra/pom.xml
+++ b/services/kendra/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kendra</artifactId>
     <name>AWS Java SDK :: Services :: Kendra</name>
diff --git a/services/kendraranking/pom.xml b/services/kendraranking/pom.xml
index f9296c5a548b..02867ac5da53 100644
--- a/services/kendraranking/pom.xml
+++ b/services/kendraranking/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kendraranking</artifactId>
     <name>AWS Java SDK :: Services :: Kendra Ranking</name>
diff --git a/services/kendraranking/src/main/resources/codegen-resources/endpoint-rule-set.json b/services/kendraranking/src/main/resources/codegen-resources/endpoint-rule-set.json
index 18515f8ee546..bbea4b7e3b5b 100644
--- a/services/kendraranking/src/main/resources/codegen-resources/endpoint-rule-set.json
+++ b/services/kendraranking/src/main/resources/codegen-resources/endpoint-rule-set.json
@@ -33,7 +33,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -61,7 +60,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -74,7 +74,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -88,7 +87,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -108,7 +106,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -122,14 +119,12 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "booleanEquals",
                                                     "argv": [
-                                                        true,
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -138,11 +133,11 @@
                                                                 },
                                                                 "supportsFIPS"
                                                             ]
-                                                        }
+                                                        },
+                                                        true
                                                     ]
                                                 }
                                             ],
-                                            "type": "tree",
                                             "rules": [
                                                 {
                                                     "conditions": [],
@@ -153,14 +148,16 @@
                                                     },
                                                     "type": "endpoint"
                                                 }
-                                            ]
+                                            ],
+                                            "type": "tree"
                                         },
                                         {
                                             "conditions": [],
                                             "error": "FIPS is enabled but this partition does not support FIPS",
                                             "type": "error"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
@@ -171,7 +168,8 @@
                                     },
                                     "type": "endpoint"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -185,14 +183,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -201,11 +197,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -216,14 +212,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -234,9 +232,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/services/kendraranking/src/main/resources/codegen-resources/service-2.json b/services/kendraranking/src/main/resources/codegen-resources/service-2.json
index e2e6bbeed0ab..b719aaa64f03 100644
--- a/services/kendraranking/src/main/resources/codegen-resources/service-2.json
+++ b/services/kendraranking/src/main/resources/codegen-resources/service-2.json
@@ -5,13 +5,15 @@
     "endpointPrefix":"kendra-ranking",
     "jsonVersion":"1.0",
     "protocol":"json",
+    "protocols":["json"],
     "serviceAbbreviation":"Kendra Ranking",
     "serviceFullName":"Amazon Kendra Intelligent Ranking",
     "serviceId":"Kendra Ranking",
     "signatureVersion":"v4",
     "signingName":"kendra-ranking",
     "targetPrefix":"AWSKendraRerankingFrontendService",
-    "uid":"kendra-ranking-2022-10-19"
+    "uid":"kendra-ranking-2022-10-19",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "CreateRescoreExecutionPlan":{
@@ -673,8 +675,7 @@
     },
     "TagResourceResponse":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "documentation":"<p>If the action is successful, the service sends back an HTTP 200 response with an empty HTTP body.</p>"
     },
     "TagValue":{
@@ -721,8 +722,7 @@
     },
     "UntagResourceResponse":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "documentation":"<p>If the action is successful, the service sends back an HTTP 200 response with an empty HTTP body.</p>"
     },
     "UpdateRescoreExecutionPlanRequest":{
diff --git a/services/keyspaces/pom.xml b/services/keyspaces/pom.xml
index 1c152961150d..1595c45f8bcb 100644
--- a/services/keyspaces/pom.xml
+++ b/services/keyspaces/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>keyspaces</artifactId>
     <name>AWS Java SDK :: Services :: Keyspaces</name>
diff --git a/services/keyspacesstreams/pom.xml b/services/keyspacesstreams/pom.xml
index f642e7859a28..fc87bda0aa4e 100644
--- a/services/keyspacesstreams/pom.xml
+++ b/services/keyspacesstreams/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>keyspacesstreams</artifactId>
     <name>AWS Java SDK :: Services :: Keyspaces Streams</name>
diff --git a/services/kinesis/pom.xml b/services/kinesis/pom.xml
index ff464c5da3f4..1e2340bf2db8 100644
--- a/services/kinesis/pom.xml
+++ b/services/kinesis/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kinesis</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Kinesis</name>
diff --git a/services/kinesisanalytics/pom.xml b/services/kinesisanalytics/pom.xml
index 2ba984e12ada..f2016d027e38 100644
--- a/services/kinesisanalytics/pom.xml
+++ b/services/kinesisanalytics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisanalytics</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Kinesis Analytics</name>
diff --git a/services/kinesisanalyticsv2/pom.xml b/services/kinesisanalyticsv2/pom.xml
index 5afa930d2441..5aa5ceb6474e 100644
--- a/services/kinesisanalyticsv2/pom.xml
+++ b/services/kinesisanalyticsv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisanalyticsv2</artifactId>
     <name>AWS Java SDK :: Services :: Kinesis Analytics V2</name>
diff --git a/services/kinesisvideo/pom.xml b/services/kinesisvideo/pom.xml
index 96a6f2dc35a1..0e8f7e7a22b6 100644
--- a/services/kinesisvideo/pom.xml
+++ b/services/kinesisvideo/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kinesisvideo</artifactId>
diff --git a/services/kinesisvideoarchivedmedia/pom.xml b/services/kinesisvideoarchivedmedia/pom.xml
index 212a9d46ae73..47ae7bbaa442 100644
--- a/services/kinesisvideoarchivedmedia/pom.xml
+++ b/services/kinesisvideoarchivedmedia/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisvideoarchivedmedia</artifactId>
     <name>AWS Java SDK :: Services :: Kinesis Video Archived Media</name>
diff --git a/services/kinesisvideomedia/pom.xml b/services/kinesisvideomedia/pom.xml
index 7c3f8d0d7f02..8f28e9f573e4 100644
--- a/services/kinesisvideomedia/pom.xml
+++ b/services/kinesisvideomedia/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisvideomedia</artifactId>
     <name>AWS Java SDK :: Services :: Kinesis Video Media</name>
diff --git a/services/kinesisvideosignaling/pom.xml b/services/kinesisvideosignaling/pom.xml
index 06096340e7d5..a159a3665fe8 100644
--- a/services/kinesisvideosignaling/pom.xml
+++ b/services/kinesisvideosignaling/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisvideosignaling</artifactId>
     <name>AWS Java SDK :: Services :: Kinesis Video Signaling</name>
diff --git a/services/kinesisvideowebrtcstorage/pom.xml b/services/kinesisvideowebrtcstorage/pom.xml
index 5aac836c8acb..65f39ee7454b 100644
--- a/services/kinesisvideowebrtcstorage/pom.xml
+++ b/services/kinesisvideowebrtcstorage/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisvideowebrtcstorage</artifactId>
     <name>AWS Java SDK :: Services :: Kinesis Video Web RTC Storage</name>
diff --git a/services/kms/pom.xml b/services/kms/pom.xml
index 75631833ab4e..3e0d52b21203 100644
--- a/services/kms/pom.xml
+++ b/services/kms/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>kms</artifactId>
     <name>AWS Java SDK :: Services :: AWS KMS</name>
diff --git a/services/kms/src/main/resources/codegen-resources/service-2.json b/services/kms/src/main/resources/codegen-resources/service-2.json
index b2f27620ab44..3ea755ff1609 100644
--- a/services/kms/src/main/resources/codegen-resources/service-2.json
+++ b/services/kms/src/main/resources/codegen-resources/service-2.json
@@ -163,7 +163,7 @@
         {"shape":"KMSInvalidStateException"},
         {"shape":"DryRunOperationException"}
       ],
-      "documentation":"<p>Decrypts ciphertext that was encrypted by a KMS key using any of the following operations:</p> <ul> <li> <p> <a>Encrypt</a> </p> </li> <li> <p> <a>GenerateDataKey</a> </p> </li> <li> <p> <a>GenerateDataKeyPair</a> </p> </li> <li> <p> <a>GenerateDataKeyWithoutPlaintext</a> </p> </li> <li> <p> <a>GenerateDataKeyPairWithoutPlaintext</a> </p> </li> </ul> <p>You can use this operation to decrypt ciphertext that was encrypted under a symmetric encryption KMS key or an asymmetric encryption KMS key. When the KMS key is asymmetric, you must specify the KMS key and the encryption algorithm that was used to encrypt the ciphertext. For information about asymmetric KMS keys, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Asymmetric KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>The <code>Decrypt</code> operation also decrypts ciphertext that was encrypted outside of KMS by the public key in an KMS asymmetric KMS key. However, it cannot decrypt symmetric ciphertext produced by other libraries, such as the <a href=\"https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/\">Amazon Web Services Encryption SDK</a> or <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingClientSideEncryption.html\">Amazon S3 client-side encryption</a>. These libraries return a ciphertext format that is incompatible with KMS.</p> <p>If the ciphertext was encrypted under a symmetric encryption KMS key, the <code>KeyId</code> parameter is optional. KMS can get this information from metadata that it adds to the symmetric ciphertext blob. This feature adds durability to your implementation by ensuring that authorized users can decrypt ciphertext decades after it was encrypted, even if they've lost track of the key ID. However, specifying the KMS key is always recommended as a best practice. When you use the <code>KeyId</code> parameter to specify a KMS key, KMS only uses the KMS key you specify. If the ciphertext was encrypted under a different KMS key, the <code>Decrypt</code> operation fails. This practice ensures that you use the KMS key that you intend.</p> <p>Whenever possible, use key policies to give users permission to call the <code>Decrypt</code> operation on a particular KMS key, instead of using IAM policies. Otherwise, you might create an IAM policy that gives the user <code>Decrypt</code> permission on all KMS keys. This user could decrypt ciphertext that was encrypted by KMS keys in other accounts if the key policy for the cross-account KMS key permits it. If you must use an IAM policy for <code>Decrypt</code> permissions, limit the user to particular KMS keys or particular trusted accounts. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/iam-policies.html#iam-policies-best-practices\">Best practices for IAM policies</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <code>Decrypt</code> also supports <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html\">Amazon Web Services Nitro Enclaves</a>, which provide an isolated compute environment in Amazon EC2. To call <code>Decrypt</code> for a Nitro enclave, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK. Use the <code>Recipient</code> parameter to provide the attestation document for the enclave. Instead of the plaintext data, the response includes the plaintext data encrypted with the public key from the attestation document (<code>CiphertextForRecipient</code>). For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>The KMS key that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">Key states of KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <b>Cross-account use</b>: Yes. If you use the <code>KeyId</code> parameter to identify a KMS key in a different Amazon Web Services account, specify the key ARN or the alias ARN of the KMS key.</p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:Decrypt</a> (key policy)</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>Encrypt</a> </p> </li> <li> <p> <a>GenerateDataKey</a> </p> </li> <li> <p> <a>GenerateDataKeyPair</a> </p> </li> <li> <p> <a>ReEncrypt</a> </p> </li> </ul> <p> <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/accessing-kms.html#programming-eventual-consistency\">KMS eventual consistency</a>.</p>"
+      "documentation":"<p>Decrypts ciphertext that was encrypted by a KMS key using any of the following operations:</p> <ul> <li> <p> <a>Encrypt</a> </p> </li> <li> <p> <a>GenerateDataKey</a> </p> </li> <li> <p> <a>GenerateDataKeyPair</a> </p> </li> <li> <p> <a>GenerateDataKeyWithoutPlaintext</a> </p> </li> <li> <p> <a>GenerateDataKeyPairWithoutPlaintext</a> </p> </li> </ul> <p>You can use this operation to decrypt ciphertext that was encrypted under a symmetric encryption KMS key or an asymmetric encryption KMS key. When the KMS key is asymmetric, you must specify the KMS key and the encryption algorithm that was used to encrypt the ciphertext. For information about asymmetric KMS keys, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Asymmetric KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>The <code>Decrypt</code> operation also decrypts ciphertext that was encrypted outside of KMS by the public key in an KMS asymmetric KMS key. However, it cannot decrypt symmetric ciphertext produced by other libraries, such as the <a href=\"https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/\">Amazon Web Services Encryption SDK</a> or <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingClientSideEncryption.html\">Amazon S3 client-side encryption</a>. These libraries return a ciphertext format that is incompatible with KMS.</p> <p>If the ciphertext was encrypted under a symmetric encryption KMS key, the <code>KeyId</code> parameter is optional. KMS can get this information from metadata that it adds to the symmetric ciphertext blob. This feature adds durability to your implementation by ensuring that authorized users can decrypt ciphertext decades after it was encrypted, even if they've lost track of the key ID. However, specifying the KMS key is always recommended as a best practice. When you use the <code>KeyId</code> parameter to specify a KMS key, KMS only uses the KMS key you specify. If the ciphertext was encrypted under a different KMS key, the <code>Decrypt</code> operation fails. This practice ensures that you use the KMS key that you intend.</p> <p>Whenever possible, use key policies to give users permission to call the <code>Decrypt</code> operation on a particular KMS key, instead of using IAM policies. Otherwise, you might create an IAM policy that gives the user <code>Decrypt</code> permission on all KMS keys. This user could decrypt ciphertext that was encrypted by KMS keys in other accounts if the key policy for the cross-account KMS key permits it. If you must use an IAM policy for <code>Decrypt</code> permissions, limit the user to particular KMS keys or particular trusted accounts. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/iam-policies.html#iam-policies-best-practices\">Best practices for IAM policies</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <code>Decrypt</code> also supports <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html\">Amazon Web Services Nitro Enclaves</a> and NitroTPM, which provide attested environments in Amazon EC2. To call <code>Decrypt</code> for a Nitro enclave or NitroTPM, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK. Use the <code>Recipient</code> parameter to provide the attestation document for the attested environment. Instead of the plaintext data, the response includes the plaintext data encrypted with the public key from the attestation document (<code>CiphertextForRecipient</code>). For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>The KMS key that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">Key states of KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <b>Cross-account use</b>: Yes. If you use the <code>KeyId</code> parameter to identify a KMS key in a different Amazon Web Services account, specify the key ARN or the alias ARN of the KMS key.</p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:Decrypt</a> (key policy)</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>Encrypt</a> </p> </li> <li> <p> <a>GenerateDataKey</a> </p> </li> <li> <p> <a>GenerateDataKeyPair</a> </p> </li> <li> <p> <a>ReEncrypt</a> </p> </li> </ul> <p> <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/accessing-kms.html#programming-eventual-consistency\">KMS eventual consistency</a>.</p>"
     },
     "DeleteAlias":{
       "name":"DeleteAlias",
@@ -390,7 +390,7 @@
         {"shape":"KMSInvalidStateException"},
         {"shape":"DryRunOperationException"}
       ],
-      "documentation":"<p>Returns a unique symmetric data key for use outside of KMS. This operation returns a plaintext copy of the data key and a copy that is encrypted under a symmetric encryption KMS key that you specify. The bytes in the plaintext key are random; they are not related to the caller or the KMS key. You can use the plaintext key to encrypt your data outside of KMS and store the encrypted data key with the encrypted data.</p> <p>To generate a data key, specify the symmetric encryption KMS key that will be used to encrypt the data key. You cannot use an asymmetric KMS key to encrypt data keys. To get the type of your KMS key, use the <a>DescribeKey</a> operation.</p> <p>You must also specify the length of the data key. Use either the <code>KeySpec</code> or <code>NumberOfBytes</code> parameters (but not both). For 128-bit and 256-bit data keys, use the <code>KeySpec</code> parameter.</p> <p>To generate a 128-bit SM4 data key (China Regions only), specify a <code>KeySpec</code> value of <code>AES_128</code> or a <code>NumberOfBytes</code> value of <code>16</code>. The symmetric encryption key used in China Regions to encrypt your data key is an SM4 encryption key.</p> <p>To get only an encrypted copy of the data key, use <a>GenerateDataKeyWithoutPlaintext</a>. To generate an asymmetric data key pair, use the <a>GenerateDataKeyPair</a> or <a>GenerateDataKeyPairWithoutPlaintext</a> operation. To get a cryptographically secure random byte string, use <a>GenerateRandom</a>.</p> <p>You can use an optional encryption context to add additional security to the encryption operation. If you specify an <code>EncryptionContext</code>, you must specify the same encryption context (a case-sensitive exact match) when decrypting the encrypted data key. Otherwise, the request to decrypt fails with an <code>InvalidCiphertextException</code>. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/encrypt_context.html\">Encryption Context</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <code>GenerateDataKey</code> also supports <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html\">Amazon Web Services Nitro Enclaves</a>, which provide an isolated compute environment in Amazon EC2. To call <code>GenerateDataKey</code> for an Amazon Web Services Nitro enclave, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK. Use the <code>Recipient</code> parameter to provide the attestation document for the enclave. <code>GenerateDataKey</code> returns a copy of the data key encrypted under the specified KMS key, as usual. But instead of a plaintext copy of the data key, the response includes a copy of the data key encrypted under the public key from the attestation document (<code>CiphertextForRecipient</code>). For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>..</p> <p>The KMS key that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">Key states of KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <b>How to use your data key</b> </p> <p>We recommend that you use the following pattern to encrypt data locally in your application. You can write your own code or use a client-side encryption library, such as the <a href=\"https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/\">Amazon Web Services Encryption SDK</a>, the <a href=\"https://docs.aws.amazon.com/dynamodb-encryption-client/latest/devguide/\">Amazon DynamoDB Encryption Client</a>, or <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingClientSideEncryption.html\">Amazon S3 client-side encryption</a> to do these tasks for you.</p> <p>To encrypt data outside of KMS:</p> <ol> <li> <p>Use the <code>GenerateDataKey</code> operation to get a data key.</p> </li> <li> <p>Use the plaintext data key (in the <code>Plaintext</code> field of the response) to encrypt your data outside of KMS. Then erase the plaintext data key from memory.</p> </li> <li> <p>Store the encrypted data key (in the <code>CiphertextBlob</code> field of the response) with the encrypted data.</p> </li> </ol> <p>To decrypt data outside of KMS:</p> <ol> <li> <p>Use the <a>Decrypt</a> operation to decrypt the encrypted data key. The operation returns a plaintext copy of the data key.</p> </li> <li> <p>Use the plaintext data key to decrypt data outside of KMS, then erase the plaintext data key from memory.</p> </li> </ol> <p> <b>Cross-account use</b>: Yes. To perform this operation with a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN in the value of the <code>KeyId</code> parameter.</p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:GenerateDataKey</a> (key policy)</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>Decrypt</a> </p> </li> <li> <p> <a>Encrypt</a> </p> </li> <li> <p> <a>GenerateDataKeyPair</a> </p> </li> <li> <p> <a>GenerateDataKeyPairWithoutPlaintext</a> </p> </li> <li> <p> <a>GenerateDataKeyWithoutPlaintext</a> </p> </li> </ul> <p> <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/accessing-kms.html#programming-eventual-consistency\">KMS eventual consistency</a>.</p>"
+      "documentation":"<p>Returns a unique symmetric data key for use outside of KMS. This operation returns a plaintext copy of the data key and a copy that is encrypted under a symmetric encryption KMS key that you specify. The bytes in the plaintext key are random; they are not related to the caller or the KMS key. You can use the plaintext key to encrypt your data outside of KMS and store the encrypted data key with the encrypted data.</p> <p>To generate a data key, specify the symmetric encryption KMS key that will be used to encrypt the data key. You cannot use an asymmetric KMS key to encrypt data keys. To get the type of your KMS key, use the <a>DescribeKey</a> operation.</p> <p>You must also specify the length of the data key. Use either the <code>KeySpec</code> or <code>NumberOfBytes</code> parameters (but not both). For 128-bit and 256-bit data keys, use the <code>KeySpec</code> parameter.</p> <p>To generate a 128-bit SM4 data key (China Regions only), specify a <code>KeySpec</code> value of <code>AES_128</code> or a <code>NumberOfBytes</code> value of <code>16</code>. The symmetric encryption key used in China Regions to encrypt your data key is an SM4 encryption key.</p> <p>To get only an encrypted copy of the data key, use <a>GenerateDataKeyWithoutPlaintext</a>. To generate an asymmetric data key pair, use the <a>GenerateDataKeyPair</a> or <a>GenerateDataKeyPairWithoutPlaintext</a> operation. To get a cryptographically secure random byte string, use <a>GenerateRandom</a>.</p> <p>You can use an optional encryption context to add additional security to the encryption operation. If you specify an <code>EncryptionContext</code>, you must specify the same encryption context (a case-sensitive exact match) when decrypting the encrypted data key. Otherwise, the request to decrypt fails with an <code>InvalidCiphertextException</code>. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/encrypt_context.html\">Encryption Context</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <code>GenerateDataKey</code> also supports <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html\">Amazon Web Services Nitro Enclaves</a>, which provide an isolated compute environment in Amazon EC2. To call <code>GenerateDataKey</code> for an Amazon Web Services Nitro enclave or NitroTPM, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK. Use the <code>Recipient</code> parameter to provide the attestation document for the attested environment. <code>GenerateDataKey</code> returns a copy of the data key encrypted under the specified KMS key, as usual. But instead of a plaintext copy of the data key, the response includes a copy of the data key encrypted under the public key from the attestation document (<code>CiphertextForRecipient</code>). For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>The KMS key that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">Key states of KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <b>How to use your data key</b> </p> <p>We recommend that you use the following pattern to encrypt data locally in your application. You can write your own code or use a client-side encryption library, such as the <a href=\"https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/\">Amazon Web Services Encryption SDK</a>, the <a href=\"https://docs.aws.amazon.com/dynamodb-encryption-client/latest/devguide/\">Amazon DynamoDB Encryption Client</a>, or <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingClientSideEncryption.html\">Amazon S3 client-side encryption</a> to do these tasks for you.</p> <p>To encrypt data outside of KMS:</p> <ol> <li> <p>Use the <code>GenerateDataKey</code> operation to get a data key.</p> </li> <li> <p>Use the plaintext data key (in the <code>Plaintext</code> field of the response) to encrypt your data outside of KMS. Then erase the plaintext data key from memory.</p> </li> <li> <p>Store the encrypted data key (in the <code>CiphertextBlob</code> field of the response) with the encrypted data.</p> </li> </ol> <p>To decrypt data outside of KMS:</p> <ol> <li> <p>Use the <a>Decrypt</a> operation to decrypt the encrypted data key. The operation returns a plaintext copy of the data key.</p> </li> <li> <p>Use the plaintext data key to decrypt data outside of KMS, then erase the plaintext data key from memory.</p> </li> </ol> <p> <b>Cross-account use</b>: Yes. To perform this operation with a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN in the value of the <code>KeyId</code> parameter.</p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:GenerateDataKey</a> (key policy)</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>Decrypt</a> </p> </li> <li> <p> <a>Encrypt</a> </p> </li> <li> <p> <a>GenerateDataKeyPair</a> </p> </li> <li> <p> <a>GenerateDataKeyPairWithoutPlaintext</a> </p> </li> <li> <p> <a>GenerateDataKeyWithoutPlaintext</a> </p> </li> </ul> <p> <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/accessing-kms.html#programming-eventual-consistency\">KMS eventual consistency</a>.</p>"
     },
     "GenerateDataKeyPair":{
       "name":"GenerateDataKeyPair",
@@ -412,7 +412,7 @@
         {"shape":"UnsupportedOperationException"},
         {"shape":"DryRunOperationException"}
       ],
-      "documentation":"<p>Returns a unique asymmetric data key pair for use outside of KMS. This operation returns a plaintext public key, a plaintext private key, and a copy of the private key that is encrypted under the symmetric encryption KMS key you specify. You can use the data key pair to perform asymmetric cryptography and implement digital signatures outside of KMS. The bytes in the keys are random; they are not related to the caller or to the KMS key that is used to encrypt the private key. </p> <p>You can use the public key that <code>GenerateDataKeyPair</code> returns to encrypt data or verify a signature outside of KMS. Then, store the encrypted private key with the data. When you are ready to decrypt data or sign a message, you can use the <a>Decrypt</a> operation to decrypt the encrypted private key.</p> <p>To generate a data key pair, you must specify a symmetric encryption KMS key to encrypt the private key in a data key pair. You cannot use an asymmetric KMS key or a KMS key in a custom key store. To get the type and origin of your KMS key, use the <a>DescribeKey</a> operation. </p> <p>Use the <code>KeyPairSpec</code> parameter to choose an RSA or Elliptic Curve (ECC) data key pair. In China Regions, you can also choose an SM2 data key pair. KMS recommends that you use ECC key pairs for signing, and use RSA and SM2 key pairs for either encryption or signing, but not both. However, KMS cannot enforce any restrictions on the use of data key pairs outside of KMS.</p> <p>If you are using the data key pair to encrypt data, or for any operation where you don't immediately need a private key, consider using the <a>GenerateDataKeyPairWithoutPlaintext</a> operation. <code>GenerateDataKeyPairWithoutPlaintext</code> returns a plaintext public key and an encrypted private key, but omits the plaintext private key that you need only to decrypt ciphertext or sign a message. Later, when you need to decrypt the data or sign a message, use the <a>Decrypt</a> operation to decrypt the encrypted private key in the data key pair.</p> <p> <code>GenerateDataKeyPair</code> returns a unique data key pair for each request. The bytes in the keys are random; they are not related to the caller or the KMS key that is used to encrypt the private key. The public key is a DER-encoded X.509 SubjectPublicKeyInfo, as specified in <a href=\"https://tools.ietf.org/html/rfc5280\">RFC 5280</a>. The private key is a DER-encoded PKCS8 PrivateKeyInfo, as specified in <a href=\"https://tools.ietf.org/html/rfc5958\">RFC 5958</a>.</p> <p> <code>GenerateDataKeyPair</code> also supports <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html\">Amazon Web Services Nitro Enclaves</a>, which provide an isolated compute environment in Amazon EC2. To call <code>GenerateDataKeyPair</code> for an Amazon Web Services Nitro enclave, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK. Use the <code>Recipient</code> parameter to provide the attestation document for the enclave. <code>GenerateDataKeyPair</code> returns the public data key and a copy of the private data key encrypted under the specified KMS key, as usual. But instead of a plaintext copy of the private data key (<code>PrivateKeyPlaintext</code>), the response includes a copy of the private data key encrypted under the public key from the attestation document (<code>CiphertextForRecipient</code>). For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>..</p> <p>You can use an optional encryption context to add additional security to the encryption operation. If you specify an <code>EncryptionContext</code>, you must specify the same encryption context (a case-sensitive exact match) when decrypting the encrypted data key. Otherwise, the request to decrypt fails with an <code>InvalidCiphertextException</code>. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/encrypt_context.html\">Encryption Context</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>The KMS key that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">Key states of KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <b>Cross-account use</b>: Yes. To perform this operation with a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN in the value of the <code>KeyId</code> parameter.</p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:GenerateDataKeyPair</a> (key policy)</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>Decrypt</a> </p> </li> <li> <p> <a>Encrypt</a> </p> </li> <li> <p> <a>GenerateDataKey</a> </p> </li> <li> <p> <a>GenerateDataKeyPairWithoutPlaintext</a> </p> </li> <li> <p> <a>GenerateDataKeyWithoutPlaintext</a> </p> </li> </ul> <p> <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/accessing-kms.html#programming-eventual-consistency\">KMS eventual consistency</a>.</p>"
+      "documentation":"<p>Returns a unique asymmetric data key pair for use outside of KMS. This operation returns a plaintext public key, a plaintext private key, and a copy of the private key that is encrypted under the symmetric encryption KMS key you specify. You can use the data key pair to perform asymmetric cryptography and implement digital signatures outside of KMS. The bytes in the keys are random; they are not related to the caller or to the KMS key that is used to encrypt the private key. </p> <p>You can use the public key that <code>GenerateDataKeyPair</code> returns to encrypt data or verify a signature outside of KMS. Then, store the encrypted private key with the data. When you are ready to decrypt data or sign a message, you can use the <a>Decrypt</a> operation to decrypt the encrypted private key.</p> <p>To generate a data key pair, you must specify a symmetric encryption KMS key to encrypt the private key in a data key pair. You cannot use an asymmetric KMS key or a KMS key in a custom key store. To get the type and origin of your KMS key, use the <a>DescribeKey</a> operation. </p> <p>Use the <code>KeyPairSpec</code> parameter to choose an RSA or Elliptic Curve (ECC) data key pair. In China Regions, you can also choose an SM2 data key pair. KMS recommends that you use ECC key pairs for signing, and use RSA and SM2 key pairs for either encryption or signing, but not both. However, KMS cannot enforce any restrictions on the use of data key pairs outside of KMS.</p> <p>If you are using the data key pair to encrypt data, or for any operation where you don't immediately need a private key, consider using the <a>GenerateDataKeyPairWithoutPlaintext</a> operation. <code>GenerateDataKeyPairWithoutPlaintext</code> returns a plaintext public key and an encrypted private key, but omits the plaintext private key that you need only to decrypt ciphertext or sign a message. Later, when you need to decrypt the data or sign a message, use the <a>Decrypt</a> operation to decrypt the encrypted private key in the data key pair.</p> <p> <code>GenerateDataKeyPair</code> returns a unique data key pair for each request. The bytes in the keys are random; they are not related to the caller or the KMS key that is used to encrypt the private key. The public key is a DER-encoded X.509 SubjectPublicKeyInfo, as specified in <a href=\"https://tools.ietf.org/html/rfc5280\">RFC 5280</a>. The private key is a DER-encoded PKCS8 PrivateKeyInfo, as specified in <a href=\"https://tools.ietf.org/html/rfc5958\">RFC 5958</a>.</p> <p> <code>GenerateDataKeyPair</code> also supports <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html\">Amazon Web Services Nitro Enclaves</a>, which provide an isolated compute environment in Amazon EC2. To call <code>GenerateDataKeyPair</code> for an Amazon Web Services Nitro enclave or NitroTPM, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK. Use the <code>Recipient</code> parameter to provide the attestation document for the attested environment. <code>GenerateDataKeyPair</code> returns the public data key and a copy of the private data key encrypted under the specified KMS key, as usual. But instead of a plaintext copy of the private data key (<code>PrivateKeyPlaintext</code>), the response includes a copy of the private data key encrypted under the public key from the attestation document (<code>CiphertextForRecipient</code>). For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>You can use an optional encryption context to add additional security to the encryption operation. If you specify an <code>EncryptionContext</code>, you must specify the same encryption context (a case-sensitive exact match) when decrypting the encrypted data key. Otherwise, the request to decrypt fails with an <code>InvalidCiphertextException</code>. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/encrypt_context.html\">Encryption Context</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>The KMS key that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">Key states of KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <b>Cross-account use</b>: Yes. To perform this operation with a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN in the value of the <code>KeyId</code> parameter.</p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:GenerateDataKeyPair</a> (key policy)</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>Decrypt</a> </p> </li> <li> <p> <a>Encrypt</a> </p> </li> <li> <p> <a>GenerateDataKey</a> </p> </li> <li> <p> <a>GenerateDataKeyPairWithoutPlaintext</a> </p> </li> <li> <p> <a>GenerateDataKeyWithoutPlaintext</a> </p> </li> </ul> <p> <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/accessing-kms.html#programming-eventual-consistency\">KMS eventual consistency</a>.</p>"
     },
     "GenerateDataKeyPairWithoutPlaintext":{
       "name":"GenerateDataKeyPairWithoutPlaintext",
@@ -492,7 +492,7 @@
         {"shape":"CustomKeyStoreNotFoundException"},
         {"shape":"CustomKeyStoreInvalidStateException"}
       ],
-      "documentation":"<p>Returns a random byte string that is cryptographically secure.</p> <p>You must use the <code>NumberOfBytes</code> parameter to specify the length of the random byte string. There is no default value for string length.</p> <p>By default, the random byte string is generated in KMS. To generate the byte string in the CloudHSM cluster associated with an CloudHSM key store, use the <code>CustomKeyStoreId</code> parameter.</p> <p> <code>GenerateRandom</code> also supports <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html\">Amazon Web Services Nitro Enclaves</a>, which provide an isolated compute environment in Amazon EC2. To call <code>GenerateRandom</code> for a Nitro enclave, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK. Use the <code>Recipient</code> parameter to provide the attestation document for the enclave. Instead of plaintext bytes, the response includes the plaintext bytes encrypted under the public key from the attestation document (<code>CiphertextForRecipient</code>).For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>For more information about entropy and random number generation, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-cryptography.html#entropy-and-random-numbers\">Entropy and random number generation</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <b>Cross-account use</b>: Not applicable. <code>GenerateRandom</code> does not use any account-specific resources, such as KMS keys.</p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:GenerateRandom</a> (IAM policy)</p> <p> <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/accessing-kms.html#programming-eventual-consistency\">KMS eventual consistency</a>.</p>"
+      "documentation":"<p>Returns a random byte string that is cryptographically secure.</p> <p>You must use the <code>NumberOfBytes</code> parameter to specify the length of the random byte string. There is no default value for string length.</p> <p>By default, the random byte string is generated in KMS. To generate the byte string in the CloudHSM cluster associated with an CloudHSM key store, use the <code>CustomKeyStoreId</code> parameter.</p> <p> <code>GenerateRandom</code> also supports <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave.html\">Amazon Web Services Nitro Enclaves</a>, which provide an isolated compute environment in Amazon EC2. To call <code>GenerateRandom</code> for a Nitro enclave or NitroTPM, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK. Use the <code>Recipient</code> parameter to provide the attestation document for the attested environment. Instead of plaintext bytes, the response includes the plaintext bytes encrypted under the public key from the attestation document (<code>CiphertextForRecipient</code>). For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p> <p>For more information about entropy and random number generation, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-cryptography.html#entropy-and-random-numbers\">Entropy and random number generation</a> in the <i>Key Management Service Developer Guide</i>.</p> <p> <b>Cross-account use</b>: Not applicable. <code>GenerateRandom</code> does not use any account-specific resources, such as KMS keys.</p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:GenerateRandom</a> (IAM policy)</p> <p> <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/accessing-kms.html#programming-eventual-consistency\">KMS eventual consistency</a>.</p>"
     },
     "GetKeyPolicy":{
       "name":"GetKeyPolicy",
@@ -1370,7 +1370,7 @@
         },
         "KeyUsage":{
           "shape":"KeyUsageType",
-          "documentation":"<p>Determines the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-cryptography.html#cryptographic-operations\">cryptographic operations</a> for which you can use the KMS key. The default value is <code>ENCRYPT_DECRYPT</code>. This parameter is optional when you are creating a symmetric encryption KMS key; otherwise, it is required. You can't change the <code>KeyUsage</code> value after the KMS key is created.</p> <p>Select only one valid value.</p> <ul> <li> <p>For symmetric encryption KMS keys, omit the parameter or specify <code>ENCRYPT_DECRYPT</code>.</p> </li> <li> <p>For HMAC KMS keys (symmetric), specify <code>GENERATE_VERIFY_MAC</code>.</p> </li> <li> <p>For asymmetric KMS keys with RSA key pairs, specify <code>ENCRYPT_DECRYPT</code> or <code>SIGN_VERIFY</code>.</p> </li> <li> <p>For asymmetric KMS keys with NIST-recommended elliptic curve key pairs, specify <code>SIGN_VERIFY</code> or <code>KEY_AGREEMENT</code>.</p> </li> <li> <p>For asymmetric KMS keys with <code>ECC_SECG_P256K1</code> key pairs, specify <code>SIGN_VERIFY</code>.</p> </li> <li> <p>For asymmetric KMS keys with ML-DSA key pairs, specify <code>SIGN_VERIFY</code>.</p> </li> <li> <p>For asymmetric KMS keys with SM2 key pairs (China Regions only), specify <code>ENCRYPT_DECRYPT</code>, <code>SIGN_VERIFY</code>, or <code>KEY_AGREEMENT</code>.</p> </li> </ul>"
+          "documentation":"<p>Determines the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-cryptography.html#cryptographic-operations\">cryptographic operations</a> for which you can use the KMS key. The default value is <code>ENCRYPT_DECRYPT</code>. This parameter is optional when you are creating a symmetric encryption KMS key; otherwise, it is required. You can't change the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html#key-usage\"> <code>KeyUsage</code> </a> value after the KMS key is created. Each KMS key can have only one key usage. This follows key usage best practices according to <a href=\"https://csrc.nist.gov/pubs/sp/800/57/pt1/r5/final\">NIST SP 800-57 Recommendations for Key Management</a>, section 5.2, Key usage.</p> <p>Select only one valid value.</p> <ul> <li> <p>For symmetric encryption KMS keys, omit the parameter or specify <code>ENCRYPT_DECRYPT</code>.</p> </li> <li> <p>For HMAC KMS keys (symmetric), specify <code>GENERATE_VERIFY_MAC</code>.</p> </li> <li> <p>For asymmetric KMS keys with RSA key pairs, specify <code>ENCRYPT_DECRYPT</code> or <code>SIGN_VERIFY</code>.</p> </li> <li> <p>For asymmetric KMS keys with NIST-recommended elliptic curve key pairs, specify <code>SIGN_VERIFY</code> or <code>KEY_AGREEMENT</code>.</p> </li> <li> <p>For asymmetric KMS keys with <code>ECC_SECG_P256K1</code> key pairs, specify <code>SIGN_VERIFY</code>.</p> </li> <li> <p>For asymmetric KMS keys with ML-DSA key pairs, specify <code>SIGN_VERIFY</code>.</p> </li> <li> <p>For asymmetric KMS keys with SM2 key pairs (China Regions only), specify <code>ENCRYPT_DECRYPT</code>, <code>SIGN_VERIFY</code>, or <code>KEY_AGREEMENT</code>.</p> </li> </ul>"
         },
         "CustomerMasterKeySpec":{
           "shape":"CustomerMasterKeySpec",
@@ -1579,7 +1579,7 @@
         },
         "Recipient":{
           "shape":"RecipientInfo",
-          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave-concepts.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave and the encryption algorithm to use with the enclave's public key. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter only supports attestation documents for Amazon Web Services Nitro Enclaves. To include this parameter, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK.</p> <p>When you use this parameter, instead of returning the plaintext data, KMS encrypts the plaintext data with the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the enclave. The <code>Plaintext</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/nitro-enclave-concepts.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave or NitroTPM, and the encryption algorithm to use with the public key in the attestation document. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter supports the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK for Amazon Web Services Nitro Enclaves. It supports any Amazon Web Services SDK for Amazon Web Services NitroTPM. </p> <p>When you use this parameter, instead of returning the plaintext data, KMS encrypts the plaintext data with the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the attested environment. The <code>Plaintext</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         },
         "DryRun":{
           "shape":"NullableBooleanType",
@@ -1604,7 +1604,7 @@
         },
         "CiphertextForRecipient":{
           "shape":"CiphertextType",
-          "documentation":"<p>The plaintext data encrypted with the public key in the attestation document. </p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The plaintext data encrypted with the public key from the attestation document. This ciphertext can be decrypted only by using a private key from the attested environment. </p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave or NitroTPM. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         },
         "KeyMaterialId":{
           "shape":"BackingKeyIdType",
@@ -1702,7 +1702,7 @@
         },
         "Recipient":{
           "shape":"RecipientInfo",
-          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave-how.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave and the encryption algorithm to use with the enclave's public key. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter only supports attestation documents for Amazon Web Services Nitro Enclaves. To call DeriveSharedSecret for an Amazon Web Services Nitro Enclaves, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> to generate the attestation document and then use the Recipient parameter from any Amazon Web Services SDK to provide the attestation document for the enclave.</p> <p>When you use this parameter, instead of returning a plaintext copy of the shared secret, KMS encrypts the plaintext shared secret under the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the enclave. The <code>CiphertextBlob</code> field in the response contains the encrypted shared secret derived from the KMS key specified by the <code>KeyId</code> parameter and public key specified by the <code>PublicKey</code> parameter. The <code>SharedSecret</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave-how.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave or NitroTPM, and the encryption algorithm to use with the public key in the attestation document. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter only supports attestation documents for Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM. To call DeriveSharedSecret generate an attestation document use either <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> for an Amazon Web Services Nitro Enclaves or <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/attestation-get-doc.html\">Amazon Web Services NitroTPM tools</a> for Amazon Web Services NitroTPM. Then use the Recipient parameter from any Amazon Web Services SDK to provide the attestation document for the attested environment.</p> <p>When you use this parameter, instead of returning a plaintext copy of the shared secret, KMS encrypts the plaintext shared secret under the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the attested environment. The <code>CiphertextBlob</code> field in the response contains the encrypted shared secret derived from the KMS key specified by the <code>KeyId</code> parameter and public key specified by the <code>PublicKey</code> parameter. The <code>SharedSecret</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         }
       }
     },
@@ -1719,7 +1719,7 @@
         },
         "CiphertextForRecipient":{
           "shape":"CiphertextType",
-          "documentation":"<p>The plaintext shared secret encrypted with the public key in the attestation document.</p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The plaintext shared secret encrypted with the public key from the attestation document. This ciphertext can be decrypted only by using a private key from the attested environment. </p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave or NitroTPM. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         },
         "KeyAgreementAlgorithm":{
           "shape":"KeyAgreementAlgorithmSpec",
@@ -1982,7 +1982,7 @@
         },
         "Recipient":{
           "shape":"RecipientInfo",
-          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave-how.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave and the encryption algorithm to use with the enclave's public key. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter only supports attestation documents for Amazon Web Services Nitro Enclaves. To call DeriveSharedSecret for an Amazon Web Services Nitro Enclaves, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> to generate the attestation document and then use the Recipient parameter from any Amazon Web Services SDK to provide the attestation document for the enclave.</p> <p>When you use this parameter, instead of returning a plaintext copy of the private data key, KMS encrypts the plaintext private data key under the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the enclave. The <code>CiphertextBlob</code> field in the response contains a copy of the private data key encrypted under the KMS key specified by the <code>KeyId</code> parameter. The <code>PrivateKeyPlaintext</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave-how.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave or NitroTPM, and the encryption algorithm to use with the public key in the attestation document. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter only supports attestation documents for Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM. To call GenerateDataKeyPair generate an attestation document use either <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> for an Amazon Web Services Nitro Enclaves or <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/attestation-get-doc.html\">Amazon Web Services NitroTPM tools</a> for Amazon Web Services NitroTPM. Then use the Recipient parameter from any Amazon Web Services SDK to provide the attestation document for the attested environment.</p> <p>When you use this parameter, instead of returning a plaintext copy of the private data key, KMS encrypts the plaintext private data key under the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the attested environment. The <code>CiphertextBlob</code> field in the response contains a copy of the private data key encrypted under the KMS key specified by the <code>KeyId</code> parameter. The <code>PrivateKeyPlaintext</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         },
         "DryRun":{
           "shape":"NullableBooleanType",
@@ -2015,7 +2015,7 @@
         },
         "CiphertextForRecipient":{
           "shape":"CiphertextType",
-          "documentation":"<p>The plaintext private data key encrypted with the public key from the Nitro enclave. This ciphertext can be decrypted only by using a private key in the Nitro enclave. </p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The plaintext private data key encrypted with the public key from the attestation document. This ciphertext can be decrypted only by using a private key from the attested environment. </p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave or NitroTPM. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         },
         "KeyMaterialId":{
           "shape":"BackingKeyIdType",
@@ -2103,7 +2103,7 @@
         },
         "Recipient":{
           "shape":"RecipientInfo",
-          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave-how.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave and the encryption algorithm to use with the enclave's public key. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter only supports attestation documents for Amazon Web Services Nitro Enclaves. To include this parameter, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK.</p> <p>When you use this parameter, instead of returning the plaintext data key, KMS encrypts the plaintext data key under the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the enclave. The <code>CiphertextBlob</code> field in the response contains a copy of the data key encrypted under the KMS key specified by the <code>KeyId</code> parameter. The <code>Plaintext</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave-how.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave or NitroTPM, and the encryption algorithm to use with the public key in the attestation document. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter supports the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK for Amazon Web Services Nitro Enclaves. It supports any Amazon Web Services SDK for Amazon Web Services NitroTPM. </p> <p>When you use this parameter, instead of returning the plaintext data key, KMS encrypts the plaintext data key under the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the enclave. The <code>CiphertextBlob</code> field in the response contains a copy of the data key encrypted under the KMS key specified by the <code>KeyId</code> parameter. The <code>Plaintext</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         },
         "DryRun":{
           "shape":"NullableBooleanType",
@@ -2128,7 +2128,7 @@
         },
         "CiphertextForRecipient":{
           "shape":"CiphertextType",
-          "documentation":"<p>The plaintext data key encrypted with the public key from the Nitro enclave. This ciphertext can be decrypted only by using a private key in the Nitro enclave. </p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The plaintext data key encrypted with the public key from the attestation document. This ciphertext can be decrypted only by using a private key from the attested environment. </p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave or NitroTPM. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         },
         "KeyMaterialId":{
           "shape":"BackingKeyIdType",
@@ -2243,7 +2243,7 @@
         },
         "Recipient":{
           "shape":"RecipientInfo",
-          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave-how.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave and the encryption algorithm to use with the enclave's public key. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter only supports attestation documents for Amazon Web Services Nitro Enclaves. To include this parameter, use the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK.</p> <p>When you use this parameter, instead of returning plaintext bytes, KMS encrypts the plaintext bytes under the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the enclave. The <code>Plaintext</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>A signed <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitro-enclave-how.html#term-attestdoc\">attestation document</a> from an Amazon Web Services Nitro enclave or NitroTPM, and the encryption algorithm to use with the public key in the attestation document. The only valid encryption algorithm is <code>RSAES_OAEP_SHA_256</code>. </p> <p>This parameter supports the <a href=\"https://docs.aws.amazon.com/enclaves/latest/user/developing-applications.html#sdk\">Amazon Web Services Nitro Enclaves SDK</a> or any Amazon Web Services SDK for Amazon Web Services Nitro Enclaves. It supports any Amazon Web Services SDK for Amazon Web Services NitroTPM. </p> <p>When you use this parameter, instead of returning plaintext bytes, KMS encrypts the plaintext bytes under the public key in the attestation document, and returns the resulting ciphertext in the <code>CiphertextForRecipient</code> field in the response. This ciphertext can be decrypted only with the private key in the attested environment. The <code>Plaintext</code> field in the response is null or empty.</p> <p>For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         }
       }
     },
@@ -2256,7 +2256,7 @@
         },
         "CiphertextForRecipient":{
           "shape":"CiphertextType",
-          "documentation":"<p>The plaintext random bytes encrypted with the public key from the Nitro enclave. This ciphertext can be decrypted only by using a private key in the Nitro enclave. </p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The plaintext random bytes encrypted with the public key from the attestation document. This ciphertext can be decrypted only by using a private key from the attested environment. </p> <p>This field is included in the response only when the <code>Recipient</code> parameter in the request includes a valid attestation document from an Amazon Web Services Nitro enclave or NitroTPM. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
         }
       }
     },
@@ -3444,14 +3444,14 @@
       "members":{
         "KeyEncryptionAlgorithm":{
           "shape":"KeyEncryptionMechanism",
-          "documentation":"<p>The encryption algorithm that KMS should use with the public key for an Amazon Web Services Nitro Enclave to encrypt plaintext values for the response. The only valid value is <code>RSAES_OAEP_SHA_256</code>.</p>"
+          "documentation":"<p>The encryption algorithm that KMS should use with the public key for an Amazon Web Services Nitro Enclave or NitroTPM to encrypt plaintext values for the response. The only valid value is <code>RSAES_OAEP_SHA_256</code>.</p>"
         },
         "AttestationDocument":{
           "shape":"AttestationDocumentType",
-          "documentation":"<p>The attestation document for an Amazon Web Services Nitro Enclave. This document includes the enclave's public key.</p>"
+          "documentation":"<p>The attestation document for an Amazon Web Services Nitro Enclave or a NitroTPM. This document includes the enclave's public key.</p>"
         }
       },
-      "documentation":"<p>Contains information about the party that receives the response from the API operation.</p> <p>This data type is designed to support Amazon Web Services Nitro Enclaves, which lets you create an isolated compute environment in Amazon EC2. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/services-nitro-enclaves.html\">How Amazon Web Services Nitro Enclaves uses KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Contains information about the party that receives the response from the API operation.</p> <p>This data type is designed to support Amazon Web Services Nitro Enclaves and Amazon Web Services NitroTPM, which lets you create an attested environment in Amazon EC2. For information about the interaction between KMS and Amazon Web Services Nitro Enclaves or Amazon Web Services NitroTPM, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/cryptographic-attestation.html\">Cryptographic attestation support in KMS</a> in the <i>Key Management Service Developer Guide</i>.</p>"
     },
     "RegionType":{
       "type":"string",
diff --git a/services/lakeformation/pom.xml b/services/lakeformation/pom.xml
index f51a1553f353..ad478ecad71b 100644
--- a/services/lakeformation/pom.xml
+++ b/services/lakeformation/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lakeformation</artifactId>
     <name>AWS Java SDK :: Services :: LakeFormation</name>
diff --git a/services/lambda/pom.xml b/services/lambda/pom.xml
index fcda26fe6894..fc7ffb07a0ee 100644
--- a/services/lambda/pom.xml
+++ b/services/lambda/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lambda</artifactId>
     <name>AWS Java SDK :: Services :: AWS Lambda</name>
diff --git a/services/launchwizard/pom.xml b/services/launchwizard/pom.xml
index d687bcf7e571..8fdc1fecd89a 100644
--- a/services/launchwizard/pom.xml
+++ b/services/launchwizard/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>launchwizard</artifactId>
     <name>AWS Java SDK :: Services :: Launch Wizard</name>
diff --git a/services/lexmodelbuilding/pom.xml b/services/lexmodelbuilding/pom.xml
index 8e06f7a1f6e1..85f901070c4f 100644
--- a/services/lexmodelbuilding/pom.xml
+++ b/services/lexmodelbuilding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lexmodelbuilding</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Lex Model Building</name>
diff --git a/services/lexmodelsv2/pom.xml b/services/lexmodelsv2/pom.xml
index 5fd309403082..5a75c1a7eb16 100644
--- a/services/lexmodelsv2/pom.xml
+++ b/services/lexmodelsv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lexmodelsv2</artifactId>
     <name>AWS Java SDK :: Services :: Lex Models V2</name>
diff --git a/services/lexruntime/pom.xml b/services/lexruntime/pom.xml
index d53d55de03b2..78017bd90562 100644
--- a/services/lexruntime/pom.xml
+++ b/services/lexruntime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lexruntime</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Lex Runtime</name>
diff --git a/services/lexruntimev2/pom.xml b/services/lexruntimev2/pom.xml
index 2d83f0182ead..fdf259525abf 100644
--- a/services/lexruntimev2/pom.xml
+++ b/services/lexruntimev2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lexruntimev2</artifactId>
     <name>AWS Java SDK :: Services :: Lex Runtime V2</name>
diff --git a/services/licensemanager/pom.xml b/services/licensemanager/pom.xml
index a3013fdcc2e7..6c549b17a7cf 100644
--- a/services/licensemanager/pom.xml
+++ b/services/licensemanager/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>licensemanager</artifactId>
     <name>AWS Java SDK :: Services :: License Manager</name>
diff --git a/services/licensemanagerlinuxsubscriptions/pom.xml b/services/licensemanagerlinuxsubscriptions/pom.xml
index 465d5b202538..98c52e75ce77 100644
--- a/services/licensemanagerlinuxsubscriptions/pom.xml
+++ b/services/licensemanagerlinuxsubscriptions/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>licensemanagerlinuxsubscriptions</artifactId>
     <name>AWS Java SDK :: Services :: License Manager Linux Subscriptions</name>
diff --git a/services/licensemanagerusersubscriptions/pom.xml b/services/licensemanagerusersubscriptions/pom.xml
index 17f2a9aa3b0b..2e17bf5c9b2c 100644
--- a/services/licensemanagerusersubscriptions/pom.xml
+++ b/services/licensemanagerusersubscriptions/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>licensemanagerusersubscriptions</artifactId>
     <name>AWS Java SDK :: Services :: License Manager User Subscriptions</name>
diff --git a/services/licensemanagerusersubscriptions/src/main/resources/codegen-resources/service-2.json b/services/licensemanagerusersubscriptions/src/main/resources/codegen-resources/service-2.json
index a48f82358ce9..c0be9368e146 100644
--- a/services/licensemanagerusersubscriptions/src/main/resources/codegen-resources/service-2.json
+++ b/services/licensemanagerusersubscriptions/src/main/resources/codegen-resources/service-2.json
@@ -2,16 +2,15 @@
   "version":"2.0",
   "metadata":{
     "apiVersion":"2018-05-10",
+    "auth":["aws.auth#sigv4"],
     "endpointPrefix":"license-manager-user-subscriptions",
-    "jsonVersion":"1.1",
     "protocol":"rest-json",
     "protocols":["rest-json"],
     "serviceFullName":"AWS License Manager User Subscriptions",
     "serviceId":"License Manager User Subscriptions",
     "signatureVersion":"v4",
     "signingName":"license-manager-user-subscriptions",
-    "uid":"license-manager-user-subscriptions-2018-05-10",
-    "auth":["aws.auth#sigv4"]
+    "uid":"license-manager-user-subscriptions-2018-05-10"
   },
   "operations":{
     "AssociateUser":{
@@ -25,8 +24,8 @@
       "output":{"shape":"AssociateUserResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -46,8 +45,8 @@
       "output":{"shape":"CreateLicenseServerEndpointResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -67,8 +66,8 @@
       "output":{"shape":"DeleteLicenseServerEndpointResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -88,8 +87,8 @@
       "output":{"shape":"DeregisterIdentityProviderResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -109,8 +108,8 @@
       "output":{"shape":"DisassociateUserResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -130,8 +129,8 @@
       "output":{"shape":"ListIdentityProvidersResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -150,8 +149,8 @@
       "output":{"shape":"ListInstancesResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -170,8 +169,8 @@
       "output":{"shape":"ListLicenseServerEndpointsResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"AccessDeniedException"}
@@ -189,8 +188,8 @@
       "output":{"shape":"ListProductSubscriptionsResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -225,8 +224,8 @@
       "output":{"shape":"ListUserAssociationsResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -245,8 +244,8 @@
       "output":{"shape":"RegisterIdentityProviderResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -266,8 +265,8 @@
       "output":{"shape":"StartProductSubscriptionResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -286,8 +285,8 @@
       "output":{"shape":"StopProductSubscriptionResponse"},
       "errors":[
         {"shape":"ServiceQuotaExceededException"},
-        {"shape":"ConflictException"},
         {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"},
@@ -359,6 +358,10 @@
     "ActiveDirectoryIdentityProvider":{
       "type":"structure",
       "members":{
+        "DirectoryId":{
+          "shape":"Directory",
+          "documentation":"<p>The directory ID for an Active Directory identity provider.</p>"
+        },
         "ActiveDirectorySettings":{
           "shape":"ActiveDirectorySettings",
           "documentation":"<p>The <code>ActiveDirectorySettings</code> resource contains details about the Active Directory, including network access details such as domain name and IP addresses, and the credential provider for user administration.</p>"
@@ -367,9 +370,9 @@
           "shape":"ActiveDirectoryType",
           "documentation":"<p>The type of Active Directory – either a self-managed Active Directory or an Amazon Web Services Managed Active Directory.</p>"
         },
-        "DirectoryId":{
-          "shape":"Directory",
-          "documentation":"<p>The directory ID for an Active Directory identity provider.</p>"
+        "IsSharedActiveDirectory":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether this directory is shared from an Amazon Web Services Managed Active Directory. The default value is false.</p>"
         }
       },
       "documentation":"<p>Details about an Active Directory identity provider.</p>"
@@ -377,17 +380,17 @@
     "ActiveDirectorySettings":{
       "type":"structure",
       "members":{
-        "DomainCredentialsProvider":{
-          "shape":"CredentialsProvider",
-          "documentation":"<p>Points to the <code>CredentialsProvider</code> resource that contains information about the credential provider for user administration.</p>"
+        "DomainName":{
+          "shape":"String",
+          "documentation":"<p>The domain name for the Active Directory.</p>"
         },
         "DomainIpv4List":{
           "shape":"ActiveDirectorySettingsDomainIpv4ListList",
           "documentation":"<p>A list of domain IPv4 addresses that are used for the Active Directory.</p>"
         },
-        "DomainName":{
-          "shape":"String",
-          "documentation":"<p>The domain name for the Active Directory.</p>"
+        "DomainCredentialsProvider":{
+          "shape":"CredentialsProvider",
+          "documentation":"<p>Points to the <code>CredentialsProvider</code> resource that contains information about the credential provider for user administration.</p>"
         },
         "DomainNetworkSettings":{
           "shape":"DomainNetworkSettings",
@@ -411,35 +414,35 @@
     },
     "Arn":{
       "type":"string",
-      "pattern":"^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{1,63}:[a-zA-Z0-9-\\.]{1,510}/[a-zA-Z0-9-\\.]{1,510}$"
+      "pattern":"arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{1,63}:[a-zA-Z0-9-\\.]{1,510}/[a-zA-Z0-9-\\.]{1,510}"
     },
     "AssociateUserRequest":{
       "type":"structure",
       "required":[
-        "IdentityProvider",
+        "Username",
         "InstanceId",
-        "Username"
+        "IdentityProvider"
       ],
       "members":{
-        "Domain":{
+        "Username":{
           "shape":"String",
-          "documentation":"<p>The domain name of the Active Directory that contains information for the user to associate.</p>"
+          "documentation":"<p>The user name from the identity provider.</p>"
+        },
+        "InstanceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the EC2 instance that provides the user-based subscription.</p>"
         },
         "IdentityProvider":{
           "shape":"IdentityProvider",
           "documentation":"<p>The identity provider for the user.</p>"
         },
-        "InstanceId":{
+        "Domain":{
           "shape":"String",
-          "documentation":"<p>The ID of the EC2 instance that provides the user-based subscription.</p>"
+          "documentation":"<p>The domain name of the Active Directory that contains information for the user to associate.</p>"
         },
         "Tags":{
           "shape":"Tags",
           "documentation":"<p>The tags that apply for the user association.</p>"
-        },
-        "Username":{
-          "shape":"String",
-          "documentation":"<p>The user name from the identity provider.</p>"
         }
       }
     },
@@ -453,6 +456,10 @@
         }
       }
     },
+    "Boolean":{
+      "type":"boolean",
+      "box":true
+    },
     "BoxInteger":{
       "type":"integer",
       "box":true
@@ -544,13 +551,13 @@
           "shape":"IdentityProvider",
           "documentation":"<p>An object that specifies details for the Active Directory identity provider.</p>"
         },
-        "IdentityProviderArn":{
-          "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the identity provider to deregister.</p>"
-        },
         "Product":{
           "shape":"String",
           "documentation":"<p>The name of the user-based subscription product.</p> <p>Valid values: <code>VISUAL_STUDIO_ENTERPRISE</code> | <code>VISUAL_STUDIO_PROFESSIONAL</code> | <code>OFFICE_PROFESSIONAL_PLUS</code> | <code>REMOTE_DESKTOP_SERVICES</code> </p>"
+        },
+        "IdentityProviderArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the identity provider to deregister.</p>"
         }
       }
     },
@@ -566,30 +573,30 @@
     },
     "Directory":{
       "type":"string",
-      "pattern":"^(d|sd)-[0-9a-f]{10}$"
+      "pattern":"(d|sd)-[0-9a-f]{10}"
     },
     "DisassociateUserRequest":{
       "type":"structure",
       "members":{
-        "Domain":{
+        "Username":{
           "shape":"String",
-          "documentation":"<p>The domain name of the Active Directory that contains information for the user to disassociate.</p>"
-        },
-        "IdentityProvider":{
-          "shape":"IdentityProvider",
-          "documentation":"<p>An object that specifies details for the Active Directory identity provider.</p>"
+          "documentation":"<p>The user name from the Active Directory identity provider for the user.</p>"
         },
         "InstanceId":{
           "shape":"String",
           "documentation":"<p>The ID of the EC2 instance which provides user-based subscriptions.</p>"
         },
+        "IdentityProvider":{
+          "shape":"IdentityProvider",
+          "documentation":"<p>An object that specifies details for the Active Directory identity provider.</p>"
+        },
         "InstanceUserArn":{
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the user to disassociate from the EC2 instance.</p>"
         },
-        "Username":{
+        "Domain":{
           "shape":"String",
-          "documentation":"<p>The user name from the Active Directory identity provider for the user.</p>"
+          "documentation":"<p>The domain name of the Active Directory that contains information for the user to disassociate.</p>"
         }
       }
     },
@@ -656,34 +663,38 @@
       "type":"structure",
       "required":[
         "IdentityProvider",
-        "Product",
         "Settings",
+        "Product",
         "Status"
       ],
       "members":{
-        "FailureMessage":{
-          "shape":"String",
-          "documentation":"<p>The failure message associated with an identity provider.</p>"
-        },
         "IdentityProvider":{
           "shape":"IdentityProvider",
           "documentation":"<p>The <code>IdentityProvider</code> resource contains information about an identity provider.</p>"
         },
-        "IdentityProviderArn":{
-          "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the identity provider.</p>"
+        "Settings":{
+          "shape":"Settings",
+          "documentation":"<p>The <code>Settings</code> resource contains details about the registered identity provider’s product related configuration settings, such as the subnets to provision VPC endpoints.</p>"
         },
         "Product":{
           "shape":"String",
           "documentation":"<p>The name of the user-based subscription product.</p>"
         },
-        "Settings":{
-          "shape":"Settings",
-          "documentation":"<p>The <code>Settings</code> resource contains details about the registered identity provider’s product related configuration settings, such as the subnets to provision VPC endpoints.</p>"
-        },
         "Status":{
           "shape":"String",
           "documentation":"<p>The status of the identity provider.</p>"
+        },
+        "IdentityProviderArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the identity provider.</p>"
+        },
+        "FailureMessage":{
+          "shape":"String",
+          "documentation":"<p>The failure message associated with an identity provider.</p>"
+        },
+        "OwnerAccountId":{
+          "shape":"String",
+          "documentation":"<p>The AWS Account ID of the owner of this resource.</p>"
         }
       },
       "documentation":"<p>Describes an identity provider.</p>"
@@ -696,29 +707,37 @@
       "type":"structure",
       "required":[
         "InstanceId",
-        "Products",
-        "Status"
+        "Status",
+        "Products"
       ],
       "members":{
         "InstanceId":{
           "shape":"String",
           "documentation":"<p>The ID of the EC2 instance, which provides user-based subscriptions.</p>"
         },
-        "LastStatusCheckDate":{
+        "Status":{
           "shape":"String",
-          "documentation":"<p>The date of the last status check.</p>"
+          "documentation":"<p>The status of an EC2 instance resource.</p>"
         },
         "Products":{
           "shape":"StringList",
           "documentation":"<p>A list of provided user-based subscription products.</p>"
         },
-        "Status":{
+        "LastStatusCheckDate":{
           "shape":"String",
-          "documentation":"<p>The status of an EC2 instance resource.</p>"
+          "documentation":"<p>The date of the last status check.</p>"
         },
         "StatusMessage":{
           "shape":"String",
           "documentation":"<p>The status message for an EC2 instance.</p>"
+        },
+        "OwnerAccountId":{
+          "shape":"String",
+          "documentation":"<p>The AWS Account ID of the owner of this resource.</p>"
+        },
+        "IdentityProvider":{
+          "shape":"IdentityProvider",
+          "documentation":"<p>The <code>IdentityProvider</code> resource specifies details about the identity provider.</p>"
         }
       },
       "documentation":"<p>Describes an EC2 instance providing user-based subscriptions.</p>"
@@ -730,47 +749,47 @@
     "InstanceUserSummary":{
       "type":"structure",
       "required":[
-        "IdentityProvider",
+        "Username",
         "InstanceId",
-        "Status",
-        "Username"
+        "IdentityProvider",
+        "Status"
       ],
       "members":{
-        "AssociationDate":{
-          "shape":"String",
-          "documentation":"<p>The date a user was associated with an EC2 instance.</p>"
-        },
-        "DisassociationDate":{
+        "Username":{
           "shape":"String",
-          "documentation":"<p>The date a user was disassociated from an EC2 instance.</p>"
+          "documentation":"<p>The user name from the identity provider for the user.</p>"
         },
-        "Domain":{
+        "InstanceId":{
           "shape":"String",
-          "documentation":"<p>The domain name of the Active Directory that contains the user information for the product subscription.</p>"
+          "documentation":"<p>The ID of the EC2 instance that provides user-based subscriptions.</p>"
         },
         "IdentityProvider":{
           "shape":"IdentityProvider",
           "documentation":"<p>The <code>IdentityProvider</code> resource specifies details about the identity provider.</p>"
         },
-        "InstanceId":{
+        "Status":{
           "shape":"String",
-          "documentation":"<p>The ID of the EC2 instance that provides user-based subscriptions.</p>"
+          "documentation":"<p>The status of a user associated with an EC2 instance.</p>"
         },
         "InstanceUserArn":{
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) that identifies the instance user.</p>"
         },
-        "Status":{
-          "shape":"String",
-          "documentation":"<p>The status of a user associated with an EC2 instance.</p>"
-        },
         "StatusMessage":{
           "shape":"String",
           "documentation":"<p>The status message for users of an EC2 instance.</p>"
         },
-        "Username":{
+        "Domain":{
           "shape":"String",
-          "documentation":"<p>The user name from the identity provider for the user.</p>"
+          "documentation":"<p>The domain name of the Active Directory that contains the user information for the product subscription.</p>"
+        },
+        "AssociationDate":{
+          "shape":"String",
+          "documentation":"<p>The date a user was associated with an EC2 instance.</p>"
+        },
+        "DisassociationDate":{
+          "shape":"String",
+          "documentation":"<p>The date a user was disassociated from an EC2 instance.</p>"
         }
       },
       "documentation":"<p>Describes users of an EC2 instance providing user-based subscriptions.</p>"
@@ -791,11 +810,15 @@
     },
     "IpV4":{
       "type":"string",
-      "pattern":"^(?:(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\.(?!$)|$)){4}$"
+      "pattern":"(?:(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\\.(?!$)|$)){4}"
     },
     "LicenseServer":{
       "type":"structure",
       "members":{
+        "ProvisioningStatus":{
+          "shape":"LicenseServerEndpointProvisioningStatus",
+          "documentation":"<p>The current state of the provisioning process for the RDS license server.</p>"
+        },
         "HealthStatus":{
           "shape":"LicenseServerHealthStatus",
           "documentation":"<p>The health status of the RDS license server.</p>"
@@ -803,10 +826,6 @@
         "Ipv4Address":{
           "shape":"String",
           "documentation":"<p>A list of domain IPv4 addresses that are used for the RDS license server.</p>"
-        },
-        "ProvisioningStatus":{
-          "shape":"LicenseServerEndpointProvisioningStatus",
-          "documentation":"<p>The current state of the provisioning process for the RDS license server.</p>"
         }
       },
       "documentation":"<p>Information about a Remote Desktop Services (RDS) license server.</p>"
@@ -814,22 +833,30 @@
     "LicenseServerEndpoint":{
       "type":"structure",
       "members":{
-        "CreationTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The timestamp when License Manager created the license server endpoint.</p>"
-        },
         "IdentityProviderArn":{
           "shape":"String",
           "documentation":"<p>The Amazon Resource Name (ARN) of the identity provider that's associated with the RDS license server endpoint.</p>"
         },
-        "LicenseServerEndpointArn":{
-          "shape":"Arn",
-          "documentation":"<p>The ARN of the <code>ServerEndpoint</code> resource for the RDS license server.</p>"
+        "ServerType":{
+          "shape":"ServerType",
+          "documentation":"<p>The type of license server.</p>"
+        },
+        "ServerEndpoint":{
+          "shape":"ServerEndpoint",
+          "documentation":"<p>The <code>ServerEndpoint</code> resource contains the network address of the RDS license server endpoint.</p>"
+        },
+        "StatusMessage":{
+          "shape":"String",
+          "documentation":"<p>The message associated with the provisioning status, if there is one.</p>"
         },
         "LicenseServerEndpointId":{
           "shape":"LicenseServerEndpointId",
           "documentation":"<p>The ID of the license server endpoint.</p>"
         },
+        "LicenseServerEndpointArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the <code>ServerEndpoint</code> resource for the RDS license server.</p>"
+        },
         "LicenseServerEndpointProvisioningStatus":{
           "shape":"LicenseServerEndpointProvisioningStatus",
           "documentation":"<p>The current state of the provisioning process for the RDS license server endpoint</p>"
@@ -838,17 +865,9 @@
           "shape":"LicenseServerList",
           "documentation":"<p>An array of <code>LicenseServer</code> resources that represent the license servers that are accessed through this endpoint.</p>"
         },
-        "ServerEndpoint":{
-          "shape":"ServerEndpoint",
-          "documentation":"<p>The <code>ServerEndpoint</code> resource contains the network address of the RDS license server endpoint.</p>"
-        },
-        "ServerType":{
-          "shape":"ServerType",
-          "documentation":"<p>The type of license server.</p>"
-        },
-        "StatusMessage":{
-          "shape":"String",
-          "documentation":"<p>The message associated with the provisioning status, if there is one.</p>"
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp when License Manager created the license server endpoint.</p>"
         }
       },
       "documentation":"<p>Contains details about a network endpoint for a Remote Desktop Services (RDS) license server.</p>"
@@ -884,17 +903,17 @@
     "LicenseServerSettings":{
       "type":"structure",
       "required":[
-        "ServerSettings",
-        "ServerType"
+        "ServerType",
+        "ServerSettings"
       ],
       "members":{
-        "ServerSettings":{
-          "shape":"ServerSettings",
-          "documentation":"<p>The <code>ServerSettings</code> resource contains the settings for your server.</p>"
-        },
         "ServerType":{
           "shape":"ServerType",
           "documentation":"<p>The type of license server.</p>"
+        },
+        "ServerSettings":{
+          "shape":"ServerSettings",
+          "documentation":"<p>The <code>ServerSettings</code> resource contains the settings for your server.</p>"
         }
       },
       "documentation":"<p>The settings to configure your license server.</p>"
@@ -902,14 +921,14 @@
     "ListIdentityProvidersRequest":{
       "type":"structure",
       "members":{
-        "Filters":{
-          "shape":"FilterList",
-          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>Product</p> </li> <li> <p>DirectoryId</p> </li> </ul>"
-        },
         "MaxResults":{
           "shape":"BoxInteger",
           "documentation":"<p>The maximum number of results to return from a single request.</p>"
         },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>Product</p> </li> <li> <p>DirectoryId</p> </li> </ul>"
+        },
         "NextToken":{
           "shape":"String",
           "documentation":"<p>A token to specify where to start paginating. This is the nextToken from a previously truncated response.</p>"
@@ -933,10 +952,6 @@
     "ListInstancesRequest":{
       "type":"structure",
       "members":{
-        "Filters":{
-          "shape":"FilterList",
-          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>Status</p> </li> <li> <p>InstanceId</p> </li> </ul>"
-        },
         "MaxResults":{
           "shape":"BoxInteger",
           "documentation":"<p>The maximum number of results to return from a single request.</p>"
@@ -944,6 +959,10 @@
         "NextToken":{
           "shape":"String",
           "documentation":"<p>A token to specify where to start paginating. This is the nextToken from a previously truncated response.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>Status</p> </li> <li> <p>InstanceId</p> </li> </ul>"
         }
       }
     },
@@ -963,14 +982,14 @@
     "ListLicenseServerEndpointsRequest":{
       "type":"structure",
       "members":{
-        "Filters":{
-          "shape":"FilterList",
-          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>IdentityProviderArn</p> </li> </ul>"
-        },
         "MaxResults":{
           "shape":"ListLicenseServerEndpointsRequestMaxResultsInteger",
           "documentation":"<p>The maximum number of results to return from a single request.</p>"
         },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>IdentityProviderArn</p> </li> </ul>"
+        },
         "NextToken":{
           "shape":"String",
           "documentation":"<p>A token to specify where to start paginating. This is the nextToken from a previously truncated response.</p>"
@@ -1000,9 +1019,9 @@
       "type":"structure",
       "required":["IdentityProvider"],
       "members":{
-        "Filters":{
-          "shape":"FilterList",
-          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>Status</p> </li> <li> <p>Username</p> </li> <li> <p>Domain</p> </li> </ul>"
+        "Product":{
+          "shape":"String",
+          "documentation":"<p>The name of the user-based subscription product.</p> <p>Valid values: <code>VISUAL_STUDIO_ENTERPRISE</code> | <code>VISUAL_STUDIO_PROFESSIONAL</code> | <code>OFFICE_PROFESSIONAL_PLUS</code> | <code>REMOTE_DESKTOP_SERVICES</code> </p>"
         },
         "IdentityProvider":{
           "shape":"IdentityProvider",
@@ -1012,26 +1031,26 @@
           "shape":"BoxInteger",
           "documentation":"<p>The maximum number of results to return from a single request.</p>"
         },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>Status</p> </li> <li> <p>Username</p> </li> <li> <p>Domain</p> </li> </ul>"
+        },
         "NextToken":{
           "shape":"String",
           "documentation":"<p>A token to specify where to start paginating. This is the nextToken from a previously truncated response.</p>"
-        },
-        "Product":{
-          "shape":"String",
-          "documentation":"<p>The name of the user-based subscription product.</p> <p>Valid values: <code>VISUAL_STUDIO_ENTERPRISE</code> | <code>VISUAL_STUDIO_PROFESSIONAL</code> | <code>OFFICE_PROFESSIONAL_PLUS</code> | <code>REMOTE_DESKTOP_SERVICES</code> </p>"
         }
       }
     },
     "ListProductSubscriptionsResponse":{
       "type":"structure",
       "members":{
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>The next token used for paginated responses. When this field isn't empty, there are additional elements that the service hasn't included in this request. Use this token with the next request to retrieve additional objects.</p>"
-        },
         "ProductUserSummaries":{
           "shape":"ProductUserSummaryList",
           "documentation":"<p>Metadata that describes the list product subscriptions operation.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The next token used for paginated responses. When this field isn't empty, there are additional elements that the service hasn't included in this request. Use this token with the next request to retrieve additional objects.</p>"
         }
       }
     },
@@ -1059,26 +1078,26 @@
     "ListUserAssociationsRequest":{
       "type":"structure",
       "required":[
-        "IdentityProvider",
-        "InstanceId"
+        "InstanceId",
+        "IdentityProvider"
       ],
       "members":{
-        "Filters":{
-          "shape":"FilterList",
-          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>Status</p> </li> <li> <p>Username</p> </li> <li> <p>Domain</p> </li> </ul>"
+        "InstanceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the EC2 instance, which provides user-based subscriptions.</p>"
         },
         "IdentityProvider":{
           "shape":"IdentityProvider",
           "documentation":"<p>An object that specifies details for the identity provider.</p>"
         },
-        "InstanceId":{
-          "shape":"String",
-          "documentation":"<p>The ID of the EC2 instance, which provides user-based subscriptions.</p>"
-        },
         "MaxResults":{
           "shape":"BoxInteger",
           "documentation":"<p>The maximum number of results to return from a single request.</p>"
         },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>You can use the following filters to streamline results:</p> <ul> <li> <p>Status</p> </li> <li> <p>Username</p> </li> <li> <p>Domain</p> </li> </ul>"
+        },
         "NextToken":{
           "shape":"String",
           "documentation":"<p>A token to specify where to start paginating. This is the nextToken from a previously truncated response.</p>"
@@ -1101,47 +1120,47 @@
     "ProductUserSummary":{
       "type":"structure",
       "required":[
-        "IdentityProvider",
+        "Username",
         "Product",
-        "Status",
-        "Username"
+        "IdentityProvider",
+        "Status"
       ],
       "members":{
-        "Domain":{
+        "Username":{
           "shape":"String",
-          "documentation":"<p>The domain name of the Active Directory that contains the user information for the product subscription.</p>"
+          "documentation":"<p>The user name from the identity provider for this product user.</p>"
+        },
+        "Product":{
+          "shape":"String",
+          "documentation":"<p>The name of the user-based subscription product.</p>"
         },
         "IdentityProvider":{
           "shape":"IdentityProvider",
           "documentation":"<p>An object that specifies details for the identity provider.</p>"
         },
-        "Product":{
+        "Status":{
           "shape":"String",
-          "documentation":"<p>The name of the user-based subscription product.</p>"
+          "documentation":"<p>The status of a product for this user.</p>"
         },
         "ProductUserArn":{
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) for this product user.</p>"
         },
-        "Status":{
-          "shape":"String",
-          "documentation":"<p>The status of a product for this user.</p>"
-        },
         "StatusMessage":{
           "shape":"String",
           "documentation":"<p>The status message for a product for this user.</p>"
         },
-        "SubscriptionEndDate":{
+        "Domain":{
           "shape":"String",
-          "documentation":"<p>The end date of a subscription.</p>"
+          "documentation":"<p>The domain name of the Active Directory that contains the user information for the product subscription.</p>"
         },
         "SubscriptionStartDate":{
           "shape":"String",
           "documentation":"<p>The start date of a subscription.</p>"
         },
-        "Username":{
+        "SubscriptionEndDate":{
           "shape":"String",
-          "documentation":"<p>The user name from the identity provider for this product user.</p>"
+          "documentation":"<p>The end date of a subscription.</p>"
         }
       },
       "documentation":"<p>A summary of the user-based subscription products for a specific user.</p>"
@@ -1198,7 +1217,7 @@
     },
     "ResourceArn":{
       "type":"string",
-      "pattern":"^arn:([a-z0-9-\\.]{1,63}):([a-z0-9-\\.]{1,63}):([a-z0-9-\\.]{1,63}):([a-z0-9-\\.]{1,63}):([a-z0-9-\\.]{1,510})/([a-z0-9-\\.]{1,510})$"
+      "pattern":"arn:([a-z0-9-\\.]{1,63}):([a-z0-9-\\.]{1,63}):([a-z0-9-\\.]{1,63}):([a-z0-9-\\.]{1,63}):([a-z0-9-\\.]{1,510})/([a-z0-9-\\.]{1,510})"
     },
     "ResourceNotFoundException":{
       "type":"structure",
@@ -1230,7 +1249,7 @@
       "type":"string",
       "max":200,
       "min":5,
-      "pattern":"^sg-(([0-9a-z]{8})|([0-9a-z]{17}))$"
+      "pattern":"sg-(([0-9a-z]{8})|([0-9a-z]{17}))"
     },
     "ServerEndpoint":{
       "type":"structure",
@@ -1268,17 +1287,17 @@
     "Settings":{
       "type":"structure",
       "required":[
-        "SecurityGroupId",
-        "Subnets"
+        "Subnets",
+        "SecurityGroupId"
       ],
       "members":{
-        "SecurityGroupId":{
-          "shape":"SecurityGroup",
-          "documentation":"<p>A security group ID that allows inbound TCP port 1688 communication between resources in your VPC and the VPC endpoint for activation servers.</p>"
-        },
         "Subnets":{
           "shape":"SettingsSubnetsList",
           "documentation":"<p>The subnets defined for the registered identity provider.</p>"
+        },
+        "SecurityGroupId":{
+          "shape":"SecurityGroup",
+          "documentation":"<p>A security group ID that allows inbound TCP port 1688 communication between resources in your VPC and the VPC endpoint for activation servers.</p>"
         }
       },
       "documentation":"<p>The registered identity provider’s product related configuration settings such as the subnets to provision VPC endpoints, and the security group ID that is associated with the VPC endpoints. The security group should permit inbound TCP port 1688 communication from resources in the VPC.</p>"
@@ -1291,14 +1310,14 @@
     "StartProductSubscriptionRequest":{
       "type":"structure",
       "required":[
+        "Username",
         "IdentityProvider",
-        "Product",
-        "Username"
+        "Product"
       ],
       "members":{
-        "Domain":{
+        "Username":{
           "shape":"String",
-          "documentation":"<p>The domain name of the Active Directory that contains the user for whom to start the product subscription.</p>"
+          "documentation":"<p>The user name from the identity provider of the user.</p>"
         },
         "IdentityProvider":{
           "shape":"IdentityProvider",
@@ -1308,13 +1327,13 @@
           "shape":"String",
           "documentation":"<p>The name of the user-based subscription product.</p> <p>Valid values: <code>VISUAL_STUDIO_ENTERPRISE</code> | <code>VISUAL_STUDIO_PROFESSIONAL</code> | <code>OFFICE_PROFESSIONAL_PLUS</code> | <code>REMOTE_DESKTOP_SERVICES</code> </p>"
         },
+        "Domain":{
+          "shape":"String",
+          "documentation":"<p>The domain name of the Active Directory that contains the user for whom to start the product subscription.</p>"
+        },
         "Tags":{
           "shape":"Tags",
           "documentation":"<p>The tags that apply to the product subscription.</p>"
-        },
-        "Username":{
-          "shape":"String",
-          "documentation":"<p>The user name from the identity provider of the user.</p>"
         }
       }
     },
@@ -1331,9 +1350,9 @@
     "StopProductSubscriptionRequest":{
       "type":"structure",
       "members":{
-        "Domain":{
+        "Username":{
           "shape":"String",
-          "documentation":"<p>The domain name of the Active Directory that contains the user for whom to stop the product subscription.</p>"
+          "documentation":"<p>The user name from the identity provider for the user.</p>"
         },
         "IdentityProvider":{
           "shape":"IdentityProvider",
@@ -1347,9 +1366,9 @@
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the product user.</p>"
         },
-        "Username":{
+        "Domain":{
           "shape":"String",
-          "documentation":"<p>The user name from the identity provider for the user.</p>"
+          "documentation":"<p>The domain name of the Active Directory that contains the user for whom to stop the product subscription.</p>"
         }
       }
     },
@@ -1370,7 +1389,7 @@
     },
     "Subnet":{
       "type":"string",
-      "pattern":"^subnet-[a-z0-9]{8,17}"
+      "pattern":"subnet-[a-z0-9]{8,17}.*"
     },
     "Subnets":{
       "type":"list",
@@ -1404,8 +1423,7 @@
     },
     "TagResourceResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "Tags":{
       "type":"map",
@@ -1447,22 +1465,21 @@
     },
     "UntagResourceResponse":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "UpdateIdentityProviderSettingsRequest":{
       "type":"structure",
       "required":["UpdateSettings"],
       "members":{
         "IdentityProvider":{"shape":"IdentityProvider"},
-        "IdentityProviderArn":{
-          "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the identity provider to update.</p>"
-        },
         "Product":{
           "shape":"String",
           "documentation":"<p>The name of the user-based subscription product.</p> <p>Valid values: <code>VISUAL_STUDIO_ENTERPRISE</code> | <code>VISUAL_STUDIO_PROFESSIONAL</code> | <code>OFFICE_PROFESSIONAL_PLUS</code> | <code>REMOTE_DESKTOP_SERVICES</code> </p>"
         },
+        "IdentityProviderArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the identity provider to update.</p>"
+        },
         "UpdateSettings":{
           "shape":"UpdateSettings",
           "documentation":"<p>Updates the registered identity provider’s product related configuration settings. You can update any combination of settings in a single operation such as the:</p> <ul> <li> <p>Subnets which you want to add to provision VPC endpoints.</p> </li> <li> <p>Subnets which you want to remove the VPC endpoints from.</p> </li> <li> <p>Security group ID which permits traffic to the VPC endpoints.</p> </li> </ul>"
diff --git a/services/licensemanagerusersubscriptions/src/main/resources/codegen-resources/waiters-2.json b/services/licensemanagerusersubscriptions/src/main/resources/codegen-resources/waiters-2.json
new file mode 100644
index 000000000000..13f60ee66be6
--- /dev/null
+++ b/services/licensemanagerusersubscriptions/src/main/resources/codegen-resources/waiters-2.json
@@ -0,0 +1,5 @@
+{
+  "version": 2,
+  "waiters": {
+  }
+}
diff --git a/services/lightsail/pom.xml b/services/lightsail/pom.xml
index 7189a970b667..17b563a4f132 100644
--- a/services/lightsail/pom.xml
+++ b/services/lightsail/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lightsail</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Lightsail</name>
diff --git a/services/lightsail/src/main/resources/codegen-resources/service-2.json b/services/lightsail/src/main/resources/codegen-resources/service-2.json
index 1e25461820e3..cf0410f577e2 100644
--- a/services/lightsail/src/main/resources/codegen-resources/service-2.json
+++ b/services/lightsail/src/main/resources/codegen-resources/service-2.json
@@ -3232,7 +3232,7 @@
         },
         "message":{
           "shape":"BPAStatusMessage",
-          "documentation":"<p>A message that provides a reason for a <code>Failed</code> or <code>Defaulted</code> synchronization status.</p> <p>The following messages are possible:</p> <ul> <li> <p> <code>SYNC_ON_HOLD</code> - The synchronization has not yet happened. This status message occurs immediately after you create your first Lightsail bucket. This status message should change after the first synchronization happens, approximately 1 hour after the first bucket is created.</p> </li> <li> <p> <code>DEFAULTED_FOR_SLR_MISSING</code> - The synchronization failed because the required service-linked role is missing from your Amazon Web Services account. The account-level BPA configuration for your Lightsail buckets is defaulted to <i>active</i> until the synchronization can occur. This means that all your buckets are private and not publicly accessible. For more information about how to create the required service-linked role to allow synchronization, see <a href=\"https://docs.aws.amazon.com/lightsail/latest/userguide/amazon-lightsail-using-service-linked-roles\">Using Service-Linked Roles for Amazon Lightsail</a> in the <i>Amazon Lightsail Developer Guide</i>.</p> </li> <li> <p> <code>DEFAULTED_FOR_SLR_MISSING_ON_HOLD</code> - The synchronization failed because the required service-linked role is missing from your Amazon Web Services account. Account-level BPA is not yet configured for your Lightsail buckets. Therefore, only the bucket access permissions and individual object access permissions apply to your Lightsail buckets. For more information about how to create the required service-linked role to allow synchronization, see <a href=\"https://docs.aws.amazon.com/lightsail/latest/userguide/amazon-lightsail-using-service-linked-roles\">Using Service-Linked Roles for Amazon Lightsail</a> in the <i>Amazon Lightsail Developer Guide</i>.</p> </li> <li> <p> <code>Unknown</code> - The reason that synchronization failed is unknown. Contact Amazon Web ServicesSupport for more information.</p> </li> </ul>"
+          "documentation":"<p>A message that provides a reason for a <code>Failed</code> or <code>Defaulted</code> synchronization status.</p> <p>The following messages are possible:</p> <ul> <li> <p> <code>SYNC_ON_HOLD</code> - The synchronization has not yet happened. This status message occurs immediately after you create your first Lightsail bucket. This status message should change after the first synchronization happens, approximately 1 hour after the first bucket is created.</p> </li> <li> <p> <code>DEFAULTED_FOR_SLR_MISSING</code> - The synchronization failed because the required service-linked role is missing from your Amazon Web Services account. The account-level BPA configuration for your Lightsail buckets is defaulted to <i>active</i> until the synchronization can occur. This means that all your buckets are private and not publicly accessible. For more information about how to create the required service-linked role to allow synchronization, see <a href=\"https://docs.aws.amazon.com/lightsail/latest/userguide/amazon-lightsail-using-service-linked-roles\">Using Service-Linked Roles for Amazon Lightsail</a> in the <i>Amazon Lightsail Developer Guide</i>.</p> </li> <li> <p> <code>DEFAULTED_FOR_SLR_MISSING_ON_HOLD</code> - The synchronization failed because the required service-linked role is missing from your Amazon Web Services account. Account-level BPA is not yet configured for your Lightsail buckets. Therefore, only the bucket access permissions and individual object access permissions apply to your Lightsail buckets. For more information about how to create the required service-linked role to allow synchronization, see <a href=\"https://docs.aws.amazon.com/lightsail/latest/userguide/amazon-lightsail-using-service-linked-roles\">Using Service-Linked Roles for Amazon Lightsail</a> in the <i>Amazon Lightsail Developer Guide</i>.</p> </li> <li> <p> <code>Unknown</code> - The reason that synchronization failed is unknown. Contact Amazon Web Services Support for more information.</p> </li> </ul>"
         },
         "bpaImpactsLightsail":{
           "shape":"boolean",
diff --git a/services/location/pom.xml b/services/location/pom.xml
index 7576d28b0991..ab2b34513c76 100644
--- a/services/location/pom.xml
+++ b/services/location/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>location</artifactId>
     <name>AWS Java SDK :: Services :: Location</name>
diff --git a/services/lookoutequipment/pom.xml b/services/lookoutequipment/pom.xml
index a577ec78c749..baac575c6253 100644
--- a/services/lookoutequipment/pom.xml
+++ b/services/lookoutequipment/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lookoutequipment</artifactId>
     <name>AWS Java SDK :: Services :: Lookout Equipment</name>
diff --git a/services/lookoutmetrics/pom.xml b/services/lookoutmetrics/pom.xml
index ce3e548d9321..407df52b9713 100644
--- a/services/lookoutmetrics/pom.xml
+++ b/services/lookoutmetrics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lookoutmetrics</artifactId>
     <name>AWS Java SDK :: Services :: Lookout Metrics</name>
diff --git a/services/lookoutvision/pom.xml b/services/lookoutvision/pom.xml
index f4ccdb7165f5..40fa989cf36e 100644
--- a/services/lookoutvision/pom.xml
+++ b/services/lookoutvision/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>lookoutvision</artifactId>
     <name>AWS Java SDK :: Services :: Lookout Vision</name>
diff --git a/services/m2/pom.xml b/services/m2/pom.xml
index 18841c022f28..4c8ad5aad4d6 100644
--- a/services/m2/pom.xml
+++ b/services/m2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>m2</artifactId>
     <name>AWS Java SDK :: Services :: M2</name>
diff --git a/services/machinelearning/pom.xml b/services/machinelearning/pom.xml
index 3e51376f8c7e..e571095b48d2 100644
--- a/services/machinelearning/pom.xml
+++ b/services/machinelearning/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>machinelearning</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Machine Learning</name>
diff --git a/services/macie2/pom.xml b/services/macie2/pom.xml
index 955b55d7e130..3c997868558e 100644
--- a/services/macie2/pom.xml
+++ b/services/macie2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>macie2</artifactId>
     <name>AWS Java SDK :: Services :: Macie2</name>
diff --git a/services/mailmanager/pom.xml b/services/mailmanager/pom.xml
index 5feaefb6eabd..5e3ff0c2c838 100644
--- a/services/mailmanager/pom.xml
+++ b/services/mailmanager/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>mailmanager</artifactId>
     <name>AWS Java SDK :: Services :: Mail Manager</name>
diff --git a/services/managedblockchain/pom.xml b/services/managedblockchain/pom.xml
index 79143c1c8fc5..81d9fda4da7a 100644
--- a/services/managedblockchain/pom.xml
+++ b/services/managedblockchain/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>managedblockchain</artifactId>
     <name>AWS Java SDK :: Services :: ManagedBlockchain</name>
diff --git a/services/managedblockchainquery/pom.xml b/services/managedblockchainquery/pom.xml
index 6db4b639b9f2..9cdd8379408b 100644
--- a/services/managedblockchainquery/pom.xml
+++ b/services/managedblockchainquery/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>managedblockchainquery</artifactId>
     <name>AWS Java SDK :: Services :: Managed Blockchain Query</name>
diff --git a/services/marketplaceagreement/pom.xml b/services/marketplaceagreement/pom.xml
index fec056104ecf..07450ecc542e 100644
--- a/services/marketplaceagreement/pom.xml
+++ b/services/marketplaceagreement/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>marketplaceagreement</artifactId>
     <name>AWS Java SDK :: Services :: Marketplace Agreement</name>
diff --git a/services/marketplacecatalog/pom.xml b/services/marketplacecatalog/pom.xml
index 99bf3eab8f74..d5f880da4cf6 100644
--- a/services/marketplacecatalog/pom.xml
+++ b/services/marketplacecatalog/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>marketplacecatalog</artifactId>
     <name>AWS Java SDK :: Services :: Marketplace Catalog</name>
diff --git a/services/marketplacecommerceanalytics/pom.xml b/services/marketplacecommerceanalytics/pom.xml
index 941258506cc0..2e8b8d629114 100644
--- a/services/marketplacecommerceanalytics/pom.xml
+++ b/services/marketplacecommerceanalytics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>marketplacecommerceanalytics</artifactId>
     <name>AWS Java SDK :: Services :: AWS Marketplace Commerce Analytics</name>
diff --git a/services/marketplacedeployment/pom.xml b/services/marketplacedeployment/pom.xml
index 96801fca980b..7178203d554c 100644
--- a/services/marketplacedeployment/pom.xml
+++ b/services/marketplacedeployment/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>marketplacedeployment</artifactId>
     <name>AWS Java SDK :: Services :: Marketplace Deployment</name>
diff --git a/services/marketplaceentitlement/pom.xml b/services/marketplaceentitlement/pom.xml
index 09162c67b136..2cd82b66f984 100644
--- a/services/marketplaceentitlement/pom.xml
+++ b/services/marketplaceentitlement/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>marketplaceentitlement</artifactId>
     <name>AWS Java SDK :: Services :: AWS Marketplace Entitlement</name>
diff --git a/services/marketplacemetering/pom.xml b/services/marketplacemetering/pom.xml
index 35fe31cf4f33..805cdbd55ef9 100644
--- a/services/marketplacemetering/pom.xml
+++ b/services/marketplacemetering/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>marketplacemetering</artifactId>
     <name>AWS Java SDK :: Services :: AWS Marketplace Metering Service</name>
diff --git a/services/marketplacereporting/pom.xml b/services/marketplacereporting/pom.xml
index f7e4d6f00782..ecd84d391a83 100644
--- a/services/marketplacereporting/pom.xml
+++ b/services/marketplacereporting/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>marketplacereporting</artifactId>
     <name>AWS Java SDK :: Services :: Marketplace Reporting</name>
diff --git a/services/mediaconnect/pom.xml b/services/mediaconnect/pom.xml
index 8e1e41165d60..4202b612302b 100644
--- a/services/mediaconnect/pom.xml
+++ b/services/mediaconnect/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>mediaconnect</artifactId>
     <name>AWS Java SDK :: Services :: MediaConnect</name>
diff --git a/services/mediaconvert/pom.xml b/services/mediaconvert/pom.xml
index b2d5aa9f3a01..8f73b58c66e1 100644
--- a/services/mediaconvert/pom.xml
+++ b/services/mediaconvert/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mediaconvert</artifactId>
diff --git a/services/medialive/pom.xml b/services/medialive/pom.xml
index 460287110695..d5a7b181460c 100644
--- a/services/medialive/pom.xml
+++ b/services/medialive/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>medialive</artifactId>
diff --git a/services/medialive/src/main/resources/codegen-resources/service-2.json b/services/medialive/src/main/resources/codegen-resources/service-2.json
index 4ea6d8e92dcc..55dde730f6ec 100644
--- a/services/medialive/src/main/resources/codegen-resources/service-2.json
+++ b/services/medialive/src/main/resources/codegen-resources/service-2.json
@@ -10976,7 +10976,7 @@
         "AdaptiveQuantization": {
           "shape": "H264AdaptiveQuantization",
           "locationName": "adaptiveQuantization",
-          "documentation": "Enables or disables adaptive quantization, which is a technique MediaLive can apply to video on a frame-by-frame basis to produce more compression without losing quality. There are three types of adaptive quantization: flicker, spatial, and temporal. Set the field in one of these ways: Set to Auto. Recommended. For each type of AQ, MediaLive will determine if AQ is needed, and if so, the appropriate strength. Set a strength (a value other than Auto or Disable). This strength will apply to any of the AQ fields that you choose to enable. Set to Disabled to disable all types of adaptive quantization."
+          "documentation": "Enables or disables adaptive quantization (AQ), which is a technique MediaLive can apply to video on a frame-by-frame basis to produce more compression without losing quality. There are three types of adaptive quantization: spatial, temporal, and flicker. We recommend that you set the field to Auto. For more information about all the options, see the topic about video adaptive quantization in the MediaLive user guide."
         },
         "AfdSignaling": {
           "shape": "AfdSignaling",
@@ -11026,7 +11026,7 @@
         "FlickerAq": {
           "shape": "H264FlickerAq",
           "locationName": "flickerAq",
-          "documentation": "Flicker AQ makes adjustments within each frame to reduce flicker or 'pop' on I-frames. The value to enter in this field depends on the value in the Adaptive quantization field: If you have set the Adaptive quantization field to Auto, MediaLive ignores any value in this field. MediaLive will determine if flicker AQ is appropriate and will apply the appropriate strength. If you have set the Adaptive quantization field to a strength, you can set this field to Enabled or Disabled. Enabled: MediaLive will apply flicker AQ using the specified strength. Disabled: MediaLive won't apply flicker AQ. If you have set the Adaptive quantization to Disabled, MediaLive ignores any value in this field and doesn't apply flicker AQ."
+          "documentation": "Flicker AQ makes adjustments within each frame to reduce flicker or 'pop' on I-frames. The value to enter in this field depends on the value in the Adaptive quantization field. For more information, see the topic about video adaptive quantization in the MediaLive user guide."
         },
         "ForceFieldPictures": {
           "shape": "H264ForceFieldPictures",
@@ -11156,7 +11156,7 @@
         "SpatialAq": {
           "shape": "H264SpatialAq",
           "locationName": "spatialAq",
-          "documentation": "Spatial AQ makes adjustments within each frame based on spatial variation of content complexity. The value to enter in this field depends on the value in the Adaptive quantization field: If you have set the Adaptive quantization field to Auto, MediaLive ignores any value in this field. MediaLive will determine if spatial AQ is appropriate and will apply the appropriate strength. If you have set the Adaptive quantization field to a strength, you can set this field to Enabled or Disabled. Enabled: MediaLive will apply spatial AQ using the specified strength. Disabled: MediaLive won't apply spatial AQ. If you have set the Adaptive quantization to Disabled, MediaLive ignores any value in this field and doesn't apply spatial AQ."
+          "documentation": "Spatial AQ makes adjustments within each frame based on spatial variation of content complexity. The value to enter in this field depends on the value in the Adaptive quantization field. For more information, see the topic about video adaptive quantization in the MediaLive user guide."
         },
         "SubgopLength": {
           "shape": "H264SubGopLength",
@@ -11171,7 +11171,7 @@
         "TemporalAq": {
           "shape": "H264TemporalAq",
           "locationName": "temporalAq",
-          "documentation": "Temporal makes adjustments within each frame based on temporal variation of content complexity. The value to enter in this field depends on the value in the Adaptive quantization field: If you have set the Adaptive quantization field to Auto, MediaLive ignores any value in this field. MediaLive will determine if temporal AQ is appropriate and will apply the appropriate strength. If you have set the Adaptive quantization field to a strength, you can set this field to Enabled or Disabled. Enabled: MediaLive will apply temporal AQ using the specified strength. Disabled: MediaLive won't apply temporal AQ. If you have set the Adaptive quantization to Disabled, MediaLive ignores any value in this field and doesn't apply temporal AQ."
+          "documentation": "Temporal makes adjustments within each frame based on variations in content complexity over time. The value to enter in this field depends on the value in the Adaptive quantization field. For more information, see the topic about video adaptive quantization in the MediaLive user guide."
         },
         "TimecodeInsertion": {
           "shape": "H264TimecodeInsertionBehavior",
@@ -11187,6 +11187,11 @@
           "shape": "__integerMin1Max51",
           "locationName": "minQp",
           "documentation": "Sets the minimum QP. If you aren't familiar with quantization adjustment, leave the field empty. MediaLive will\napply an appropriate value."
+        },
+        "MinBitrate": {
+          "shape": "__integerMin0",
+          "locationName": "minBitrate",
+          "documentation": "Used for QVBR rate control mode only.\nOptional.\nEnter a minimum bitrate if you want to keep the output bitrate about a threshold, in order to prevent the downstream system from de-allocating network bandwidth for this output."
         }
       },
       "documentation": "H264 Settings"
@@ -11384,7 +11389,7 @@
         "AdaptiveQuantization": {
           "shape": "H265AdaptiveQuantization",
           "locationName": "adaptiveQuantization",
-          "documentation": "Adaptive quantization. Allows intra-frame quantizers to vary to improve visual quality."
+          "documentation": "Enables or disables adaptive quantization (AQ), which is a technique MediaLive can apply to video on a frame-by-frame basis to produce more compression without losing quality. There are three types of adaptive quantization: spatial, temporal, and flicker. Flicker is the only type that you can customize. We recommend that you set the field to Auto. For more information about all the options, see the topic about video adaptive quantization in the MediaLive user guide."
         },
         "AfdSignaling": {
           "shape": "AfdSignaling",
@@ -11429,7 +11434,7 @@
         "FlickerAq": {
           "shape": "H265FlickerAq",
           "locationName": "flickerAq",
-          "documentation": "If set to enabled, adjust quantization within each frame to reduce flicker or 'pop' on I-frames."
+          "documentation": "Flicker AQ makes adjustments within each frame to reduce flicker or 'pop' on I-frames. The value to enter in this field depends on the value in the Adaptive quantization field. For more information, see the topic about video adaptive quantization in the MediaLive user guide."
         },
         "FramerateDenominator": {
           "shape": "__integerMin1Max3003",
@@ -11570,6 +11575,26 @@
           "shape": "H265Deblocking",
           "locationName": "deblocking",
           "documentation": "Enable or disable the deblocking filter for this codec. The filter reduces blocking artifacts at block boundaries,\nwhich improves overall video quality. If the filter is disabled, visible block edges might appear in the output,\nespecially at lower bitrates."
+        },
+        "GopBReference": {
+          "shape": "H265GopBReference",
+          "locationName": "gopBReference",
+          "documentation": "Allows the encoder to use a B-Frame as a reference frame as well.\nENABLED: B-frames will also serve as reference frames.\nDISABLED: B-frames won't be reference frames.\nMust be DISABLED if resolution is greater than 1080p or when using tiled hevc encoding."
+        },
+        "GopNumBFrames": {
+          "shape": "__integerMin0Max3",
+          "locationName": "gopNumBFrames",
+          "documentation": "Sets the number of B-frames between reference frames.\nSet to 2 if resolution is greater than 1080p or when using tiled hevc encoding."
+        },
+        "MinBitrate": {
+          "shape": "__integerMin0Max40000000",
+          "locationName": "minBitrate",
+          "documentation": "Used for QVBR rate control mode only.\nOptional.\nEnter a minimum bitrate if you want to keep the output bitrate about a threshold, in order to prevent the downstream system from de-allocating network bandwidth for this output."
+        },
+        "SubgopLength": {
+          "shape": "H265SubGopLength",
+          "locationName": "subgopLength",
+          "documentation": "Sets the number of B-frames in each sub-GOP.\nFIXED: Use the value in Num B-frames.\nDYNAMIC: Optimizes the number of B-frames in each sub-GOP to improve visual quality.\nMust be FIXED if resolution is greater than 1080p or when using tiled hevc encoding."
         }
       },
       "documentation": "H265 Settings",
@@ -14968,6 +14993,11 @@
           "shape": "OutputLocationRef",
           "locationName": "destination",
           "documentation": "MediaPackage channel destination."
+        },
+        "MediapackageV2GroupSettings": {
+          "shape": "MediaPackageV2GroupSettings",
+          "locationName": "mediapackageV2GroupSettings",
+          "documentation": "Parameters that apply only if the destination parameter (for the output group) specifies a channelGroup and channelName. Use of these two paramters indicates that the output group is for MediaPackage V2 (CMAF Ingest)."
         }
       },
       "documentation": "Media Package Group Settings",
@@ -14998,7 +15028,13 @@
     },
     "MediaPackageOutputSettings": {
       "type": "structure",
-      "members": {},
+      "members": {
+        "MediaPackageV2DestinationSettings": {
+          "shape": "MediaPackageV2DestinationSettings",
+          "locationName": "mediaPackageV2DestinationSettings",
+          "documentation": "Optional settings for MediaPackage V2 destinations"
+        }
+      },
       "documentation": "Media Package Output Settings"
     },
     "MotionGraphicsActivateScheduleActionSettings": {
@@ -25851,6 +25887,11 @@
           "shape": "Av1RateControlMode",
           "locationName": "rateControlMode",
           "documentation": "Rate control mode.\n\nQVBR: Quality will match the specified quality level except when it is constrained by the\nmaximum bitrate.  Recommended if you or your viewers pay for bandwidth.\n\nCBR: Quality varies, depending on the video complexity. Recommended only if you distribute\nyour assets to devices that cannot handle variable bitrates."
+        },
+        "MinBitrate": {
+          "shape": "__integerMin0Max8000000",
+          "locationName": "minBitrate",
+          "documentation": "Used for QVBR rate control mode only.\nOptional.\nEnter a minimum bitrate if you want to keep the output bitrate about a threshold, in order to prevent the downstream system from de-allocating network bandwidth for this output."
         }
       },
       "documentation": "Av1 Settings",
@@ -29331,6 +29372,95 @@
         "ROWS_20",
         "ROWS_24"
       ]
+    },
+    "HlsAutoSelect": {
+      "type": "string",
+      "documentation": "Hls Auto Select",
+      "enum": [
+        "NO",
+        "OMIT",
+        "YES"
+      ]
+    },
+    "HlsDefault": {
+      "type": "string",
+      "documentation": "Hls Default",
+      "enum": [
+        "NO",
+        "OMIT",
+        "YES"
+      ]
+    },
+    "MediaPackageV2DestinationSettings": {
+      "type": "structure",
+      "members": {
+        "AudioGroupId": {
+          "shape": "__string",
+          "locationName": "audioGroupId",
+          "documentation": "Applies only to an output that contains audio. If you want to put several audio encodes into one audio rendition group, decide on a name (ID) for the group. Then in every audio output that you want to belong to that group, enter that ID in this field. Note that this information is part of the HLS specification (not the CMAF specification), but if you include it then MediaPackage will include it in the manifest it creates for the video player."
+        },
+        "AudioRenditionSets": {
+          "shape": "__string",
+          "locationName": "audioRenditionSets",
+          "documentation": "Applies only to an output that contains video, and only if you want to associate one or more audio groups to this video. In this field you assign the groups that you create (in the Group ID fields in the various audio outputs). Enter one group ID, or enter a comma-separated list of group IDs. Note that this information is part of the HLS specification (not the CMAF specification), but if you include it then MediaPackage will include it in the manifest it creates for the video player."
+        },
+        "HlsAutoSelect": {
+          "shape": "HlsAutoSelect",
+          "locationName": "hlsAutoSelect",
+          "documentation": "Specifies whether MediaPackage should set this output as the auto-select rendition in the HLS manifest. YES means this must be the auto-select. NO means this should never be the auto-select. OMIT means MediaPackage decides what to set on this rendition.\nWhen you consider all the renditions, follow these guidelines. You can set zero or one renditions to YES. You can set zero or more renditions to NO, but you can't set all renditions to NO. You can set zero, some, or all to OMIT."
+        },
+        "HlsDefault": {
+          "shape": "HlsDefault",
+          "locationName": "hlsDefault",
+          "documentation": "Specifies whether MediaPackage should set this output as the default rendition in the HLS manifest. YES means this must be the default. NO means this should never be the default. OMIT means MediaPackage decides what to set on this rendition.\nWhen you consider all the renditions, follow these guidelines. You can set zero or one renditions to YES. You can set zero or more renditions to NO, but you can't set all renditions to NO. You can set zero, some, or all to OMIT."
+        }
+      },
+      "documentation": "Media Package V2 Destination Settings"
+    },
+    "MediaPackageV2GroupSettings": {
+      "type": "structure",
+      "members": {
+        "CaptionLanguageMappings": {
+          "shape": "__listOfCaptionLanguageMapping",
+          "locationName": "captionLanguageMappings",
+          "documentation": "Mapping of up to 4 caption channels to caption languages."
+        }
+      },
+      "documentation": "Media Package V2 Group Settings"
+    },
+    "H265GopBReference": {
+      "type": "string",
+      "documentation": "H265 Gop BReference",
+      "enum": [
+        "DISABLED",
+        "ENABLED"
+      ]
+    },
+    "H265SubGopLength": {
+      "type": "string",
+      "documentation": "H265 Sub Gop Length",
+      "enum": [
+        "DYNAMIC",
+        "FIXED"
+      ]
+    },
+    "__integerMin0Max3": {
+      "type": "integer",
+      "min": 0,
+      "max": 3,
+      "documentation": "Placeholder documentation for __integerMin0Max3"
+    },
+    "__integerMin0Max40000000": {
+      "type": "integer",
+      "min": 0,
+      "max": 40000000,
+      "documentation": "Placeholder documentation for __integerMin0Max40000000"
+    },
+    "__integerMin0Max8000000": {
+      "type": "integer",
+      "min": 0,
+      "max": 8000000,
+      "documentation": "Placeholder documentation for __integerMin0Max8000000"
     }
   },
   "documentation": "API for AWS Elemental MediaLive"
diff --git a/services/mediapackage/pom.xml b/services/mediapackage/pom.xml
index 57fbeff6a2df..1a1326eb0f55 100644
--- a/services/mediapackage/pom.xml
+++ b/services/mediapackage/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mediapackage</artifactId>
diff --git a/services/mediapackagev2/pom.xml b/services/mediapackagev2/pom.xml
index d871803c1539..b228fbaa98e5 100644
--- a/services/mediapackagev2/pom.xml
+++ b/services/mediapackagev2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>mediapackagev2</artifactId>
     <name>AWS Java SDK :: Services :: Media Package V2</name>
diff --git a/services/mediapackagevod/pom.xml b/services/mediapackagevod/pom.xml
index cbd312af91b0..eb944c224c43 100644
--- a/services/mediapackagevod/pom.xml
+++ b/services/mediapackagevod/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>mediapackagevod</artifactId>
     <name>AWS Java SDK :: Services :: MediaPackage Vod</name>
diff --git a/services/mediastore/pom.xml b/services/mediastore/pom.xml
index 2fdc6b72af34..71db30e5bb3d 100644
--- a/services/mediastore/pom.xml
+++ b/services/mediastore/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mediastore</artifactId>
diff --git a/services/mediastoredata/pom.xml b/services/mediastoredata/pom.xml
index 932a28ca08d7..39ce3eb3a9c4 100644
--- a/services/mediastoredata/pom.xml
+++ b/services/mediastoredata/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mediastoredata</artifactId>
diff --git a/services/mediatailor/pom.xml b/services/mediatailor/pom.xml
index 7eeef1ef0451..16452b2c953a 100644
--- a/services/mediatailor/pom.xml
+++ b/services/mediatailor/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>mediatailor</artifactId>
     <name>AWS Java SDK :: Services :: MediaTailor</name>
diff --git a/services/medicalimaging/pom.xml b/services/medicalimaging/pom.xml
index fbd8be2943fa..54df25696d5c 100644
--- a/services/medicalimaging/pom.xml
+++ b/services/medicalimaging/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>medicalimaging</artifactId>
     <name>AWS Java SDK :: Services :: Medical Imaging</name>
diff --git a/services/medicalimaging/src/main/resources/codegen-resources/service-2.json b/services/medicalimaging/src/main/resources/codegen-resources/service-2.json
index 4769b935ed7f..9a0078deaf25 100644
--- a/services/medicalimaging/src/main/resources/codegen-resources/service-2.json
+++ b/services/medicalimaging/src/main/resources/codegen-resources/service-2.json
@@ -49,6 +49,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"ValidationException"},
         {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
         {"shape":"ServiceQuotaExceededException"}
       ],
       "documentation":"<p>Create a data store.</p>",
@@ -112,7 +113,8 @@
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Get the import job properties to learn more about the job or job progress.</p> <note> <p>The <code>jobStatus</code> refers to the execution of the import job. Therefore, an import job can return a <code>jobStatus</code> as <code>COMPLETED</code> even if validation issues are discovered during the import process. If a <code>jobStatus</code> returns as <code>COMPLETED</code>, we still recommend you review the output manifests written to S3, as they provide details on the success or failure of individual P10 object imports.</p> </note>"
+      "documentation":"<p>Get the import job properties to learn more about the job or job progress.</p> <note> <p>The <code>jobStatus</code> refers to the execution of the import job. Therefore, an import job can return a <code>jobStatus</code> as <code>COMPLETED</code> even if validation issues are discovered during the import process. If a <code>jobStatus</code> returns as <code>COMPLETED</code>, we still recommend you review the output manifests written to S3, as they provide details on the success or failure of individual P10 object imports.</p> </note>",
+      "readonly":true
     },
     "GetDatastore":{
       "name":"GetDatastore",
@@ -130,7 +132,8 @@
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Get data store properties.</p>"
+      "documentation":"<p>Get data store properties.</p>",
+      "readonly":true
     },
     "GetImageFrame":{
       "name":"GetImageFrame",
@@ -150,7 +153,8 @@
         {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Get an image frame (pixel data) for an image set.</p>",
-      "endpoint":{"hostPrefix":"runtime-"}
+      "endpoint":{"hostPrefix":"runtime-"},
+      "readonly":true
     },
     "GetImageSet":{
       "name":"GetImageSet",
@@ -170,7 +174,8 @@
         {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Get image set properties.</p>",
-      "endpoint":{"hostPrefix":"runtime-"}
+      "endpoint":{"hostPrefix":"runtime-"},
+      "readonly":true
     },
     "GetImageSetMetadata":{
       "name":"GetImageSetMetadata",
@@ -190,7 +195,8 @@
         {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Get metadata attributes for an image set.</p>",
-      "endpoint":{"hostPrefix":"runtime-"}
+      "endpoint":{"hostPrefix":"runtime-"},
+      "readonly":true
     },
     "ListDICOMImportJobs":{
       "name":"ListDICOMImportJobs",
@@ -209,7 +215,8 @@
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>List import jobs created for a specific data store.</p>"
+      "documentation":"<p>List import jobs created for a specific data store.</p>",
+      "readonly":true
     },
     "ListDatastores":{
       "name":"ListDatastores",
@@ -226,7 +233,8 @@
         {"shape":"ValidationException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>List data stores.</p>"
+      "documentation":"<p>List data stores.</p>",
+      "readonly":true
     },
     "ListImageSetVersions":{
       "name":"ListImageSetVersions",
@@ -246,7 +254,8 @@
         {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>List image set versions.</p>",
-      "endpoint":{"hostPrefix":"runtime-"}
+      "endpoint":{"hostPrefix":"runtime-"},
+      "readonly":true
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -264,7 +273,8 @@
         {"shape":"InternalServerException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Lists all tags associated with a medical imaging resource.</p>"
+      "documentation":"<p>Lists all tags associated with a medical imaging resource.</p>",
+      "readonly":true
     },
     "SearchImageSets":{
       "name":"SearchImageSets",
@@ -625,6 +635,10 @@
         "kmsKeyArn":{
           "shape":"KmsKeyArn",
           "documentation":"<p>The Amazon Resource Name (ARN) assigned to the Key Management Service (KMS) key for accessing encrypted data.</p>"
+        },
+        "lambdaAuthorizerArn":{
+          "shape":"LambdaArn",
+          "documentation":"<p>The ARN of the authorizer's Lambda function.</p>"
         }
       }
     },
@@ -762,7 +776,7 @@
     },
     "DICOMNumberOfStudyRelatedInstances":{
       "type":"integer",
-      "max":10000,
+      "max":1000000,
       "min":0
     },
     "DICOMNumberOfStudyRelatedSeries":{
@@ -804,7 +818,7 @@
       "type":"string",
       "max":256,
       "min":0,
-      "pattern":"(?:[0-9][0-9]*|0)(\\.(?:[1-9][0-9]*|0))*",
+      "pattern":"(?:[0-9][0-9]*|0)(\\.(?:[0-9][0-9]*|0))*",
       "sensitive":true
     },
     "DICOMSeriesModality":{
@@ -843,13 +857,13 @@
     },
     "DICOMStudyDescription":{
       "type":"string",
-      "max":64,
+      "max":256,
       "min":0,
       "sensitive":true
     },
     "DICOMStudyId":{
       "type":"string",
-      "max":16,
+      "max":256,
       "min":0,
       "sensitive":true
     },
@@ -857,7 +871,7 @@
       "type":"string",
       "max":256,
       "min":0,
-      "pattern":"(?:[0-9][0-9]*|0)(\\.(?:[1-9][0-9]*|0))*",
+      "pattern":"(?:[0-9][0-9]*|0)(\\.(?:[0-9][0-9]*|0))*",
       "sensitive":true
     },
     "DICOMStudyTime":{
@@ -984,6 +998,10 @@
           "shape":"KmsKeyArn",
           "documentation":"<p>The Amazon Resource Name (ARN) assigned to the Key Management Service (KMS) key for accessing encrypted data.</p>"
         },
+        "lambdaAuthorizerArn":{
+          "shape":"LambdaArn",
+          "documentation":"<p>The ARN of the authorizer's Lambda function.</p>"
+        },
         "datastoreArn":{
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) for the data store.</p>"
@@ -1461,7 +1479,10 @@
         "UPDATED",
         "UPDATE_FAILED",
         "DELETING",
-        "DELETED"
+        "DELETED",
+        "IMPORTING",
+        "IMPORTED",
+        "IMPORT_FAILED"
       ]
     },
     "ImageSetsMetadataSummaries":{
@@ -1542,6 +1563,10 @@
       "min":1,
       "pattern":"arn:aws[a-zA-Z-]{0,16}:kms:[a-z]{2}(-[a-z]{1,16}){1,3}-\\d{1}:\\d{12}:((key/[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12})|(alias/[a-zA-Z0-9:/_-]{1,256}))"
     },
+    "LambdaArn":{
+      "type":"string",
+      "pattern":"arn:(aws[a-zA-Z-]*)?:lambda:[a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:\\d{12}:function:[a-zA-Z0-9-_]+(:(\\$LATEST|[a-zA-Z0-9-_]+))?"
+    },
     "ListDICOMImportJobsRequest":{
       "type":"structure",
       "required":["datastoreId"],
diff --git a/services/memorydb/pom.xml b/services/memorydb/pom.xml
index e48f98bd1c80..54d8ec7fa166 100644
--- a/services/memorydb/pom.xml
+++ b/services/memorydb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>memorydb</artifactId>
     <name>AWS Java SDK :: Services :: Memory DB</name>
diff --git a/services/mgn/pom.xml b/services/mgn/pom.xml
index 0c79180903e4..b748edc89def 100644
--- a/services/mgn/pom.xml
+++ b/services/mgn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>mgn</artifactId>
     <name>AWS Java SDK :: Services :: Mgn</name>
diff --git a/services/migrationhub/pom.xml b/services/migrationhub/pom.xml
index 1b3e979f2442..20790dec2328 100644
--- a/services/migrationhub/pom.xml
+++ b/services/migrationhub/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>migrationhub</artifactId>
diff --git a/services/migrationhubconfig/pom.xml b/services/migrationhubconfig/pom.xml
index 6ee63b353fbe..b1f472020fda 100644
--- a/services/migrationhubconfig/pom.xml
+++ b/services/migrationhubconfig/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>migrationhubconfig</artifactId>
     <name>AWS Java SDK :: Services :: MigrationHub Config</name>
diff --git a/services/migrationhuborchestrator/pom.xml b/services/migrationhuborchestrator/pom.xml
index e0a80836266f..40adee1cb74e 100644
--- a/services/migrationhuborchestrator/pom.xml
+++ b/services/migrationhuborchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>migrationhuborchestrator</artifactId>
     <name>AWS Java SDK :: Services :: Migration Hub Orchestrator</name>
diff --git a/services/migrationhubrefactorspaces/pom.xml b/services/migrationhubrefactorspaces/pom.xml
index 064b985ec034..7f2c99317e66 100644
--- a/services/migrationhubrefactorspaces/pom.xml
+++ b/services/migrationhubrefactorspaces/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>migrationhubrefactorspaces</artifactId>
     <name>AWS Java SDK :: Services :: Migration Hub Refactor Spaces</name>
diff --git a/services/migrationhubstrategy/pom.xml b/services/migrationhubstrategy/pom.xml
index 891cdfe64a6a..3da2a8314932 100644
--- a/services/migrationhubstrategy/pom.xml
+++ b/services/migrationhubstrategy/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>migrationhubstrategy</artifactId>
     <name>AWS Java SDK :: Services :: Migration Hub Strategy</name>
diff --git a/services/mpa/pom.xml b/services/mpa/pom.xml
index ac5468b00617..836d27b55216 100644
--- a/services/mpa/pom.xml
+++ b/services/mpa/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>mpa</artifactId>
     <name>AWS Java SDK :: Services :: MPA</name>
diff --git a/services/mq/pom.xml b/services/mq/pom.xml
index 0dbb5ff36e88..9e7ff884f711 100644
--- a/services/mq/pom.xml
+++ b/services/mq/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mq</artifactId>
diff --git a/services/mturk/pom.xml b/services/mturk/pom.xml
index 324063d833c4..3c12167d2d9c 100644
--- a/services/mturk/pom.xml
+++ b/services/mturk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>mturk</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Mechanical Turk Requester</name>
diff --git a/services/mwaa/pom.xml b/services/mwaa/pom.xml
index 1bb2e1fde111..0a4158d21042 100644
--- a/services/mwaa/pom.xml
+++ b/services/mwaa/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>mwaa</artifactId>
     <name>AWS Java SDK :: Services :: MWAA</name>
diff --git a/services/neptune/pom.xml b/services/neptune/pom.xml
index 03295dfcee27..245b744c2a55 100644
--- a/services/neptune/pom.xml
+++ b/services/neptune/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>neptune</artifactId>
     <name>AWS Java SDK :: Services :: Neptune</name>
diff --git a/services/neptune/src/main/resources/codegen-resources/service-2.json b/services/neptune/src/main/resources/codegen-resources/service-2.json
index c1831d4f4548..58627d3c8bfa 100644
--- a/services/neptune/src/main/resources/codegen-resources/service-2.json
+++ b/services/neptune/src/main/resources/codegen-resources/service-2.json
@@ -1542,7 +1542,7 @@
       "members":{
         "SourceDBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster snapshot to copy. This parameter is not case-sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must specify a valid system snapshot in the \"available\" state.</p> </li> <li> <p>Specify a valid DB snapshot identifier.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot1</code> </p>"
+          "documentation":"<p>The identifier of the DB cluster snapshot to copy. This parameter is not case-sensitive. If the source DB cluster snapshot is in a different region or owned by another account, specify the snapshot ARN.</p> <p>Constraints:</p> <ul> <li> <p>Must specify a valid system snapshot in the \"available\" state.</p> </li> <li> <p>Specify a valid DB snapshot identifier.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot1</code> </p>"
         },
         "TargetDBClusterSnapshotIdentifier":{
           "shape":"String",
diff --git a/services/neptunedata/pom.xml b/services/neptunedata/pom.xml
index f4b8d85ce33b..315d2bf91bc9 100644
--- a/services/neptunedata/pom.xml
+++ b/services/neptunedata/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>neptunedata</artifactId>
     <name>AWS Java SDK :: Services :: Neptunedata</name>
diff --git a/services/neptunegraph/pom.xml b/services/neptunegraph/pom.xml
index 71c56223192d..19247bf03262 100644
--- a/services/neptunegraph/pom.xml
+++ b/services/neptunegraph/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>neptunegraph</artifactId>
     <name>AWS Java SDK :: Services :: Neptune Graph</name>
diff --git a/services/networkfirewall/pom.xml b/services/networkfirewall/pom.xml
index 63df83db06a6..02f41fd892c1 100644
--- a/services/networkfirewall/pom.xml
+++ b/services/networkfirewall/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>networkfirewall</artifactId>
     <name>AWS Java SDK :: Services :: Network Firewall</name>
diff --git a/services/networkfirewall/src/main/resources/codegen-resources/service-2.json b/services/networkfirewall/src/main/resources/codegen-resources/service-2.json
index 3dbc59057982..7857be4ecc00 100644
--- a/services/networkfirewall/src/main/resources/codegen-resources/service-2.json
+++ b/services/networkfirewall/src/main/resources/codegen-resources/service-2.json
@@ -226,7 +226,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"}
       ],
-      "documentation":"<p>Deletes a transit gateway attachment from a Network Firewall. Either the firewall owner or the transit gateway owner can delete the attachment.</p> <important> <p>After you delete a transit gateway attachment, raffic will no longer flow through the firewall endpoints.</p> </important> <p>After you initiate the delete operation, use <a>DescribeFirewall</a> to monitor the deletion status.</p>"
+      "documentation":"<p>Deletes a transit gateway attachment from a Network Firewall. Either the firewall owner or the transit gateway owner can delete the attachment.</p> <important> <p>After you delete a transit gateway attachment, traffic will no longer flow through the firewall endpoints.</p> </important> <p>After you initiate the delete operation, use <a>DescribeFirewall</a> to monitor the deletion status.</p>"
     },
     "DeleteResourcePolicy":{
       "name":"DeleteResourcePolicy",
@@ -695,7 +695,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"}
       ],
-      "documentation":"<p>Rejects a transit gateway attachment request for Network Firewall. When you reject the attachment request, Network Firewall cancels the creation of routing components between the transit gateway and firewall endpoints.</p> <p>Only the firewall owner can reject the attachment. After rejection, no traffic will flow through the firewall endpoints for this attachment.</p> <p>Use <a>DescribeFirewall</a> to monitor the rejection status. To accept the attachment instead of rejecting it, use <a>AcceptNetworkFirewallTransitGatewayAttachment</a>.</p> <note> <p>Once rejected, you cannot reverse this action. To establish connectivity, you must create a new transit gateway-attached firewall.</p> </note>"
+      "documentation":"<p>Rejects a transit gateway attachment request for Network Firewall. When you reject the attachment request, Network Firewall cancels the creation of routing components between the transit gateway and firewall endpoints.</p> <p>Only the transit gateway owner can reject the attachment. After rejection, no traffic will flow through the firewall endpoints for this attachment.</p> <p>Use <a>DescribeFirewall</a> to monitor the rejection status. To accept the attachment instead of rejecting it, use <a>AcceptNetworkFirewallTransitGatewayAttachment</a>.</p> <note> <p>Once rejected, you cannot reverse this action. To establish connectivity, you must create a new transit gateway-attached firewall.</p> </note>"
     },
     "StartAnalysisReport":{
       "name":"StartAnalysisReport",
@@ -1522,7 +1522,7 @@
         },
         "AvailabilityZoneMappings":{
           "shape":"AvailabilityZoneMappings",
-          "documentation":"<p>Required. The Availability Zones where you want to create firewall endpoints for a transit gateway-attached firewall. You must specify at least one Availability Zone. Consider enabling the firewall in every Availability Zone where you have workloads to maintain Availability Zone independence.</p> <p>You can modify Availability Zones later using <a>AssociateAvailabilityZones</a> or <a>DisassociateAvailabilityZones</a>, but this may briefly disrupt traffic. The <code>AvailabilityZoneChangeProtection</code> setting controls whether you can make these modifications.</p>"
+          "documentation":"<p>Required. The Availability Zones where you want to create firewall endpoints for a transit gateway-attached firewall. You must specify at least one Availability Zone. Consider enabling the firewall in every Availability Zone where you have workloads to maintain Availability Zone isolation.</p> <p>You can modify Availability Zones later using <a>AssociateAvailabilityZones</a> or <a>DisassociateAvailabilityZones</a>, but this may briefly disrupt traffic. The <code>AvailabilityZoneChangeProtection</code> setting controls whether you can make these modifications.</p>"
         },
         "AvailabilityZoneChangeProtection":{
           "shape":"Boolean",
@@ -2410,6 +2410,7 @@
     },
     "Domain":{"type":"string"},
     "EnableMonitoringDashboard":{"type":"boolean"},
+    "EnableTLSSessionHolding":{"type":"boolean"},
     "EnabledAnalysisType":{
       "type":"string",
       "enum":[
@@ -2594,6 +2595,10 @@
         "PolicyVariables":{
           "shape":"PolicyVariables",
           "documentation":"<p>Contains variables that you can use to override default Suricata settings in your firewall policy.</p>"
+        },
+        "EnableTLSSessionHolding":{
+          "shape":"EnableTLSSessionHolding",
+          "documentation":"<p>When true, prevents TCP and TLS packets from reaching destination servers until TLS Inspection has evaluated Server Name Indication (SNI) rules. Requires an associated TLS Inspection configuration.</p>"
         }
       },
       "documentation":"<p>The firewall policy defines the behavior of a firewall using a collection of stateless and stateful rule groups and other settings. You can use one firewall policy for multiple firewalls. </p> <p>This, along with <a>FirewallPolicyResponse</a>, define the policy. You can retrieve all objects for a firewall policy by calling <a>DescribeFirewallPolicy</a>.</p>"
@@ -2851,7 +2856,9 @@
       "type":"string",
       "enum":[
         "ALLOWLIST",
-        "DENYLIST"
+        "DENYLIST",
+        "REJECTLIST",
+        "ALERTLIST"
       ]
     },
     "GetAnalysisReportResultsRequest":{
@@ -4077,7 +4084,7 @@
         },
         "GeneratedRulesType":{
           "shape":"GeneratedRulesType",
-          "documentation":"<p>Whether you want to allow or deny access to the domains in your target list.</p>"
+          "documentation":"<p>Whether you want to apply allow, reject, alert, or drop behavior to the domains in your target list.</p> <note> <p>When logging is enabled and you choose Alert, traffic that matches the domain specifications generates an alert in the firewall's logs. Then, traffic either passes, is rejected, or drops based on other rules in the firewall policy.</p> </note>"
         }
       },
       "documentation":"<p>Stateful inspection criteria for a domain list rule group. </p> <p>For HTTPS traffic, domain filtering is SNI-based. It uses the server name indicator extension of the TLS handshake.</p> <p>By default, Network Firewall domain list inspection only includes traffic coming from the VPC where you deploy the firewall. To inspect traffic from IP addresses outside of the deployment VPC, you set the <code>HOME_NET</code> rule variable to include the CIDR range of the deployment VPC plus the other CIDR ranges. For more information, see <a>RuleVariables</a> in this guide and <a href=\"https://docs.aws.amazon.com/network-firewall/latest/developerguide/stateful-rule-groups-domain-names.html\">Stateful domain list rule groups in Network Firewall</a> in the <i>Network Firewall Developer Guide</i>.</p>"
diff --git a/services/networkflowmonitor/pom.xml b/services/networkflowmonitor/pom.xml
index 8d47369ac1c7..e7986f456aa9 100644
--- a/services/networkflowmonitor/pom.xml
+++ b/services/networkflowmonitor/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>networkflowmonitor</artifactId>
     <name>AWS Java SDK :: Services :: Network Flow Monitor</name>
diff --git a/services/networkmanager/pom.xml b/services/networkmanager/pom.xml
index 8a625b10fec7..632b9279bb8f 100644
--- a/services/networkmanager/pom.xml
+++ b/services/networkmanager/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>networkmanager</artifactId>
     <name>AWS Java SDK :: Services :: NetworkManager</name>
diff --git a/services/networkmonitor/pom.xml b/services/networkmonitor/pom.xml
index 254bad19ef39..0e978ba0c912 100644
--- a/services/networkmonitor/pom.xml
+++ b/services/networkmonitor/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>networkmonitor</artifactId>
     <name>AWS Java SDK :: Services :: Network Monitor</name>
diff --git a/services/notifications/pom.xml b/services/notifications/pom.xml
index 31b9bd6c7df8..e9cec2c1769a 100644
--- a/services/notifications/pom.xml
+++ b/services/notifications/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>notifications</artifactId>
     <name>AWS Java SDK :: Services :: Notifications</name>
diff --git a/services/notificationscontacts/pom.xml b/services/notificationscontacts/pom.xml
index cd188e253214..1aa30d87a440 100644
--- a/services/notificationscontacts/pom.xml
+++ b/services/notificationscontacts/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>notificationscontacts</artifactId>
     <name>AWS Java SDK :: Services :: Notifications Contacts</name>
diff --git a/services/oam/pom.xml b/services/oam/pom.xml
index 2a689b63ceef..c65298c12bfc 100644
--- a/services/oam/pom.xml
+++ b/services/oam/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>oam</artifactId>
     <name>AWS Java SDK :: Services :: OAM</name>
diff --git a/services/observabilityadmin/pom.xml b/services/observabilityadmin/pom.xml
index 9d4f749ac075..aa0c364de697 100644
--- a/services/observabilityadmin/pom.xml
+++ b/services/observabilityadmin/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>observabilityadmin</artifactId>
     <name>AWS Java SDK :: Services :: Observability Admin</name>
diff --git a/services/observabilityadmin/src/main/resources/codegen-resources/paginators-1.json b/services/observabilityadmin/src/main/resources/codegen-resources/paginators-1.json
index 89dd107dbb25..35ae05223195 100644
--- a/services/observabilityadmin/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/observabilityadmin/src/main/resources/codegen-resources/paginators-1.json
@@ -1,5 +1,11 @@
 {
   "pagination": {
+    "ListCentralizationRulesForOrganization": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "CentralizationRuleSummaries"
+    },
     "ListResourceTelemetry": {
       "input_token": "NextToken",
       "output_token": "NextToken",
diff --git a/services/observabilityadmin/src/main/resources/codegen-resources/service-2.json b/services/observabilityadmin/src/main/resources/codegen-resources/service-2.json
index 8d6aa0693596..5badbd53581e 100644
--- a/services/observabilityadmin/src/main/resources/codegen-resources/service-2.json
+++ b/services/observabilityadmin/src/main/resources/codegen-resources/service-2.json
@@ -13,6 +13,25 @@
     "uid":"observabilityadmin-2018-05-10"
   },
   "operations":{
+    "CreateCentralizationRuleForOrganization":{
+      "name":"CreateCentralizationRuleForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/CreateCentralizationRuleForOrganization",
+        "responseCode":200
+      },
+      "input":{"shape":"CreateCentralizationRuleForOrganizationInput"},
+      "output":{"shape":"CreateCentralizationRuleForOrganizationOutput"},
+      "errors":[
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ConflictException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Creates a centralization rule that applies across an Amazon Web Services Organization. This operation can only be called by the organization's management account or a delegated administrator account.</p>"
+    },
     "CreateTelemetryRule":{
       "name":"CreateTelemetryRule",
       "http":{
@@ -51,6 +70,23 @@
       ],
       "documentation":"<p> Creates a telemetry rule that applies across an Amazon Web Services Organization. This operation can only be called by the organization's management account or a delegated administrator account. </p>"
     },
+    "DeleteCentralizationRuleForOrganization":{
+      "name":"DeleteCentralizationRuleForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/DeleteCentralizationRuleForOrganization",
+        "responseCode":200
+      },
+      "input":{"shape":"DeleteCentralizationRuleForOrganizationInput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Deletes an organization-wide centralization rule. This operation can only be called by the organization's management account or a delegated administrator account.</p>"
+    },
     "DeleteTelemetryRule":{
       "name":"DeleteTelemetryRule",
       "http":{
@@ -85,6 +121,24 @@
       ],
       "documentation":"<p> Deletes an organization-wide telemetry rule. This operation can only be called by the organization's management account or a delegated administrator account. </p>"
     },
+    "GetCentralizationRuleForOrganization":{
+      "name":"GetCentralizationRuleForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/GetCentralizationRuleForOrganization",
+        "responseCode":200
+      },
+      "input":{"shape":"GetCentralizationRuleForOrganizationInput"},
+      "output":{"shape":"GetCentralizationRuleForOrganizationOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Retrieves the details of a specific organization centralization rule. This operation can only be called by the organization's management account or a delegated administrator account.</p>"
+    },
     "GetTelemetryEvaluationStatus":{
       "name":"GetTelemetryEvaluationStatus",
       "http":{
@@ -152,6 +206,23 @@
       ],
       "documentation":"<p> Retrieves the details of a specific organization telemetry rule. This operation can only be called by the organization's management account or a delegated administrator account. </p>"
     },
+    "ListCentralizationRulesForOrganization":{
+      "name":"ListCentralizationRulesForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListCentralizationRulesForOrganization",
+        "responseCode":200
+      },
+      "input":{"shape":"ListCentralizationRulesForOrganizationInput"},
+      "output":{"shape":"ListCentralizationRulesForOrganizationOutput"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Lists all centralization rules in your organization. This operation can only be called by the organization's management account or a delegated administrator account.</p>"
+    },
     "ListResourceTelemetry":{
       "name":"ListResourceTelemetry",
       "http":{
@@ -333,6 +404,25 @@
       ],
       "documentation":"<p> Removes tags from a telemetry rule resource. </p>"
     },
+    "UpdateCentralizationRuleForOrganization":{
+      "name":"UpdateCentralizationRuleForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/UpdateCentralizationRuleForOrganization",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateCentralizationRuleForOrganizationInput"},
+      "output":{"shape":"UpdateCentralizationRuleForOrganizationOutput"},
+      "errors":[
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Updates an existing centralization rule that applies across an Amazon Web Services Organization. This operation can only be called by the organization's management account or a delegated administrator account.</p>"
+    },
     "UpdateTelemetryRule":{
       "name":"UpdateTelemetryRule",
       "http":{
@@ -403,6 +493,124 @@
       "max":10,
       "min":1
     },
+    "Boolean":{
+      "type":"boolean",
+      "box":true
+    },
+    "CentralizationFailureReason":{
+      "type":"string",
+      "enum":[
+        "TRUSTED_ACCESS_NOT_ENABLED",
+        "DESTINATION_ACCOUNT_NOT_IN_ORGANIZATION",
+        "INTERNAL_SERVER_ERROR"
+      ]
+    },
+    "CentralizationRule":{
+      "type":"structure",
+      "required":[
+        "Source",
+        "Destination"
+      ],
+      "members":{
+        "Source":{
+          "shape":"CentralizationRuleSource",
+          "documentation":"<p>Configuration determining the source of the telemetry data to be centralized.</p>"
+        },
+        "Destination":{
+          "shape":"CentralizationRuleDestination",
+          "documentation":"<p>Configuration determining where the telemetry data should be centralized, backed up, as well as encryption configuration for the primary and backup destinations.</p>"
+        }
+      },
+      "documentation":"<p>Defines how telemetry data should be centralized across an Amazon Web Services Organization, including source and destination configurations.</p>"
+    },
+    "CentralizationRuleDestination":{
+      "type":"structure",
+      "required":["Region"],
+      "members":{
+        "Region":{
+          "shape":"Region",
+          "documentation":"<p>The primary destination region to which telemetry data should be centralized.</p>"
+        },
+        "Account":{
+          "shape":"AccountIdentifier",
+          "documentation":"<p>The destination account (within the organization) to which the telemetry data should be centralized.</p>"
+        },
+        "DestinationLogsConfiguration":{
+          "shape":"DestinationLogsConfiguration",
+          "documentation":"<p>Log specific configuration for centralization destination log groups.</p>"
+        }
+      },
+      "documentation":"<p>Configuration specifying the primary destination for centralized telemetry data.</p>"
+    },
+    "CentralizationRuleSource":{
+      "type":"structure",
+      "required":["Regions"],
+      "members":{
+        "Regions":{
+          "shape":"Regions",
+          "documentation":"<p>The list of source regions from which telemetry data should be centralized.</p>"
+        },
+        "Scope":{
+          "shape":"SourceFilterString",
+          "documentation":"<p>The organizational scope from which telemetry data should be centralized, specified using organization id, accounts or organizational unit ids.</p>"
+        },
+        "SourceLogsConfiguration":{
+          "shape":"SourceLogsConfiguration",
+          "documentation":"<p>Log specific configuration for centralization source log groups.</p>"
+        }
+      },
+      "documentation":"<p>Configuration specifying the source of telemetry data to be centralized.</p>"
+    },
+    "CentralizationRuleSummaries":{
+      "type":"list",
+      "member":{"shape":"CentralizationRuleSummary"}
+    },
+    "CentralizationRuleSummary":{
+      "type":"structure",
+      "members":{
+        "RuleName":{
+          "shape":"RuleName",
+          "documentation":"<p>The name of the organization centralization rule.</p>"
+        },
+        "RuleArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the organization centralization rule.</p>"
+        },
+        "CreatorAccountId":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Web Services Account that created the organization centralization rule.</p>"
+        },
+        "CreatedTimeStamp":{
+          "shape":"Long",
+          "documentation":"<p>The timestamp when the organization centralization rule was created.</p>"
+        },
+        "CreatedRegion":{
+          "shape":"Region",
+          "documentation":"<p>The Amazon Web Services region where the organization centralization rule was created.</p>"
+        },
+        "LastUpdateTimeStamp":{
+          "shape":"Long",
+          "documentation":"<p>The timestamp when the organization centralization rule was last updated.</p>"
+        },
+        "RuleHealth":{
+          "shape":"RuleHealth",
+          "documentation":"<p>The health status of the organization centralization rule.</p>"
+        },
+        "FailureReason":{
+          "shape":"CentralizationFailureReason",
+          "documentation":"<p>The reason why an organization centralization rule is marked UNHEALTHY.</p>"
+        },
+        "DestinationAccountId":{
+          "shape":"String",
+          "documentation":"<p>The primary destination account of the organization centralization rule.</p>"
+        },
+        "DestinationRegion":{
+          "shape":"Region",
+          "documentation":"<p>The primary destination region of the organization centralization rule.</p>"
+        }
+      },
+      "documentation":"<p>A summary of a centralization rule's key properties and status.</p>"
+    },
     "ConflictException":{
       "type":"structure",
       "members":{
@@ -415,6 +623,36 @@
       },
       "exception":true
     },
+    "CreateCentralizationRuleForOrganizationInput":{
+      "type":"structure",
+      "required":[
+        "RuleName",
+        "Rule"
+      ],
+      "members":{
+        "RuleName":{
+          "shape":"RuleName",
+          "documentation":"<p>A unique name for the organization-wide centralization rule being created.</p>"
+        },
+        "Rule":{
+          "shape":"CentralizationRule",
+          "documentation":"<p>The configuration details for the organization-wide centralization rule, including the source configuration and the destination configuration to centralize telemetry data across the organization.</p>"
+        },
+        "Tags":{
+          "shape":"TagMapInput",
+          "documentation":"<p>The key-value pairs to associate with the organization telemetry rule resource for categorization and management purposes.</p>"
+        }
+      }
+    },
+    "CreateCentralizationRuleForOrganizationOutput":{
+      "type":"structure",
+      "members":{
+        "RuleArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the created organization centralization rule.</p>"
+        }
+      }
+    },
     "CreateTelemetryRuleForOrganizationInput":{
       "type":"structure",
       "required":[
@@ -475,6 +713,16 @@
         }
       }
     },
+    "DeleteCentralizationRuleForOrganizationInput":{
+      "type":"structure",
+      "required":["RuleIdentifier"],
+      "members":{
+        "RuleIdentifier":{
+          "shape":"RuleIdentifier",
+          "documentation":"<p>The identifier (name or ARN) of the organization centralization rule to delete.</p>"
+        }
+      }
+    },
     "DeleteTelemetryRuleForOrganizationInput":{
       "type":"structure",
       "required":["RuleIdentifier"],
@@ -495,11 +743,97 @@
         }
       }
     },
+    "DestinationLogsConfiguration":{
+      "type":"structure",
+      "members":{
+        "LogsEncryptionConfiguration":{
+          "shape":"LogsEncryptionConfiguration",
+          "documentation":"<p>The encryption configuration for centralization destination log groups.</p>"
+        },
+        "BackupConfiguration":{
+          "shape":"LogsBackupConfiguration",
+          "documentation":"<p>Configuration defining the backup region and an optional KMS key for the backup destination.</p>"
+        }
+      },
+      "documentation":"<p>Configuration for centralization destination log groups, including encryption and backup settings.</p>"
+    },
     "DestinationType":{
       "type":"string",
       "enum":["cloud-watch-logs"]
     },
+    "EncryptedLogGroupStrategy":{
+      "type":"string",
+      "enum":[
+        "ALLOW",
+        "SKIP"
+      ]
+    },
+    "EncryptionConflictResolutionStrategy":{
+      "type":"string",
+      "enum":[
+        "ALLOW",
+        "SKIP"
+      ]
+    },
+    "EncryptionStrategy":{
+      "type":"string",
+      "enum":[
+        "CUSTOMER_MANAGED",
+        "AWS_OWNED"
+      ]
+    },
     "FailureReason":{"type":"string"},
+    "GetCentralizationRuleForOrganizationInput":{
+      "type":"structure",
+      "required":["RuleIdentifier"],
+      "members":{
+        "RuleIdentifier":{
+          "shape":"RuleIdentifier",
+          "documentation":"<p>The identifier (name or ARN) of the organization centralization rule to retrieve.</p>"
+        }
+      }
+    },
+    "GetCentralizationRuleForOrganizationOutput":{
+      "type":"structure",
+      "members":{
+        "RuleName":{
+          "shape":"RuleName",
+          "documentation":"<p>The name of the organization centralization rule.</p>"
+        },
+        "RuleArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the organization centralization rule.</p>"
+        },
+        "CreatorAccountId":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Web Services Account that created the organization centralization rule.</p>"
+        },
+        "CreatedTimeStamp":{
+          "shape":"Long",
+          "documentation":"<p>The timestamp when the organization centralization rule was created.</p>"
+        },
+        "CreatedRegion":{
+          "shape":"Region",
+          "documentation":"<p>The Amazon Web Services region where the organization centralization rule was created.</p>"
+        },
+        "LastUpdateTimeStamp":{
+          "shape":"Long",
+          "documentation":"<p>The timestamp when the organization centralization rule was last updated.</p>"
+        },
+        "RuleHealth":{
+          "shape":"RuleHealth",
+          "documentation":"<p>The health status of the organization centralization rule.</p>"
+        },
+        "FailureReason":{
+          "shape":"CentralizationFailureReason",
+          "documentation":"<p>The reason why an organization centralization rule is marked UNHEALTHY.</p>"
+        },
+        "CentralizationRule":{
+          "shape":"CentralizationRule",
+          "documentation":"<p>The configuration details for the organization centralization rule.</p>"
+        }
+      }
+    },
     "GetTelemetryEvaluationStatusForOrganizationOutput":{
       "type":"structure",
       "members":{
@@ -616,6 +950,51 @@
       "exception":true,
       "fault":true
     },
+    "ListCentralizationRulesForOrganizationInput":{
+      "type":"structure",
+      "members":{
+        "RuleNamePrefix":{
+          "shape":"ListCentralizationRulesForOrganizationInputRuleNamePrefixString",
+          "documentation":"<p>A string to filter organization centralization rules whose names begin with the specified prefix.</p>"
+        },
+        "AllRegions":{
+          "shape":"Boolean",
+          "documentation":"<p>A flag determining whether to return organization centralization rules from all regions or only the current region.</p>"
+        },
+        "MaxResults":{
+          "shape":"ListCentralizationRulesForOrganizationMaxResults",
+          "documentation":"<p>The maximum number of organization centralization rules to return in a single call.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of results. A previous call generates this token.</p>"
+        }
+      }
+    },
+    "ListCentralizationRulesForOrganizationInputRuleNamePrefixString":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "ListCentralizationRulesForOrganizationMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":100,
+      "min":1
+    },
+    "ListCentralizationRulesForOrganizationOutput":{
+      "type":"structure",
+      "members":{
+        "CentralizationRuleSummaries":{
+          "shape":"CentralizationRuleSummaries",
+          "documentation":"<p>A list of centralization rule summaries.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to resume pagination of results.</p>"
+        }
+      }
+    },
     "ListResourceTelemetryForOrganizationInput":{
       "type":"structure",
       "members":{
@@ -816,6 +1195,45 @@
         }
       }
     },
+    "LogsBackupConfiguration":{
+      "type":"structure",
+      "required":["Region"],
+      "members":{
+        "Region":{
+          "shape":"Region",
+          "documentation":"<p>Logs specific backup destination region within the primary destination account to which log data should be centralized.</p>"
+        },
+        "KmsKeyArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>KMS Key arn belonging to the primary destination account and backup region, to encrypt newly created central log groups in the backup destination.</p>"
+        }
+      },
+      "documentation":"<p>Configuration for backing up centralized log data to a secondary region.</p>"
+    },
+    "LogsEncryptionConfiguration":{
+      "type":"structure",
+      "required":["EncryptionStrategy"],
+      "members":{
+        "EncryptionStrategy":{
+          "shape":"EncryptionStrategy",
+          "documentation":"<p>Configuration that determines the encryption strategy of the destination log groups. CUSTOMER_MANAGED uses the configured KmsKeyArn to encrypt newly created destination log groups.</p>"
+        },
+        "KmsKeyArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>KMS Key arn belonging to the primary destination account and region, to encrypt newly created central log groups in the primary destination.</p>"
+        },
+        "EncryptionConflictResolutionStrategy":{
+          "shape":"EncryptionConflictResolutionStrategy",
+          "documentation":"<p>Conflict resolution strategy for centralization if the encryption strategy is set to CUSTOMER_MANAGED and the destination log group is encrypted with an AWS_OWNED KMS Key. ALLOW lets centralization go through while SKIP prevents centralization into the destination log group.</p>"
+        }
+      },
+      "documentation":"<p>Configuration for encrypting centralized log groups. This configuration is only applied to destination log groups for which the corresponding source log groups are encrypted using Customer Managed KMS Keys.</p>"
+    },
+    "LogsFilterString":{
+      "type":"string",
+      "max":2000,
+      "min":1
+    },
     "Long":{
       "type":"long",
       "box":true
@@ -830,11 +1248,20 @@
       "member":{"shape":"OrganizationUnitIdentifier"},
       "min":1
     },
+    "Region":{
+      "type":"string",
+      "min":1
+    },
+    "Regions":{
+      "type":"list",
+      "member":{"shape":"Region"},
+      "min":1
+    },
     "ResourceArn":{
       "type":"string",
       "max":1011,
       "min":1,
-      "pattern":"arn:aws:([a-zA-Z0-9\\-]+):([a-z0-9\\-]+)?:([0-9]{12})?:(.+)"
+      "pattern":"arn:aws([a-z0-9\\-]+)?:([a-zA-Z0-9\\-]+):([a-z0-9\\-]+)?:([0-9]{12})?:(.+)"
     },
     "ResourceIdentifier":{"type":"string"},
     "ResourceIdentifierPrefix":{
@@ -874,6 +1301,14 @@
       "max":3653,
       "min":1
     },
+    "RuleHealth":{
+      "type":"string",
+      "enum":[
+        "Healthy",
+        "Unhealthy",
+        "Provisioning"
+      ]
+    },
     "RuleIdentifier":{
       "type":"string",
       "max":1011,
@@ -883,7 +1318,7 @@
       "type":"string",
       "max":100,
       "min":1,
-      "pattern":"[0-9A-Za-z-]+"
+      "pattern":"[0-9A-Za-z-_.#/]+"
     },
     "ServiceQuotaExceededException":{
       "type":"structure",
@@ -903,6 +1338,29 @@
       },
       "exception":true
     },
+    "SourceFilterString":{
+      "type":"string",
+      "max":2000,
+      "min":1
+    },
+    "SourceLogsConfiguration":{
+      "type":"structure",
+      "required":[
+        "LogGroupSelectionCriteria",
+        "EncryptedLogGroupStrategy"
+      ],
+      "members":{
+        "LogGroupSelectionCriteria":{
+          "shape":"LogsFilterString",
+          "documentation":"<p>The selection criteria that specifies which source log groups to centralize. The selection criteria uses the same format as OAM link filters.</p>"
+        },
+        "EncryptedLogGroupStrategy":{
+          "shape":"EncryptedLogGroupStrategy",
+          "documentation":"<p>A strategy determining whether to centralize source log groups that are encrypted with customer managed KMS keys (CMK). ALLOW will consider CMK encrypted source log groups for centralization while SKIP will skip CMK encrypted source log groups from centralization.</p>"
+        }
+      },
+      "documentation":"<p>Configuration for selecting and handling source log groups for centralization.</p>"
+    },
     "Status":{
       "type":"string",
       "enum":[
@@ -1130,6 +1588,32 @@
         }
       }
     },
+    "UpdateCentralizationRuleForOrganizationInput":{
+      "type":"structure",
+      "required":[
+        "RuleIdentifier",
+        "Rule"
+      ],
+      "members":{
+        "RuleIdentifier":{
+          "shape":"RuleIdentifier",
+          "documentation":"<p>The identifier (name or ARN) of the organization centralization rule to update.</p>"
+        },
+        "Rule":{
+          "shape":"CentralizationRule",
+          "documentation":"<p>The configuration details for the organization-wide centralization rule, including the source configuration and the destination configuration to centralize telemetry data across the organization.</p>"
+        }
+      }
+    },
+    "UpdateCentralizationRuleForOrganizationOutput":{
+      "type":"structure",
+      "members":{
+        "RuleArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the updated organization centralization rule.</p>"
+        }
+      }
+    },
     "UpdateTelemetryRuleForOrganizationInput":{
       "type":"structure",
       "required":[
diff --git a/services/odb/pom.xml b/services/odb/pom.xml
index 89912efb66f9..d2a2d6fe494c 100644
--- a/services/odb/pom.xml
+++ b/services/odb/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>odb</artifactId>
     <name>AWS Java SDK :: Services :: Odb</name>
diff --git a/services/omics/pom.xml b/services/omics/pom.xml
index cc7eb0c97b1e..96c372b3542f 100644
--- a/services/omics/pom.xml
+++ b/services/omics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>omics</artifactId>
     <name>AWS Java SDK :: Services :: Omics</name>
diff --git a/services/opensearch/pom.xml b/services/opensearch/pom.xml
index b5c5fd5264f1..775f67b581fc 100644
--- a/services/opensearch/pom.xml
+++ b/services/opensearch/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>opensearch</artifactId>
     <name>AWS Java SDK :: Services :: Open Search</name>
diff --git a/services/opensearchserverless/pom.xml b/services/opensearchserverless/pom.xml
index b51fc397e87a..6356d39ba663 100644
--- a/services/opensearchserverless/pom.xml
+++ b/services/opensearchserverless/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>opensearchserverless</artifactId>
     <name>AWS Java SDK :: Services :: Open Search Serverless</name>
diff --git a/services/organizations/pom.xml b/services/organizations/pom.xml
index 6e0e381589a6..38dd408c185a 100644
--- a/services/organizations/pom.xml
+++ b/services/organizations/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>organizations</artifactId>
     <name>AWS Java SDK :: Services :: AWS Organizations</name>
diff --git a/services/osis/pom.xml b/services/osis/pom.xml
index df457621d52d..e290e32434c2 100644
--- a/services/osis/pom.xml
+++ b/services/osis/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>osis</artifactId>
     <name>AWS Java SDK :: Services :: OSIS</name>
diff --git a/services/osis/src/main/resources/codegen-resources/paginators-1.json b/services/osis/src/main/resources/codegen-resources/paginators-1.json
index 1d23f6ce482f..5106ac2849cb 100644
--- a/services/osis/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/osis/src/main/resources/codegen-resources/paginators-1.json
@@ -1,5 +1,17 @@
 {
   "pagination": {
+    "ListPipelineEndpointConnections": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "PipelineEndpointConnections"
+    },
+    "ListPipelineEndpoints": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "PipelineEndpoints"
+    },
     "ListPipelines": {
       "input_token": "NextToken",
       "output_token": "NextToken",
diff --git a/services/osis/src/main/resources/codegen-resources/service-2.json b/services/osis/src/main/resources/codegen-resources/service-2.json
index 0b00e87be216..b20f9f09cf24 100644
--- a/services/osis/src/main/resources/codegen-resources/service-2.json
+++ b/services/osis/src/main/resources/codegen-resources/service-2.json
@@ -31,6 +31,24 @@
       ],
       "documentation":"<p>Creates an OpenSearch Ingestion pipeline. For more information, see <a href=\"https://docs.aws.amazon.com/opensearch-service/latest/developerguide/creating-pipeline.html\">Creating Amazon OpenSearch Ingestion pipelines</a>.</p>"
     },
+    "CreatePipelineEndpoint":{
+      "name":"CreatePipelineEndpoint",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2022-01-01/osis/createPipelineEndpoint"
+      },
+      "input":{"shape":"CreatePipelineEndpointRequest"},
+      "output":{"shape":"CreatePipelineEndpointResponse"},
+      "errors":[
+        {"shape":"DisabledOperationException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Creates a VPC endpoint for an OpenSearch Ingestion pipeline. Pipeline endpoints allow you to ingest data from your VPC into pipelines that you have access to.</p>"
+    },
     "DeletePipeline":{
       "name":"DeletePipeline",
       "http":{
@@ -49,6 +67,42 @@
       ],
       "documentation":"<p>Deletes an OpenSearch Ingestion pipeline. For more information, see <a href=\"https://docs.aws.amazon.com/opensearch-service/latest/developerguide/delete-pipeline.html\">Deleting Amazon OpenSearch Ingestion pipelines</a>.</p>"
     },
+    "DeletePipelineEndpoint":{
+      "name":"DeletePipelineEndpoint",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/2022-01-01/osis/deletePipelineEndpoint/{EndpointId}"
+      },
+      "input":{"shape":"DeletePipelineEndpointRequest"},
+      "output":{"shape":"DeletePipelineEndpointResponse"},
+      "errors":[
+        {"shape":"DisabledOperationException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Deletes a VPC endpoint for an OpenSearch Ingestion pipeline.</p>",
+      "idempotent":true
+    },
+    "DeleteResourcePolicy":{
+      "name":"DeleteResourcePolicy",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/2022-01-01/osis/resourcePolicy/{ResourceArn}"
+      },
+      "input":{"shape":"DeleteResourcePolicyRequest"},
+      "output":{"shape":"DeleteResourcePolicyResponse"},
+      "errors":[
+        {"shape":"DisabledOperationException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Deletes a resource-based policy from an OpenSearch Ingestion resource.</p>",
+      "idempotent":true
+    },
     "GetPipeline":{
       "name":"GetPipeline",
       "http":{
@@ -100,6 +154,24 @@
       ],
       "documentation":"<p>Returns progress information for the current change happening on an OpenSearch Ingestion pipeline. Currently, this operation only returns information when a pipeline is being created.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/opensearch-service/latest/developerguide/creating-pipeline.html#get-pipeline-progress\">Tracking the status of pipeline creation</a>.</p>"
     },
+    "GetResourcePolicy":{
+      "name":"GetResourcePolicy",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2022-01-01/osis/resourcePolicy/{ResourceArn}"
+      },
+      "input":{"shape":"GetResourcePolicyRequest"},
+      "output":{"shape":"GetResourcePolicyResponse"},
+      "errors":[
+        {"shape":"DisabledOperationException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves the resource-based policy attached to an OpenSearch Ingestion resource.</p>"
+    },
     "ListPipelineBlueprints":{
       "name":"ListPipelineBlueprints",
       "http":{
@@ -117,6 +189,40 @@
       ],
       "documentation":"<p>Retrieves a list of all available blueprints for Data Prepper. For more information, see <a href=\"https://docs.aws.amazon.com/opensearch-service/latest/developerguide/creating-pipeline.html#pipeline-blueprint\">Using blueprints to create a pipeline</a>.</p>"
     },
+    "ListPipelineEndpointConnections":{
+      "name":"ListPipelineEndpointConnections",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2022-01-01/osis/listPipelineEndpointConnections"
+      },
+      "input":{"shape":"ListPipelineEndpointConnectionsRequest"},
+      "output":{"shape":"ListPipelineEndpointConnectionsResponse"},
+      "errors":[
+        {"shape":"DisabledOperationException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Lists the pipeline endpoints connected to pipelines in your account.</p>"
+    },
+    "ListPipelineEndpoints":{
+      "name":"ListPipelineEndpoints",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2022-01-01/osis/listPipelineEndpoints"
+      },
+      "input":{"shape":"ListPipelineEndpointsRequest"},
+      "output":{"shape":"ListPipelineEndpointsResponse"},
+      "errors":[
+        {"shape":"DisabledOperationException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Lists all pipeline endpoints in your account.</p>"
+    },
     "ListPipelines":{
       "name":"ListPipelines",
       "http":{
@@ -151,6 +257,43 @@
       ],
       "documentation":"<p>Lists all resource tags associated with an OpenSearch Ingestion pipeline. For more information, see <a href=\"https://docs.aws.amazon.com/opensearch-service/latest/developerguide/tag-pipeline.html\">Tagging Amazon OpenSearch Ingestion pipelines</a>.</p>"
     },
+    "PutResourcePolicy":{
+      "name":"PutResourcePolicy",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/2022-01-01/osis/resourcePolicy/{ResourceArn}"
+      },
+      "input":{"shape":"PutResourcePolicyRequest"},
+      "output":{"shape":"PutResourcePolicyResponse"},
+      "errors":[
+        {"shape":"DisabledOperationException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Attaches a resource-based policy to an OpenSearch Ingestion resource. Resource-based policies grant permissions to principals to perform actions on the resource.</p>",
+      "idempotent":true
+    },
+    "RevokePipelineEndpointConnections":{
+      "name":"RevokePipelineEndpointConnections",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2022-01-01/osis/revokePipelineEndpointConnections"
+      },
+      "input":{"shape":"RevokePipelineEndpointConnectionsRequest"},
+      "output":{"shape":"RevokePipelineEndpointConnectionsResponse"},
+      "errors":[
+        {"shape":"DisabledOperationException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Revokes pipeline endpoints from specified endpoint IDs.</p>",
+      "idempotent":true
+    },
     "StartPipeline":{
       "name":"StartPipeline",
       "http":{
@@ -265,6 +408,12 @@
       "error":{"httpStatusCode":403},
       "exception":true
     },
+    "AwsAccountId":{
+      "type":"string",
+      "max":12,
+      "min":12,
+      "pattern":"^\\\\d{12}$"
+    },
     "BlueprintFormat":{
       "type":"string",
       "pattern":"(YAML|JSON)"
@@ -373,6 +522,44 @@
       "error":{"httpStatusCode":409},
       "exception":true
     },
+    "CreatePipelineEndpointRequest":{
+      "type":"structure",
+      "required":[
+        "PipelineArn",
+        "VpcOptions"
+      ],
+      "members":{
+        "PipelineArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the pipeline to create the endpoint for.</p>"
+        },
+        "VpcOptions":{
+          "shape":"PipelineEndpointVpcOptions",
+          "documentation":"<p>Container for the VPC configuration for the pipeline endpoint, including subnet IDs and security group IDs.</p>"
+        }
+      }
+    },
+    "CreatePipelineEndpointResponse":{
+      "type":"structure",
+      "members":{
+        "PipelineArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the pipeline associated with the endpoint.</p>"
+        },
+        "EndpointId":{
+          "shape":"PipelineEndpointId",
+          "documentation":"<p>The unique identifier of the pipeline endpoint.</p>"
+        },
+        "Status":{
+          "shape":"PipelineEndpointStatus",
+          "documentation":"<p>The current status of the pipeline endpoint.</p>"
+        },
+        "VpcId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the VPC where the pipeline endpoint was created.</p>"
+        }
+      }
+    },
     "CreatePipelineRequest":{
       "type":"structure",
       "required":[
@@ -420,7 +607,7 @@
         },
         "PipelineRoleArn":{
           "shape":"PipelineRoleArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of an IAM role that provides the required permissions for a pipeline to read from the source and write to the sink. For more information, see <a href=\"https://docs.aws.amazon.com/opensearch-service/latest/developerguide/pipeline-security-overview.html\">Setting up roles and users in Amazon OpenSearch Ingestion</a>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that grants the pipeline permission to access Amazon Web Services resources.</p>"
         }
       }
     },
@@ -433,6 +620,22 @@
         }
       }
     },
+    "DeletePipelineEndpointRequest":{
+      "type":"structure",
+      "required":["EndpointId"],
+      "members":{
+        "EndpointId":{
+          "shape":"PipelineEndpointId",
+          "documentation":"<p>The unique identifier of the pipeline endpoint to delete.</p>",
+          "location":"uri",
+          "locationName":"EndpointId"
+        }
+      }
+    },
+    "DeletePipelineEndpointResponse":{
+      "type":"structure",
+      "members":{}
+    },
     "DeletePipelineRequest":{
       "type":"structure",
       "required":["PipelineName"],
@@ -449,6 +652,22 @@
       "type":"structure",
       "members":{}
     },
+    "DeleteResourcePolicyRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource from which to delete the policy.</p>",
+          "location":"uri",
+          "locationName":"ResourceArn"
+        }
+      }
+    },
+    "DeleteResourcePolicyResponse":{
+      "type":"structure",
+      "members":{}
+    },
     "DisabledOperationException":{
       "type":"structure",
       "members":{},
@@ -540,6 +759,31 @@
         }
       }
     },
+    "GetResourcePolicyRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource for which to retrieve the policy.</p>",
+          "location":"uri",
+          "locationName":"ResourceArn"
+        }
+      }
+    },
+    "GetResourcePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "ResourceArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "Policy":{
+          "shape":"ResourcePolicy",
+          "documentation":"<p>The resource-based policy document in JSON format.</p>"
+        }
+      }
+    },
     "IngestEndpointUrlsList":{
       "type":"list",
       "member":{"shape":"String"}
@@ -584,6 +828,66 @@
         }
       }
     },
+    "ListPipelineEndpointConnectionsRequest":{
+      "type":"structure",
+      "members":{
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of pipeline endpoint connections to return in the response.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If your initial <code>ListPipelineEndpointConnections</code> operation returns a <code>nextToken</code>, you can include the returned <code>nextToken</code> in subsequent <code>ListPipelineEndpointConnections</code> operations, which returns results in the next page.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "ListPipelineEndpointConnectionsResponse":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>When <code>nextToken</code> is returned, there are more results available. The value of <code>nextToken</code> is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page.</p>"
+        },
+        "PipelineEndpointConnections":{
+          "shape":"PipelineEndpointConnectionsSummaryList",
+          "documentation":"<p>A list of pipeline endpoint connections.</p>"
+        }
+      }
+    },
+    "ListPipelineEndpointsRequest":{
+      "type":"structure",
+      "members":{
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of pipeline endpoints to return in the response.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If your initial <code>ListPipelineEndpoints</code> operation returns a <code>NextToken</code>, you can include the returned <code>NextToken</code> in subsequent <code>ListPipelineEndpoints</code> operations, which returns results in the next page.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "ListPipelineEndpointsResponse":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>When <code>NextToken</code> is returned, there are more results available. The value of <code>NextToken</code> is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page.</p>"
+        },
+        "PipelineEndpoints":{
+          "shape":"PipelineEndpointsSummaryList",
+          "documentation":"<p>A list of pipeline endpoints.</p>"
+        }
+      }
+    },
     "ListPipelinesRequest":{
       "type":"structure",
       "members":{
@@ -737,7 +1041,7 @@
         },
         "PipelineRoleArn":{
           "shape":"PipelineRoleArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that provides the required permissions for a pipeline to read from the source and write to the sink.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that the pipeline uses to access AWS resources.</p>"
         }
       },
       "documentation":"<p>Information about an existing OpenSearch Ingestion pipeline.</p>"
@@ -831,6 +1135,101 @@
       "type":"list",
       "member":{"shape":"PipelineDestination"}
     },
+    "PipelineEndpoint":{
+      "type":"structure",
+      "members":{
+        "PipelineArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the pipeline associated with this endpoint.</p>"
+        },
+        "EndpointId":{
+          "shape":"PipelineEndpointId",
+          "documentation":"<p>The unique identifier for the pipeline endpoint.</p>"
+        },
+        "Status":{
+          "shape":"PipelineEndpointStatus",
+          "documentation":"<p>The current status of the pipeline endpoint.</p>"
+        },
+        "VpcId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the VPC where the pipeline endpoint is created.</p>"
+        },
+        "VpcOptions":{
+          "shape":"PipelineEndpointVpcOptions",
+          "documentation":"<p>Configuration options for the VPC endpoint, including subnet and security group settings.</p>"
+        },
+        "IngestEndpointUrl":{
+          "shape":"String",
+          "documentation":"<p>The URL used to ingest data to the pipeline through the VPC endpoint.</p>"
+        }
+      },
+      "documentation":"<p>Represents a VPC endpoint for an OpenSearch Ingestion pipeline, enabling private connectivity between your VPC and the pipeline.</p>"
+    },
+    "PipelineEndpointConnection":{
+      "type":"structure",
+      "members":{
+        "PipelineArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the pipeline in the endpoint connection.</p>"
+        },
+        "EndpointId":{
+          "shape":"PipelineEndpointId",
+          "documentation":"<p>The unique identifier of the endpoint in the connection.</p>"
+        },
+        "Status":{
+          "shape":"PipelineEndpointStatus",
+          "documentation":"<p>The current status of the pipeline endpoint connection.</p>"
+        },
+        "VpcEndpointOwner":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The Amazon Web Services account ID that owns the VPC endpoint used in this connection.</p>"
+        }
+      },
+      "documentation":"<p>Represents a connection to a pipeline endpoint, containing details about the endpoint association.</p>"
+    },
+    "PipelineEndpointConnectionsSummaryList":{
+      "type":"list",
+      "member":{"shape":"PipelineEndpointConnection"}
+    },
+    "PipelineEndpointId":{
+      "type":"string",
+      "max":512,
+      "min":3,
+      "pattern":"^[a-zA-Z0-9][a-zA-Z0-9-_]+$"
+    },
+    "PipelineEndpointIdsList":{
+      "type":"list",
+      "member":{"shape":"PipelineEndpointId"}
+    },
+    "PipelineEndpointStatus":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "ACTIVE",
+        "CREATE_FAILED",
+        "DELETING",
+        "REVOKING",
+        "REVOKED"
+      ]
+    },
+    "PipelineEndpointVpcOptions":{
+      "type":"structure",
+      "members":{
+        "SubnetIds":{
+          "shape":"SubnetIds",
+          "documentation":"<p>A list of subnet IDs where the pipeline endpoint network interfaces are created.</p>"
+        },
+        "SecurityGroupIds":{
+          "shape":"SecurityGroupIds",
+          "documentation":"<p>A list of security group IDs that control network access to the pipeline endpoint.</p>"
+        }
+      },
+      "documentation":"<p>Configuration settings for the VPC endpoint, specifying network access controls.</p>"
+    },
+    "PipelineEndpointsSummaryList":{
+      "type":"list",
+      "member":{"shape":"PipelineEndpoint"}
+    },
     "PipelineName":{
       "type":"string",
       "max":28,
@@ -919,6 +1318,38 @@
       "type":"integer",
       "min":1
     },
+    "PutResourcePolicyRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Policy"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to attach the policy to.</p>",
+          "location":"uri",
+          "locationName":"ResourceArn"
+        },
+        "Policy":{
+          "shape":"ResourcePolicy",
+          "documentation":"<p>The resource-based policy document in JSON format.</p>"
+        }
+      }
+    },
+    "PutResourcePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "ResourceArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "Policy":{
+          "shape":"ResourcePolicy",
+          "documentation":"<p>The resource-based policy document that was attached to the resource.</p>"
+        }
+      }
+    },
     "ResourceAlreadyExistsException":{
       "type":"structure",
       "members":{},
@@ -933,6 +1364,37 @@
       "error":{"httpStatusCode":404},
       "exception":true
     },
+    "ResourcePolicy":{
+      "type":"string",
+      "max":204800,
+      "min":2
+    },
+    "RevokePipelineEndpointConnectionsRequest":{
+      "type":"structure",
+      "required":[
+        "PipelineArn",
+        "EndpointIds"
+      ],
+      "members":{
+        "PipelineArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the pipeline from which to revoke endpoint connections.</p>"
+        },
+        "EndpointIds":{
+          "shape":"PipelineEndpointIdsList",
+          "documentation":"<p>A list of endpoint IDs for which to revoke access to the pipeline.</p>"
+        }
+      }
+    },
+    "RevokePipelineEndpointConnectionsResponse":{
+      "type":"structure",
+      "members":{
+        "PipelineArn":{
+          "shape":"PipelineArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the pipeline from which endpoint connections were revoked.</p>"
+        }
+      }
+    },
     "SecurityGroupId":{
       "type":"string",
       "max":20,
@@ -1133,7 +1595,7 @@
         },
         "PipelineRoleArn":{
           "shape":"PipelineRoleArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of an IAM role that provides the required permissions for a pipeline to read from the source and write to the sink. For more information, see <a href=\"https://docs.aws.amazon.com/opensearch-service/latest/developerguide/pipeline-security-overview.html\">Setting up roles and users in Amazon OpenSearch Ingestion</a>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that grants the pipeline permission to access Amazon Web Services resources.</p>"
         }
       }
     },
diff --git a/services/outposts/pom.xml b/services/outposts/pom.xml
index 539757861157..20b8ee62cf9f 100644
--- a/services/outposts/pom.xml
+++ b/services/outposts/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>outposts</artifactId>
     <name>AWS Java SDK :: Services :: Outposts</name>
diff --git a/services/panorama/pom.xml b/services/panorama/pom.xml
index 100531819896..1a469aca7cf4 100644
--- a/services/panorama/pom.xml
+++ b/services/panorama/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>panorama</artifactId>
     <name>AWS Java SDK :: Services :: Panorama</name>
diff --git a/services/partnercentralselling/pom.xml b/services/partnercentralselling/pom.xml
index 2986d87e3f8e..e05c2b3912a0 100644
--- a/services/partnercentralselling/pom.xml
+++ b/services/partnercentralselling/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>partnercentralselling</artifactId>
     <name>AWS Java SDK :: Services :: Partner Central Selling</name>
diff --git a/services/paymentcryptography/pom.xml b/services/paymentcryptography/pom.xml
index 7eb5e18d4316..6a5d034eda0c 100644
--- a/services/paymentcryptography/pom.xml
+++ b/services/paymentcryptography/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>paymentcryptography</artifactId>
     <name>AWS Java SDK :: Services :: Payment Cryptography</name>
diff --git a/services/paymentcryptography/src/main/resources/codegen-resources/service-2.json b/services/paymentcryptography/src/main/resources/codegen-resources/service-2.json
index f041f35db33e..d9a6f192a090 100644
--- a/services/paymentcryptography/src/main/resources/codegen-resources/service-2.json
+++ b/services/paymentcryptography/src/main/resources/codegen-resources/service-2.json
@@ -190,6 +190,24 @@
       ],
       "documentation":"<p>Gets the Amazon Web Services Payment Cryptography key associated with the alias.</p> <p> <b>Cross-account use:</b> This operation can't be used across different Amazon Web Services accounts.</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_CreateAlias.html\">CreateAlias</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_DeleteAlias.html\">DeleteAlias</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_ListAliases.html\">ListAliases</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_UpdateAlias.html\">UpdateAlias</a> </p> </li> </ul>"
     },
+    "GetCertificateSigningRequest":{
+      "name":"GetCertificateSigningRequest",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetCertificateSigningRequestInput"},
+      "output":{"shape":"GetCertificateSigningRequestOutput"},
+      "errors":[
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Used to retrieve the public key for a keypair.</p>"
+    },
     "GetDefaultKeyReplicationRegions":{
       "name":"GetDefaultKeyReplicationRegions",
       "http":{
@@ -564,6 +582,90 @@
       "type":"boolean",
       "box":true
     },
+    "CertificateSigningRequestType":{
+      "type":"string",
+      "max":32768,
+      "min":1,
+      "pattern":"[^\\[;\\]<>]+",
+      "sensitive":true
+    },
+    "CertificateSubjectType":{
+      "type":"structure",
+      "required":["CommonName"],
+      "members":{
+        "CommonName":{
+          "shape":"CertificateSubjectTypeCommonNameString",
+          "documentation":"<p>Common Name to be used in the certificate signing request</p>"
+        },
+        "OrganizationUnit":{
+          "shape":"CertificateSubjectTypeOrganizationUnitString",
+          "documentation":"<p>Organization Unit to be used in the certificate signing request</p>"
+        },
+        "Organization":{
+          "shape":"CertificateSubjectTypeOrganizationString",
+          "documentation":"<p>Organization to be used in the certificate signing request</p>"
+        },
+        "City":{
+          "shape":"CertificateSubjectTypeCityString",
+          "documentation":"<p>City to be used in the certificate signing request</p>"
+        },
+        "Country":{
+          "shape":"CertificateSubjectTypeCountryString",
+          "documentation":"<p>Country to be used in the certificate signing request</p>"
+        },
+        "StateOrProvince":{
+          "shape":"CertificateSubjectTypeStateOrProvinceString",
+          "documentation":"<p>State Or Province to be used in the certificate signing request</p>"
+        },
+        "EmailAddress":{
+          "shape":"CertificateSubjectTypeEmailAddressString",
+          "documentation":"<p>Email to be used in the certificate signing request</p>"
+        }
+      },
+      "documentation":"<p>Metadata used in generating the CSR</p>"
+    },
+    "CertificateSubjectTypeCityString":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[A-Za-z]+"
+    },
+    "CertificateSubjectTypeCommonNameString":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[A-Za-z]+"
+    },
+    "CertificateSubjectTypeCountryString":{
+      "type":"string",
+      "max":2,
+      "min":2,
+      "pattern":"[A-Za-z]+"
+    },
+    "CertificateSubjectTypeEmailAddressString":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*"
+    },
+    "CertificateSubjectTypeOrganizationString":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[A-Za-z]+"
+    },
+    "CertificateSubjectTypeOrganizationUnitString":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[A-Za-z]+"
+    },
+    "CertificateSubjectTypeStateOrProvinceString":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[A-Za-z]+"
+    },
     "CertificateType":{
       "type":"string",
       "max":32768,
@@ -943,7 +1045,6 @@
       "required":[
         "CertificateAuthorityPublicKeyIdentifier",
         "WrappingKeyCertificate",
-        "ExportToken",
         "KeyBlockFormat"
       ],
       "members":{
@@ -959,6 +1060,14 @@
           "shape":"ExportTokenId",
           "documentation":"<p>The export token to initiate key export from Amazon Web Services Payment Cryptography. It also contains the signing key certificate that will sign the wrapped key during TR-34 key block generation. Call <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_GetParametersForExport.html\">GetParametersForExport</a> to receive an export token. It expires after 30 days. You can use the same export token to export multiple keys from the same service account.</p>"
         },
+        "SigningKeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>Key Identifier used for signing the export key</p>"
+        },
+        "SigningKeyCertificate":{
+          "shape":"CertificateType",
+          "documentation":"<p>Certificate used for signing the export key</p>"
+        },
         "KeyBlockFormat":{
           "shape":"Tr34KeyBlockFormat",
           "documentation":"<p>The format of key block that Amazon Web Services Payment Cryptography will use during key export.</p>"
@@ -994,6 +1103,38 @@
         }
       }
     },
+    "GetCertificateSigningRequestInput":{
+      "type":"structure",
+      "required":[
+        "KeyIdentifier",
+        "SigningAlgorithm",
+        "CertificateSubject"
+      ],
+      "members":{
+        "KeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>Asymmetric key used for generating the certificate signing request</p>"
+        },
+        "SigningAlgorithm":{
+          "shape":"SigningAlgorithmType",
+          "documentation":"<p>Algorithm used to generate the certificate signing request</p>"
+        },
+        "CertificateSubject":{
+          "shape":"CertificateSubjectType",
+          "documentation":"<p>Certificate subject data</p>"
+        }
+      }
+    },
+    "GetCertificateSigningRequestOutput":{
+      "type":"structure",
+      "required":["CertificateSigningRequest"],
+      "members":{
+        "CertificateSigningRequest":{
+          "shape":"CertificateSigningRequestType",
+          "documentation":"<p>Certificate signing request</p>"
+        }
+      }
+    },
     "GetDefaultKeyReplicationRegionsInput":{
       "type":"structure",
       "members":{},
@@ -1329,7 +1470,6 @@
       "required":[
         "CertificateAuthorityPublicKeyIdentifier",
         "SigningKeyCertificate",
-        "ImportToken",
         "WrappedKeyBlock",
         "KeyBlockFormat"
       ],
@@ -1346,6 +1486,14 @@
           "shape":"ImportTokenId",
           "documentation":"<p>The import token that initiates key import using the asymmetric TR-34 key exchange method into Amazon Web Services Payment Cryptography. It expires after 30 days. You can use the same import token to import multiple keys to the same service account.</p>"
         },
+        "WrappingKeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>Key Identifier used for unwrapping the import key</p>"
+        },
+        "WrappingKeyCertificate":{
+          "shape":"CertificateType",
+          "documentation":"<p>Key Identifier used for unwrapping the import key</p>"
+        },
         "WrappedKeyBlock":{
           "shape":"Tr34WrappedKeyBlock",
           "documentation":"<p>The TR-34 wrapped key block to import.</p>"
@@ -1704,7 +1852,10 @@
           "shape":"Boolean",
           "documentation":"<p>Specifies whether the key is enabled. </p>"
         },
-        "MultiRegionKeyType":{"shape":"MultiRegionKeyType"},
+        "MultiRegionKeyType":{
+          "shape":"MultiRegionKeyType",
+          "documentation":"<p>Indicates whether this key is a multi-region key and its role in the multi-region key hierarchy.</p> <p>Multi-region keys allow the same key material to be used across multiple Amazon Web Services Regions. This field specifies whether the key is a primary key (which can be replicated to other regions) or a replica key (which is a copy of a primary key in another region).</p>"
+        },
         "PrimaryRegion":{"shape":"Region"}
       },
       "documentation":"<p>Metadata about an Amazon Web Services Payment Cryptography key.</p>"
@@ -1928,7 +2079,10 @@
       "type":"structure",
       "required":["Status"],
       "members":{
-        "Status":{"shape":"KeyReplicationState"},
+        "Status":{
+          "shape":"KeyReplicationState",
+          "documentation":"<p>The current status of key replication in this region.</p> <p>This field indicates whether the key replication is in progress, completed successfully, or has encountered an error. Possible values include states such as SYNCRHONIZED, IN_PROGRESS, DELETE_IN_PROGRESS, or FAILED. This provides visibility into the replication process for monitoring and troubleshooting purposes.</p>"
+        },
         "StatusMessage":{
           "shape":"String",
           "documentation":"<p>A message that provides additional information about the current replication status of the key.</p> <p>This field contains details about any issues or progress updates related to key replication operations. It may include information about replication failures, synchronization status, or other operational details.</p>"
@@ -2014,6 +2168,16 @@
       "min":2,
       "pattern":"(?:[0-9a-fA-F][0-9a-fA-F])+"
     },
+    "SigningAlgorithmType":{
+      "type":"string",
+      "documentation":"<p>Defines the Algorithm used to generate the certificate signing request</p>",
+      "enum":[
+        "SHA224",
+        "SHA256",
+        "SHA384",
+        "SHA512"
+      ]
+    },
     "StartKeyUsageInput":{
       "type":"structure",
       "required":["KeyIdentifier"],
diff --git a/services/paymentcryptographydata/pom.xml b/services/paymentcryptographydata/pom.xml
index bb9908e67baa..4f8099287479 100644
--- a/services/paymentcryptographydata/pom.xml
+++ b/services/paymentcryptographydata/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>paymentcryptographydata</artifactId>
     <name>AWS Java SDK :: Services :: Payment Cryptography Data</name>
diff --git a/services/pcaconnectorad/pom.xml b/services/pcaconnectorad/pom.xml
index d6e95ec5dc35..73043266686e 100644
--- a/services/pcaconnectorad/pom.xml
+++ b/services/pcaconnectorad/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>pcaconnectorad</artifactId>
     <name>AWS Java SDK :: Services :: Pca Connector Ad</name>
diff --git a/services/pcaconnectorscep/pom.xml b/services/pcaconnectorscep/pom.xml
index 1cc04ba3e300..7a03387a15f6 100644
--- a/services/pcaconnectorscep/pom.xml
+++ b/services/pcaconnectorscep/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>pcaconnectorscep</artifactId>
     <name>AWS Java SDK :: Services :: Pca Connector Scep</name>
diff --git a/services/pcs/pom.xml b/services/pcs/pom.xml
index 0670521b41e2..35a04f29d294 100644
--- a/services/pcs/pom.xml
+++ b/services/pcs/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>pcs</artifactId>
     <name>AWS Java SDK :: Services :: PCS</name>
diff --git a/services/pcs/src/main/resources/codegen-resources/service-2.json b/services/pcs/src/main/resources/codegen-resources/service-2.json
index 538d6c8fdeff..cb98b62ac1b6 100644
--- a/services/pcs/src/main/resources/codegen-resources/service-2.json
+++ b/services/pcs/src/main/resources/codegen-resources/service-2.json
@@ -639,7 +639,7 @@
         },
         "purchaseOption":{
           "shape":"PurchaseOption",
-          "documentation":"<p>Specifies how EC2 instances are purchased on your behalf. Amazon Web Services PCS supports On-Demand and Spot instances. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Instance purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
+          "documentation":"<p>Specifies how EC2 instances are purchased on your behalf. PCS supports On-Demand Instances, Spot Instances, and Amazon EC2 Capacity Blocks for ML. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Amazon EC2 billing and purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For more information about PCS support for Capacity Blocks, see <a href=\"https://docs.aws.amazon.com/pcs/latest/userguide/capacity-blocks.html\">Using Amazon EC2 Capacity Blocks for ML with PCS</a> in the <i>PCS User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
         },
         "customLaunchTemplate":{"shape":"CustomLaunchTemplate"},
         "iamInstanceProfileArn":{
@@ -649,7 +649,7 @@
         "scalingConfiguration":{"shape":"ScalingConfiguration"},
         "instanceConfigs":{
           "shape":"InstanceList",
-          "documentation":"<p>A list of EC2 instance configurations that Amazon Web Services PCS can provision in the compute node group.</p>"
+          "documentation":"<p>A list of EC2 instance configurations that PCS can provision in the compute node group.</p>"
         },
         "spotOptions":{"shape":"SpotOptions"},
         "slurmConfiguration":{"shape":"ComputeNodeGroupSlurmConfiguration"},
@@ -866,7 +866,7 @@
         },
         "purchaseOption":{
           "shape":"PurchaseOption",
-          "documentation":"<p>Specifies how EC2 instances are purchased on your behalf. Amazon Web Services PCS supports On-Demand and Spot instances. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Instance purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
+          "documentation":"<p>Specifies how EC2 instances are purchased on your behalf. PCS supports On-Demand Instances, Spot Instances, and Amazon EC2 Capacity Blocks for ML. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Amazon EC2 billing and purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For more information about PCS support for Capacity Blocks, see <a href=\"https://docs.aws.amazon.com/pcs/latest/userguide/capacity-blocks.html\">Using Amazon EC2 Capacity Blocks for ML with PCS</a> in the <i>PCS User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
         },
         "customLaunchTemplate":{"shape":"CustomLaunchTemplate"},
         "iamInstanceProfileArn":{
@@ -879,7 +879,7 @@
         },
         "instanceConfigs":{
           "shape":"InstanceList",
-          "documentation":"<p>A list of EC2 instance configurations that Amazon Web Services PCS can provision in the compute node group.</p>"
+          "documentation":"<p>A list of EC2 instance configurations that PCS can provision in the compute node group.</p>"
         },
         "spotOptions":{"shape":"SpotOptions"},
         "slurmConfiguration":{
@@ -1332,7 +1332,7 @@
       "members":{
         "subnetIds":{
           "shape":"SubnetIdList",
-          "documentation":"<p>The list of subnet IDs where Amazon Web Services PCS creates an Elastic Network Interface (ENI) to enable communication between managed controllers and Amazon Web Services PCS resources. Subnet IDs have the form <code>subnet-0123456789abcdef0</code>.</p> <p>Subnets can't be in Outposts, Wavelength or an Amazon Web Services Local Zone.</p> <note> <p>Amazon Web Services PCS currently supports only 1 subnet in this list.</p> </note>"
+          "documentation":"<p>The list of subnet IDs where PCS creates an Elastic Network Interface (ENI) to enable communication between managed controllers and PCS resources. Subnet IDs have the form <code>subnet-0123456789abcdef0</code>.</p> <p>Subnets can't be in Outposts, Wavelength or an Amazon Web Services Local Zone.</p> <note> <p>PCS currently supports only 1 subnet in this list.</p> </note>"
         },
         "securityGroupIds":{
           "shape":"SecurityGroupIdList",
@@ -1349,7 +1349,8 @@
       "type":"string",
       "enum":[
         "ONDEMAND",
-        "SPOT"
+        "SPOT",
+        "CAPACITY_BLOCK"
       ]
     },
     "Queue":{
@@ -1705,7 +1706,7 @@
       "members":{
         "secretArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the the shared Slurm key.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the shared Slurm key.</p>"
         },
         "secretVersion":{
           "shape":"String",
@@ -1749,7 +1750,7 @@
       "members":{
         "allocationStrategy":{
           "shape":"SpotAllocationStrategy",
-          "documentation":"<p>The Amazon EC2 allocation strategy Amazon Web Services PCS uses to provision EC2 instances. Amazon Web Services PCS supports <b>lowest price</b>, <b>capacity optimized</b>, and <b>price capacity optimized</b>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-allocation-strategy.html\">Use allocation strategies to determine how EC2 Fleet or Spot Fleet fulfills Spot and On-Demand capacity</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to <b>price capacity optimized</b>.</p>"
+          "documentation":"<p>The Amazon EC2 allocation strategy PCS uses to provision EC2 instances. PCS supports <b>lowest price</b>, <b>capacity optimized</b>, and <b>price capacity optimized</b>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-allocation-strategy.html\">Use allocation strategies to determine how EC2 Fleet or Spot Fleet fulfills Spot and On-Demand capacity</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to <b>price capacity optimized</b>.</p>"
         }
       },
       "documentation":"<p>Additional configuration when you specify <code>SPOT</code> as the <code>purchaseOption</code> for the <code>CreateComputeNodeGroup</code> API action.</p>"
@@ -1862,7 +1863,7 @@
         "customLaunchTemplate":{"shape":"CustomLaunchTemplate"},
         "purchaseOption":{
           "shape":"PurchaseOption",
-          "documentation":"<p>Specifies how EC2 instances are purchased on your behalf. Amazon Web Services PCS supports On-Demand and Spot instances. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Instance purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
+          "documentation":"<p>Specifies how EC2 instances are purchased on your behalf. PCS supports On-Demand Instances, Spot Instances, and Amazon EC2 Capacity Blocks for ML. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-purchasing-options.html\">Amazon EC2 billing and purchasing options</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For more information about PCS support for Capacity Blocks, see <a href=\"https://docs.aws.amazon.com/pcs/latest/userguide/capacity-blocks.html\">Using Amazon EC2 Capacity Blocks for ML with PCS</a> in the <i>PCS User Guide</i>. If you don't provide this option, it defaults to On-Demand.</p>"
         },
         "spotOptions":{"shape":"SpotOptions"},
         "scalingConfiguration":{
diff --git a/services/personalize/pom.xml b/services/personalize/pom.xml
index c190525cd4e6..ec048581c065 100644
--- a/services/personalize/pom.xml
+++ b/services/personalize/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>personalize</artifactId>
     <name>AWS Java SDK :: Services :: Personalize</name>
diff --git a/services/personalizeevents/pom.xml b/services/personalizeevents/pom.xml
index f7338dcc65da..5350bfbe86e0 100644
--- a/services/personalizeevents/pom.xml
+++ b/services/personalizeevents/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>personalizeevents</artifactId>
     <name>AWS Java SDK :: Services :: Personalize Events</name>
diff --git a/services/personalizeruntime/pom.xml b/services/personalizeruntime/pom.xml
index e8259742e8e1..2ce89fbaf1ee 100644
--- a/services/personalizeruntime/pom.xml
+++ b/services/personalizeruntime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>personalizeruntime</artifactId>
     <name>AWS Java SDK :: Services :: Personalize Runtime</name>
diff --git a/services/pi/pom.xml b/services/pi/pom.xml
index a185bec60c34..f44965904807 100644
--- a/services/pi/pom.xml
+++ b/services/pi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>pi</artifactId>
     <name>AWS Java SDK :: Services :: PI</name>
diff --git a/services/pinpoint/pom.xml b/services/pinpoint/pom.xml
index 2aa1e9d8f73c..13d9e2525189 100644
--- a/services/pinpoint/pom.xml
+++ b/services/pinpoint/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>pinpoint</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Pinpoint</name>
diff --git a/services/pinpointemail/pom.xml b/services/pinpointemail/pom.xml
index 37643bf79aff..6b5224b61f4c 100644
--- a/services/pinpointemail/pom.xml
+++ b/services/pinpointemail/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>pinpointemail</artifactId>
     <name>AWS Java SDK :: Services :: Pinpoint Email</name>
diff --git a/services/pinpointsmsvoice/pom.xml b/services/pinpointsmsvoice/pom.xml
index 0b8d0b835919..56a23b91e46b 100644
--- a/services/pinpointsmsvoice/pom.xml
+++ b/services/pinpointsmsvoice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>pinpointsmsvoice</artifactId>
     <name>AWS Java SDK :: Services :: Pinpoint SMS Voice</name>
diff --git a/services/pinpointsmsvoicev2/pom.xml b/services/pinpointsmsvoicev2/pom.xml
index 083a4623ed15..bb5755158889 100644
--- a/services/pinpointsmsvoicev2/pom.xml
+++ b/services/pinpointsmsvoicev2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>pinpointsmsvoicev2</artifactId>
     <name>AWS Java SDK :: Services :: Pinpoint SMS Voice V2</name>
diff --git a/services/pipes/pom.xml b/services/pipes/pom.xml
index 74c9c5685ab5..897af3173bd4 100644
--- a/services/pipes/pom.xml
+++ b/services/pipes/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>pipes</artifactId>
     <name>AWS Java SDK :: Services :: Pipes</name>
diff --git a/services/polly/pom.xml b/services/polly/pom.xml
index 43f54fbe57c8..d9c73e8d8eee 100644
--- a/services/polly/pom.xml
+++ b/services/polly/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>polly</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Polly</name>
diff --git a/services/pom.xml b/services/pom.xml
index bec2aa86f535..f28baf775587 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>services</artifactId>
     <name>AWS Java SDK :: Services</name>
@@ -101,7 +101,6 @@
         <module>route53domains</module>
         <module>s3</module>
         <module>s3control</module>
-        <module>sms</module>
         <module>servicecatalog</module>
         <module>ses</module>
         <module>shield</module>
diff --git a/services/pricing/pom.xml b/services/pricing/pom.xml
index 13eb7473e1a6..8b82bef6e46d 100644
--- a/services/pricing/pom.xml
+++ b/services/pricing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pricing</artifactId>
diff --git a/services/proton/pom.xml b/services/proton/pom.xml
index 8a5de1f13d7a..e76406d1f0c4 100644
--- a/services/proton/pom.xml
+++ b/services/proton/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>proton</artifactId>
     <name>AWS Java SDK :: Services :: Proton</name>
diff --git a/services/qapps/pom.xml b/services/qapps/pom.xml
index 5770eed36430..6e31eef8c347 100644
--- a/services/qapps/pom.xml
+++ b/services/qapps/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>qapps</artifactId>
     <name>AWS Java SDK :: Services :: Q Apps</name>
diff --git a/services/qbusiness/pom.xml b/services/qbusiness/pom.xml
index b687cfb848ab..c72b80260012 100644
--- a/services/qbusiness/pom.xml
+++ b/services/qbusiness/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>qbusiness</artifactId>
     <name>AWS Java SDK :: Services :: Q Business</name>
diff --git a/services/qconnect/pom.xml b/services/qconnect/pom.xml
index 6857e3e828cb..447a755e3ea5 100644
--- a/services/qconnect/pom.xml
+++ b/services/qconnect/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>qconnect</artifactId>
     <name>AWS Java SDK :: Services :: Q Connect</name>
diff --git a/services/qldb/pom.xml b/services/qldb/pom.xml
index 746cd04c8772..781e555089ff 100644
--- a/services/qldb/pom.xml
+++ b/services/qldb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>qldb</artifactId>
     <name>AWS Java SDK :: Services :: QLDB</name>
diff --git a/services/qldbsession/pom.xml b/services/qldbsession/pom.xml
index b71a7c444319..7dddd07aa2cb 100644
--- a/services/qldbsession/pom.xml
+++ b/services/qldbsession/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>qldbsession</artifactId>
     <name>AWS Java SDK :: Services :: QLDB Session</name>
diff --git a/services/quicksight/pom.xml b/services/quicksight/pom.xml
index 0da94c9b08b7..c5a3a2ea7a01 100644
--- a/services/quicksight/pom.xml
+++ b/services/quicksight/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>quicksight</artifactId>
     <name>AWS Java SDK :: Services :: QuickSight</name>
diff --git a/services/quicksight/src/main/resources/codegen-resources/service-2.json b/services/quicksight/src/main/resources/codegen-resources/service-2.json
index 7ab854de590c..03385ea8f74d 100644
--- a/services/quicksight/src/main/resources/codegen-resources/service-2.json
+++ b/services/quicksight/src/main/resources/codegen-resources/service-2.json
@@ -84,7 +84,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Creates Amazon QuickSight customizations for the current Amazon Web Services Region. Currently, you can add a custom default theme by using the <code>CreateAccountCustomization</code> or <code>UpdateAccountCustomization</code> API operation. To further customize Amazon QuickSight by removing Amazon QuickSight sample assets and videos for all new users, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/customizing-quicksight.html\">Customizing Amazon QuickSight</a> in the <i>Amazon QuickSight User Guide.</i> </p> <p>You can create customizations for your Amazon Web Services account or, if you specify a namespace, for a QuickSight namespace instead. Customizations that apply to a namespace always override customizations that apply to an Amazon Web Services account. To find out which customizations apply, use the <code>DescribeAccountCustomization</code> API operation.</p> <p>Before you use the <code>CreateAccountCustomization</code> API operation to add a theme as the namespace default, make sure that you first share the theme with the namespace. If you don't share it with the namespace, the theme isn't visible to your users even if you make it the default theme. To check if the theme is shared, view the current permissions by using the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DescribeThemePermissions.html\">DescribeThemePermissions</a> </code> API operation. To share the theme, grant permissions by using the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateThemePermissions.html\">UpdateThemePermissions</a> </code> API operation. </p>"
+      "documentation":"<p>Creates Amazon QuickSight customizations for the current Amazon Web Services Region. Currently, you can add a custom default theme by using the <code>CreateAccountCustomization</code> or <code>UpdateAccountCustomization</code> API operation. To further customize QuickSight by removing QuickSight sample assets and videos for all new users, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/customizing-quicksight.html\">Customizing QuickSight</a> in the <i>Amazon QuickSight User Guide.</i> </p> <p>You can create customizations for your Amazon Web Services account or, if you specify a namespace, for a QuickSight namespace instead. Customizations that apply to a namespace always override customizations that apply to an Amazon Web Services account. To find out which customizations apply, use the <code>DescribeAccountCustomization</code> API operation.</p> <p>Before you use the <code>CreateAccountCustomization</code> API operation to add a theme as the namespace default, make sure that you first share the theme with the namespace. If you don't share it with the namespace, the theme isn't visible to your users even if you make it the default theme. To check if the theme is shared, view the current permissions by using the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DescribeThemePermissions.html\">DescribeThemePermissions</a> </code> API operation. To share the theme, grant permissions by using the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateThemePermissions.html\">UpdateThemePermissions</a> </code> API operation. </p>"
     },
     "CreateAccountSubscription":{
       "name":"CreateAccountSubscription",
@@ -105,7 +105,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Creates an Amazon QuickSight account, or subscribes to Amazon QuickSight Q.</p> <p>The Amazon Web Services Region for the account is derived from what is configured in the CLI or SDK.</p> <p>Before you use this operation, make sure that you can connect to an existing Amazon Web Services account. If you don't have an Amazon Web Services account, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/setting-up-aws-sign-up.html\">Sign up for Amazon Web Services</a> in the <i>Amazon QuickSight User Guide</i>. The person who signs up for Amazon QuickSight needs to have the correct Identity and Access Management (IAM) permissions. For more information, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/iam-policy-examples.html\">IAM Policy Examples for Amazon QuickSight</a> in the <i>Amazon QuickSight User Guide</i>.</p> <p>If your IAM policy includes both the <code>Subscribe</code> and <code>CreateAccountSubscription</code> actions, make sure that both actions are set to <code>Allow</code>. If either action is set to <code>Deny</code>, the <code>Deny</code> action prevails and your API call fails.</p> <p>You can't pass an existing IAM role to access other Amazon Web Services services using this API operation. To pass your existing IAM role to Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/security_iam_service-with-iam.html#security-create-iam-role\">Passing IAM roles to Amazon QuickSight</a> in the <i>Amazon QuickSight User Guide</i>.</p> <p>You can't set default resource access on the new account from the Amazon QuickSight API. Instead, add default resource access from the Amazon QuickSight console. For more information about setting default resource access to Amazon Web Services services, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/scoping-policies-defaults.html\">Setting default resource access to Amazon Web Services services</a> in the <i>Amazon QuickSight User Guide</i>.</p>"
+      "documentation":"<p>Creates an QuickSight account, or subscribes to QuickSight Q.</p> <p>The Amazon Web Services Region for the account is derived from what is configured in the CLI or SDK.</p> <p>Before you use this operation, make sure that you can connect to an existing Amazon Web Services account. If you don't have an Amazon Web Services account, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/setting-up-aws-sign-up.html\">Sign up for Amazon Web Services</a> in the <i>Amazon QuickSight User Guide</i>. The person who signs up for QuickSight needs to have the correct Identity and Access Management (IAM) permissions. For more information, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/iam-policy-examples.html\">IAM Policy Examples for QuickSight</a> in the <i>QuickSight User Guide</i>.</p> <p>If your IAM policy includes both the <code>Subscribe</code> and <code>CreateAccountSubscription</code> actions, make sure that both actions are set to <code>Allow</code>. If either action is set to <code>Deny</code>, the <code>Deny</code> action prevails and your API call fails.</p> <p>You can't pass an existing IAM role to access other Amazon Web Services services using this API operation. To pass your existing IAM role to QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/security_iam_service-with-iam.html#security-create-iam-role\">Passing IAM roles to QuickSight</a> in the <i>QuickSight User Guide</i>.</p> <p>You can't set default resource access on the new account from the QuickSight API. Instead, add default resource access from the QuickSight console. For more information about setting default resource access to Amazon Web Services services, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/scoping-policies-defaults.html\">Setting default resource access to Amazon Web Services services</a> in the <i>QuickSight User Guide</i>.</p>"
     },
     "CreateAnalysis":{
       "name":"CreateAnalysis",
@@ -144,7 +144,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Creates an Amazon QuickSight brand.</p>"
+      "documentation":"<p>Creates an QuickSight brand.</p>"
     },
     "CreateCustomPermissions":{
       "name":"CreateCustomPermissions",
@@ -186,7 +186,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Creates a dashboard from either a template or directly with a <code>DashboardDefinition</code>. To first create a template, see the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_CreateTemplate.html\">CreateTemplate</a> </code> API operation.</p> <p>A dashboard is an entity in Amazon QuickSight that identifies Amazon QuickSight reports, created from analyses. You can share Amazon QuickSight dashboards. With the right permissions, you can create scheduled email reports from them. If you have the correct permissions, you can create a dashboard from a template that exists in a different Amazon Web Services account.</p>"
+      "documentation":"<p>Creates a dashboard from either a template or directly with a <code>DashboardDefinition</code>. To first create a template, see the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_CreateTemplate.html\">CreateTemplate</a> </code> API operation.</p> <p>A dashboard is an entity in QuickSight that identifies QuickSight reports, created from analyses. You can share QuickSight dashboards. With the right permissions, you can create scheduled email reports from them. If you have the correct permissions, you can create a dashboard from a template that exists in a different Amazon Web Services account.</p>"
     },
     "CreateDataSet":{
       "name":"CreateDataSet",
@@ -290,7 +290,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Use the <code>CreateGroup</code> operation to create a group in Amazon QuickSight. You can create up to 10,000 groups in a namespace. If you want to create more than 10,000 groups in a namespace, contact Amazon Web Services Support.</p> <p>The permissions resource is <code>arn:aws:quicksight:&lt;your-region&gt;:<i>&lt;relevant-aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p>The response is a group object.</p>"
+      "documentation":"<p>Use the <code>CreateGroup</code> operation to create a group in QuickSight. You can create up to 10,000 groups in a namespace. If you want to create more than 10,000 groups in a namespace, contact Amazon Web Services Support.</p> <p>The permissions resource is <code>arn:aws:quicksight:&lt;your-region&gt;:<i>&lt;relevant-aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p>The response is a group object.</p>"
     },
     "CreateGroupMembership":{
       "name":"CreateGroupMembership",
@@ -369,7 +369,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>(Enterprise edition only) Creates a new namespace for you to use with Amazon QuickSight.</p> <p>A namespace allows you to isolate the Amazon QuickSight users and groups that are registered for that namespace. Users that access the namespace can share assets only with other users or groups in the same namespace. They can't see users and groups in other namespaces. You can create a namespace after your Amazon Web Services account is subscribed to Amazon QuickSight. The namespace must be unique within the Amazon Web Services account. By default, there is a limit of 100 namespaces per Amazon Web Services account. To increase your limit, create a ticket with Amazon Web ServicesSupport. </p>"
+      "documentation":"<p>(Enterprise edition only) Creates a new namespace for you to use with Amazon QuickSight.</p> <p>A namespace allows you to isolate the QuickSight users and groups that are registered for that namespace. Users that access the namespace can share assets only with other users or groups in the same namespace. They can't see users and groups in other namespaces. You can create a namespace after your Amazon Web Services account is subscribed to QuickSight. The namespace must be unique within the Amazon Web Services account. By default, there is a limit of 100 namespaces per Amazon Web Services account. To increase your limit, create a ticket with Amazon Web Services Support. </p>"
     },
     "CreateRefreshSchedule":{
       "name":"CreateRefreshSchedule",
@@ -408,7 +408,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Use <code>CreateRoleMembership</code> to add an existing Amazon QuickSight group to an existing role.</p>"
+      "documentation":"<p>Use <code>CreateRoleMembership</code> to add an existing QuickSight group to an existing role.</p>"
     },
     "CreateTemplate":{
       "name":"CreateTemplate",
@@ -429,7 +429,7 @@
         {"shape":"ConflictException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Creates a template either from a <code>TemplateDefinition</code> or from an existing Amazon QuickSight analysis or template. You can use the resulting template to create additional dashboards, templates, or analyses.</p> <p>A <i>template</i> is an entity in Amazon QuickSight that encapsulates the metadata required to create an analysis and that you can use to create s dashboard. A template adds a layer of abstraction by using placeholders to replace the dataset associated with the analysis. You can use templates to create dashboards by replacing dataset placeholders with datasets that follow the same schema that was used to create the source analysis and template.</p>"
+      "documentation":"<p>Creates a template either from a <code>TemplateDefinition</code> or from an existing QuickSight analysis or template. You can use the resulting template to create additional dashboards, templates, or analyses.</p> <p>A <i>template</i> is an entity in QuickSight that encapsulates the metadata required to create an analysis and that you can use to create s dashboard. A template adds a layer of abstraction by using placeholders to replace the dataset associated with the analysis. You can use templates to create dashboards by replacing dataset placeholders with datasets that follow the same schema that was used to create the source analysis and template.</p>"
     },
     "CreateTemplateAlias":{
       "name":"CreateTemplateAlias",
@@ -551,6 +551,23 @@
       ],
       "documentation":"<p>Creates a new VPC connection.</p>"
     },
+    "DeleteAccountCustomPermission":{
+      "name":"DeleteAccountCustomPermission",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{AwsAccountId}/custom-permission"
+      },
+      "input":{"shape":"DeleteAccountCustomPermissionRequest"},
+      "output":{"shape":"DeleteAccountCustomPermissionResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Unapplies a custom permissions profile from an account.</p>"
+    },
     "DeleteAccountCustomization":{
       "name":"DeleteAccountCustomization",
       "http":{
@@ -570,7 +587,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Deletes all Amazon QuickSight customizations in this Amazon Web Services Region for the specified Amazon Web Services account and Amazon QuickSight namespace.</p>"
+      "documentation":"<p>Deletes all Amazon QuickSight customizations in this Amazon Web Services Region for the specified Amazon Web Services account and QuickSight namespace.</p>"
     },
     "DeleteAccountSubscription":{
       "name":"DeleteAccountSubscription",
@@ -589,7 +606,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Use the <code>DeleteAccountSubscription</code> operation to delete an Amazon QuickSight account. This operation will result in an error message if you have configured your account termination protection settings to <code>True</code>. To change this setting and delete your account, call the <code>UpdateAccountSettings</code> API and set the value of the <code>TerminationProtectionEnabled</code> parameter to <code>False</code>, then make another call to the <code>DeleteAccountSubscription</code> API.</p>"
+      "documentation":"<p>Use the <code>DeleteAccountSubscription</code> operation to delete an QuickSight account. This operation will result in an error message if you have configured your account termination protection settings to <code>True</code>. To change this setting and delete your account, call the <code>UpdateAccountSettings</code> API and set the value of the <code>TerminationProtectionEnabled</code> parameter to <code>False</code>, then make another call to the <code>DeleteAccountSubscription</code> API.</p>"
     },
     "DeleteAnalysis":{
       "name":"DeleteAnalysis",
@@ -607,7 +624,7 @@
         {"shape":"UnsupportedUserEditionException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Deletes an analysis from Amazon QuickSight. You can optionally include a recovery window during which you can restore the analysis. If you don't specify a recovery window value, the operation defaults to 30 days. Amazon QuickSight attaches a <code>DeletionTime</code> stamp to the response that specifies the end of the recovery window. At the end of the recovery window, Amazon QuickSight deletes the analysis permanently.</p> <p>At any time before recovery window ends, you can use the <code>RestoreAnalysis</code> API operation to remove the <code>DeletionTime</code> stamp and cancel the deletion of the analysis. The analysis remains visible in the API until it's deleted, so you can describe it but you can't make a template from it.</p> <p>An analysis that's scheduled for deletion isn't accessible in the Amazon QuickSight console. To access it in the console, restore it. Deleting an analysis doesn't delete the dashboards that you publish from it.</p>"
+      "documentation":"<p>Deletes an analysis from Amazon QuickSight. You can optionally include a recovery window during which you can restore the analysis. If you don't specify a recovery window value, the operation defaults to 30 days. QuickSight attaches a <code>DeletionTime</code> stamp to the response that specifies the end of the recovery window. At the end of the recovery window, QuickSight deletes the analysis permanently.</p> <p>At any time before recovery window ends, you can use the <code>RestoreAnalysis</code> API operation to remove the <code>DeletionTime</code> stamp and cancel the deletion of the analysis. The analysis remains visible in the API until it's deleted, so you can describe it but you can't make a template from it.</p> <p>An analysis that's scheduled for deletion isn't accessible in the QuickSight console. To access it in the console, restore it. Deleting an analysis doesn't delete the dashboards that you publish from it.</p>"
     },
     "DeleteBrand":{
       "name":"DeleteBrand",
@@ -626,7 +643,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Deletes an Amazon QuickSight brand.</p>",
+      "documentation":"<p>Deletes an QuickSight brand.</p>",
       "idempotent":true
     },
     "DeleteBrandAssignment":{
@@ -756,7 +773,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Deletes a linked Amazon Q Business application from an Amazon QuickSight account</p>"
+      "documentation":"<p>Deletes a linked Amazon Q Business application from an QuickSight account</p>"
     },
     "DeleteFolder":{
       "name":"DeleteFolder",
@@ -868,7 +885,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Deletes all access scopes and authorized targets that are associated with a service from the Amazon QuickSight IAM Identity Center application.</p> <p>This operation is only supported for Amazon QuickSight accounts that use IAM Identity Center.</p>"
+      "documentation":"<p>Deletes all access scopes and authorized targets that are associated with a service from the QuickSight IAM Identity Center application.</p> <p>This operation is only supported for QuickSight accounts that use IAM Identity Center.</p>"
     },
     "DeleteNamespace":{
       "name":"DeleteNamespace",
@@ -1133,6 +1150,23 @@
       ],
       "documentation":"<p>Deletes a VPC connection.</p>"
     },
+    "DescribeAccountCustomPermission":{
+      "name":"DescribeAccountCustomPermission",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/custom-permission"
+      },
+      "input":{"shape":"DescribeAccountCustomPermissionRequest"},
+      "output":{"shape":"DescribeAccountCustomPermissionResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Describes the custom permissions profile that is applied to an account.</p>"
+    },
     "DescribeAccountCustomization":{
       "name":"DescribeAccountCustomization",
       "http":{
@@ -1149,7 +1183,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Describes the customizations associated with the provided Amazon Web Services account and Amazon Amazon QuickSight namespace in an Amazon Web Services Region. The Amazon QuickSight console evaluates which customizations to apply by running this API operation with the <code>Resolved</code> flag included. </p> <p>To determine what customizations display when you run this command, it can help to visualize the relationship of the entities involved. </p> <ul> <li> <p> <code>Amazon Web Services account</code> - The Amazon Web Services account exists at the top of the hierarchy. It has the potential to use all of the Amazon Web Services Regions and Amazon Web Services Services. When you subscribe to Amazon QuickSight, you choose one Amazon Web Services Region to use as your home Region. That's where your free SPICE capacity is located. You can use Amazon QuickSight in any supported Amazon Web Services Region. </p> </li> <li> <p> <code>Amazon Web Services Region</code> - In each Amazon Web Services Region where you sign in to Amazon QuickSight at least once, Amazon QuickSight acts as a separate instance of the same service. If you have a user directory, it resides in us-east-1, which is the US East (N. Virginia). Generally speaking, these users have access to Amazon QuickSight in any Amazon Web Services Region, unless they are constrained to a namespace. </p> <p>To run the command in a different Amazon Web Services Region, you change your Region settings. If you're using the CLI, you can use one of the following options:</p> <ul> <li> <p>Use <a href=\"https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-options.html\">command line options</a>. </p> </li> <li> <p>Use <a href=\"https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html\">named profiles</a>. </p> </li> <li> <p>Run <code>aws configure</code> to change your default Amazon Web Services Region. Use Enter to key the same settings for your keys. For more information, see <a href=\"https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html\">Configuring the CLI</a>.</p> </li> </ul> </li> <li> <p> <code>Namespace</code> - A QuickSight namespace is a partition that contains users and assets (data sources, datasets, dashboards, and so on). To access assets that are in a specific namespace, users and groups must also be part of the same namespace. People who share a namespace are completely isolated from users and assets in other namespaces, even if they are in the same Amazon Web Services account and Amazon Web Services Region.</p> </li> <li> <p> <code>Applied customizations</code> - Within an Amazon Web Services Region, a set of Amazon QuickSight customizations can apply to an Amazon Web Services account or to a namespace. Settings that you apply to a namespace override settings that you apply to an Amazon Web Services account. All settings are isolated to a single Amazon Web Services Region. To apply them in other Amazon Web Services Regions, run the <code>CreateAccountCustomization</code> command in each Amazon Web Services Region where you want to apply the same customizations. </p> </li> </ul>"
+      "documentation":"<p>Describes the customizations associated with the provided Amazon Web Services account and Amazon QuickSight namespace in an Amazon Web Services Region. The QuickSight console evaluates which customizations to apply by running this API operation with the <code>Resolved</code> flag included. </p> <p>To determine what customizations display when you run this command, it can help to visualize the relationship of the entities involved. </p> <ul> <li> <p> <code>Amazon Web Services account</code> - The Amazon Web Services account exists at the top of the hierarchy. It has the potential to use all of the Amazon Web Services Regions and Amazon Web Services Services. When you subscribe to QuickSight, you choose one Amazon Web Services Region to use as your home Region. That's where your free SPICE capacity is located. You can use QuickSight in any supported Amazon Web Services Region. </p> </li> <li> <p> <code>Amazon Web Services Region</code> - In each Amazon Web Services Region where you sign in to QuickSight at least once, QuickSight acts as a separate instance of the same service. If you have a user directory, it resides in us-east-1, which is the US East (N. Virginia). Generally speaking, these users have access to QuickSight in any Amazon Web Services Region, unless they are constrained to a namespace. </p> <p>To run the command in a different Amazon Web Services Region, you change your Region settings. If you're using the CLI, you can use one of the following options:</p> <ul> <li> <p>Use <a href=\"https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-options.html\">command line options</a>. </p> </li> <li> <p>Use <a href=\"https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html\">named profiles</a>. </p> </li> <li> <p>Run <code>aws configure</code> to change your default Amazon Web Services Region. Use Enter to key the same settings for your keys. For more information, see <a href=\"https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html\">Configuring the CLI</a>.</p> </li> </ul> </li> <li> <p> <code>Namespace</code> - A QuickSight namespace is a partition that contains users and assets (data sources, datasets, dashboards, and so on). To access assets that are in a specific namespace, users and groups must also be part of the same namespace. People who share a namespace are completely isolated from users and assets in other namespaces, even if they are in the same Amazon Web Services account and Amazon Web Services Region.</p> </li> <li> <p> <code>Applied customizations</code> - Within an Amazon Web Services Region, a set of QuickSight customizations can apply to an Amazon Web Services account or to a namespace. Settings that you apply to a namespace override settings that you apply to an Amazon Web Services account. All settings are isolated to a single Amazon Web Services Region. To apply them in other Amazon Web Services Regions, run the <code>CreateAccountCustomization</code> command in each Amazon Web Services Region where you want to apply the same customizations. </p> </li> </ul>"
     },
     "DescribeAccountSettings":{
       "name":"DescribeAccountSettings",
@@ -1167,7 +1201,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Describes the settings that were used when your Amazon QuickSight subscription was first created in this Amazon Web Services account.</p>"
+      "documentation":"<p>Describes the settings that were used when your QuickSight subscription was first created in this Amazon Web Services account.</p>"
     },
     "DescribeAccountSubscription":{
       "name":"DescribeAccountSubscription",
@@ -1185,7 +1219,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Use the DescribeAccountSubscription operation to receive a description of an Amazon QuickSight account's subscription. A successful API call returns an <code>AccountInfo</code> object that includes an account's name, subscription status, authentication type, edition, and notification email address.</p>"
+      "documentation":"<p>Use the DescribeAccountSubscription operation to receive a description of an QuickSight account's subscription. A successful API call returns an <code>AccountInfo</code> object that includes an account's name, subscription status, authentication type, edition, and notification email address.</p>"
     },
     "DescribeAnalysis":{
       "name":"DescribeAnalysis",
@@ -1559,7 +1593,7 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Describes a Amazon Q Business application that is linked to an Amazon QuickSight account.</p>"
+      "documentation":"<p>Describes a Amazon Q Business application that is linked to an QuickSight account.</p>"
     },
     "DescribeFolder":{
       "name":"DescribeFolder",
@@ -1722,7 +1756,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Describes all customer managed key registrations in a Amazon QuickSight account.</p>"
+      "documentation":"<p>Describes all customer managed key registrations in a QuickSight account.</p>"
     },
     "DescribeNamespace":{
       "name":"DescribeNamespace",
@@ -1776,7 +1810,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Describes the state of a Amazon QuickSight Q Search configuration.</p>"
+      "documentation":"<p>Describes the state of a QuickSight Q Search configuration.</p>"
     },
     "DescribeRefreshSchedule":{
       "name":"DescribeRefreshSchedule",
@@ -2112,7 +2146,7 @@
         {"shape":"UnsupportedPricingPlanException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Generates an embed URL that you can use to embed an Amazon QuickSight experience in your website. This action can be used for any type of user that is registered in an Amazon QuickSight account that uses IAM Identity Center for authentication. This API requires <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation-overview.html#types-identity-enhanced-iam-role-sessions\">identity-enhanced IAM Role sessions</a> for the authenticated user that the API call is being made for.</p> <p>This API uses <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation.html\">trusted identity propagation</a> to ensure that an end user is authenticated and receives the embed URL that is specific to that user. The IAM Identity Center application that the user has logged into needs to have <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation-using-customermanagedapps-specify-trusted-apps.html\">trusted Identity Propagation enabled for Amazon QuickSight</a> with the scope value set to <code>quicksight:read</code>. Before you use this action, make sure that you have configured the relevant Amazon QuickSight resource and permissions.</p>"
+      "documentation":"<p>Generates an embed URL that you can use to embed an QuickSight experience in your website. This action can be used for any type of user that is registered in an QuickSight account that uses IAM Identity Center for authentication. This API requires <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation-overview.html#types-identity-enhanced-iam-role-sessions\">identity-enhanced IAM Role sessions</a> for the authenticated user that the API call is being made for.</p> <p>This API uses <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation.html\">trusted identity propagation</a> to ensure that an end user is authenticated and receives the embed URL that is specific to that user. The IAM Identity Center application that the user has logged into needs to have <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation-using-customermanagedapps-specify-trusted-apps.html\">trusted Identity Propagation enabled for QuickSight</a> with the scope value set to <code>quicksight:read</code>. Before you use this action, make sure that you have configured the relevant QuickSight resource and permissions.</p>"
     },
     "GetDashboardEmbedUrl":{
       "name":"GetDashboardEmbedUrl",
@@ -2136,7 +2170,7 @@
         {"shape":"UnsupportedPricingPlanException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Generates a temporary session URL and authorization code(bearer token) that you can use to embed an Amazon QuickSight read-only dashboard in your website or application. Before you use this command, make sure that you have configured the dashboards and permissions. </p> <p>Currently, you can use <code>GetDashboardEmbedURL</code> only from the server, not from the user's browser. The following rules apply to the generated URL:</p> <ul> <li> <p>They must be used together.</p> </li> <li> <p>They can be used one time only.</p> </li> <li> <p>They are valid for 5 minutes after you run this command.</p> </li> <li> <p>You are charged only when the URL is used or there is interaction with Amazon QuickSight.</p> </li> <li> <p>The resulting user session is valid for 15 minutes (default) up to 10 hours (maximum). You can use the optional <code>SessionLifetimeInMinutes</code> parameter to customize session duration.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedded-analytics-deprecated.html\">Embedding Analytics Using GetDashboardEmbedUrl</a> in the <i>Amazon QuickSight User Guide</i>.</p> <p>For more information about the high-level steps for embedding and for an interactive demo of the ways you can customize embedding, visit the <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/quicksight-dev-portal.html\">Amazon QuickSight Developer Portal</a>.</p>"
+      "documentation":"<p>Generates a temporary session URL and authorization code(bearer token) that you can use to embed an QuickSight read-only dashboard in your website or application. Before you use this command, make sure that you have configured the dashboards and permissions. </p> <p>Currently, you can use <code>GetDashboardEmbedURL</code> only from the server, not from the user's browser. The following rules apply to the generated URL:</p> <ul> <li> <p>They must be used together.</p> </li> <li> <p>They can be used one time only.</p> </li> <li> <p>They are valid for 5 minutes after you run this command.</p> </li> <li> <p>You are charged only when the URL is used or there is interaction with QuickSight.</p> </li> <li> <p>The resulting user session is valid for 15 minutes (default) up to 10 hours (maximum). You can use the optional <code>SessionLifetimeInMinutes</code> parameter to customize session duration.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedded-analytics-deprecated.html\">Embedding Analytics Using GetDashboardEmbedUrl</a> in the <i>Amazon QuickSight User Guide</i>.</p> <p>For more information about the high-level steps for embedding and for an interactive demo of the ways you can customize embedding, visit the <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/quicksight-dev-portal.html\">Amazon QuickSight Developer Portal</a>.</p>"
     },
     "GetSessionEmbedUrl":{
       "name":"GetSessionEmbedUrl",
@@ -2157,7 +2191,7 @@
         {"shape":"UnsupportedUserEditionException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Generates a session URL and authorization code that you can use to embed the Amazon Amazon QuickSight console in your web server code. Use <code>GetSessionEmbedUrl</code> where you want to provide an authoring portal that allows users to create data sources, datasets, analyses, and dashboards. The users who access an embedded Amazon QuickSight console need belong to the author or admin security cohort. If you want to restrict permissions to some of these features, add a custom permissions profile to the user with the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateUser.html\">UpdateUser</a> </code> API operation. Use <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_RegisterUser.html\">RegisterUser</a> </code> API operation to add a new user with a custom permission profile attached. For more information, see the following sections in the <i>Amazon QuickSight User Guide</i>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedded-analytics.html\">Embedding Analytics</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/customizing-permissions-to-the-quicksight-console.html\">Customizing Access to the Amazon QuickSight Console</a> </p> </li> </ul>"
+      "documentation":"<p>Generates a session URL and authorization code that you can use to embed the Amazon QuickSight console in your web server code. Use <code>GetSessionEmbedUrl</code> where you want to provide an authoring portal that allows users to create data sources, datasets, analyses, and dashboards. The users who access an embedded QuickSight console need belong to the author or admin security cohort. If you want to restrict permissions to some of these features, add a custom permissions profile to the user with the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateUser.html\">UpdateUser</a> </code> API operation. Use <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_RegisterUser.html\">RegisterUser</a> </code> API operation to add a new user with a custom permission profile attached. For more information, see the following sections in the <i>Amazon QuickSight User Guide</i>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedded-analytics.html\">Embedding Analytics</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/customizing-permissions-to-the-quicksight-console.html\">Customizing Access to the Amazon QuickSight Console</a> </p> </li> </ul>"
     },
     "ListAnalyses":{
       "name":"ListAnalyses",
@@ -2224,7 +2258,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Lists all brands in an Amazon QuickSight account.</p>"
+      "documentation":"<p>Lists all brands in an QuickSight account.</p>"
     },
     "ListCustomPermissions":{
       "name":"ListCustomPermissions",
@@ -2261,7 +2295,7 @@
         {"shape":"UnsupportedUserEditionException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Lists all the versions of the dashboards in the Amazon QuickSight subscription.</p>"
+      "documentation":"<p>Lists all the versions of the dashboards in the QuickSight subscription.</p>"
     },
     "ListDashboards":{
       "name":"ListDashboards",
@@ -2462,7 +2496,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Lists all services and authorized targets that the Amazon QuickSight IAM Identity Center application can access.</p> <p>This operation is only supported for Amazon QuickSight accounts that use IAM Identity Center.</p>"
+      "documentation":"<p>Lists all services and authorized targets that the QuickSight IAM Identity Center application can access.</p> <p>This operation is only supported for QuickSight accounts that use IAM Identity Center.</p>"
     },
     "ListIngestions":{
       "name":"ListIngestions",
@@ -2794,7 +2828,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Predicts existing visuals or generates new visuals to answer a given query.</p> <p>This API uses <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation.html\">trusted identity propagation</a> to ensure that an end user is authenticated and receives the embed URL that is specific to that user. The IAM Identity Center application that the user has logged into needs to have <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation-using-customermanagedapps-specify-trusted-apps.html\">trusted Identity Propagation enabled for Amazon QuickSight</a> with the scope value set to <code>quicksight:read</code>. Before you use this action, make sure that you have configured the relevant Amazon QuickSight resource and permissions.</p> <p>We recommend enabling the <code>QSearchStatus</code> API to unlock the full potential of <code>PredictQnA</code>. When <code>QSearchStatus</code> is enabled, it first checks the specified dashboard for any existing visuals that match the question. If no matching visuals are found, <code>PredictQnA</code> uses generative Q&amp;A to provide an answer. To update the <code>QSearchStatus</code>, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateQuickSightQSearchConfiguration.html\">UpdateQuickSightQSearchConfiguration</a>.</p>"
+      "documentation":"<p>Predicts existing visuals or generates new visuals to answer a given query.</p> <p>This API uses <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation.html\">trusted identity propagation</a> to ensure that an end user is authenticated and receives the embed URL that is specific to that user. The IAM Identity Center application that the user has logged into needs to have <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation-using-customermanagedapps-specify-trusted-apps.html\">trusted Identity Propagation enabled for QuickSight</a> with the scope value set to <code>quicksight:read</code>. Before you use this action, make sure that you have configured the relevant QuickSight resource and permissions.</p> <p>We recommend enabling the <code>QSearchStatus</code> API to unlock the full potential of <code>PredictQnA</code>. When <code>QSearchStatus</code> is enabled, it first checks the specified dashboard for any existing visuals that match the question. If no matching visuals are found, <code>PredictQnA</code> uses generative Q&amp;A to provide an answer. To update the <code>QSearchStatus</code>, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateQuickSightQSearchConfiguration.html\">UpdateQuickSightQSearchConfiguration</a>.</p>"
     },
     "PutDataSetRefreshProperties":{
       "name":"PutDataSetRefreshProperties",
@@ -2835,7 +2869,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Creates an Amazon QuickSight user whose identity is associated with the Identity and Access Management (IAM) identity or role specified in the request. When you register a new user from the Amazon QuickSight API, Amazon QuickSight generates a registration URL. The user accesses this registration URL to create their account. Amazon QuickSight doesn't send a registration email to users who are registered from the Amazon QuickSight API. If you want new users to receive a registration email, then add those users in the Amazon QuickSight console. For more information on registering a new user in the Amazon QuickSight console, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/managing-users.html#inviting-users\"> Inviting users to access Amazon QuickSight</a>.</p>"
+      "documentation":"<p>Creates an Amazon QuickSight user whose identity is associated with the Identity and Access Management (IAM) identity or role specified in the request. When you register a new user from the QuickSight API, QuickSight generates a registration URL. The user accesses this registration URL to create their account. QuickSight doesn't send a registration email to users who are registered from the QuickSight API. If you want new users to receive a registration email, then add those users in the QuickSight console. For more information on registering a new user in the QuickSight console, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/managing-users.html#inviting-users\"> Inviting users to access QuickSight</a>.</p>"
     },
     "RestoreAnalysis":{
       "name":"RestoreAnalysis",
@@ -2967,7 +3001,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Use the <code>SearchGroups</code> operation to search groups in a specified Amazon QuickSight namespace using the supplied filters.</p>"
+      "documentation":"<p>Use the <code>SearchGroups</code> operation to search groups in a specified QuickSight namespace using the supplied filters.</p>"
     },
     "SearchTopics":{
       "name":"SearchTopics",
@@ -2985,7 +3019,7 @@
         {"shape":"InvalidNextTokenException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Searches for any Q topic that exists in an Amazon QuickSight account.</p>"
+      "documentation":"<p>Searches for any Q topic that exists in an QuickSight account.</p>"
     },
     "StartAssetBundleExportJob":{
       "name":"StartAssetBundleExportJob",
@@ -3004,7 +3038,7 @@
         {"shape":"ConflictException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Starts an Asset Bundle export job.</p> <p>An Asset Bundle export job exports specified Amazon QuickSight assets. You can also choose to export any asset dependencies in the same job. Export jobs run asynchronously and can be polled with a <code>DescribeAssetBundleExportJob</code> API call. When a job is successfully completed, a download URL that contains the exported assets is returned. The URL is valid for 5 minutes and can be refreshed with a <code>DescribeAssetBundleExportJob</code> API call. Each Amazon QuickSight account can run up to 5 export jobs concurrently.</p> <p>The API caller must have the necessary permissions in their IAM role to access each resource before the resources can be exported.</p>"
+      "documentation":"<p>Starts an Asset Bundle export job.</p> <p>An Asset Bundle export job exports specified QuickSight assets. You can also choose to export any asset dependencies in the same job. Export jobs run asynchronously and can be polled with a <code>DescribeAssetBundleExportJob</code> API call. When a job is successfully completed, a download URL that contains the exported assets is returned. The URL is valid for 5 minutes and can be refreshed with a <code>DescribeAssetBundleExportJob</code> API call. Each QuickSight account can run up to 5 export jobs concurrently.</p> <p>The API caller must have the necessary permissions in their IAM role to access each resource before the resources can be exported.</p>"
     },
     "StartAssetBundleImportJob":{
       "name":"StartAssetBundleImportJob",
@@ -3023,7 +3057,7 @@
         {"shape":"ConflictException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Starts an Asset Bundle import job.</p> <p>An Asset Bundle import job imports specified Amazon QuickSight assets into an Amazon QuickSight account. You can also choose to import a naming prefix and specified configuration overrides. The assets that are contained in the bundle file that you provide are used to create or update a new or existing asset in your Amazon QuickSight account. Each Amazon QuickSight account can run up to 5 import jobs concurrently.</p> <p>The API caller must have the necessary <code>\"create\"</code>, <code>\"describe\"</code>, and <code>\"update\"</code> permissions in their IAM role to access each resource type that is contained in the bundle file before the resources can be imported.</p>"
+      "documentation":"<p>Starts an Asset Bundle import job.</p> <p>An Asset Bundle import job imports specified QuickSight assets into an QuickSight account. You can also choose to import a naming prefix and specified configuration overrides. The assets that are contained in the bundle file that you provide are used to create or update a new or existing asset in your QuickSight account. Each QuickSight account can run up to 5 import jobs concurrently.</p> <p>The API caller must have the necessary <code>\"create\"</code>, <code>\"describe\"</code>, and <code>\"update\"</code> permissions in their IAM role to access each resource type that is contained in the bundle file before the resources can be imported.</p>"
     },
     "StartDashboardSnapshotJob":{
       "name":"StartDashboardSnapshotJob",
@@ -3044,7 +3078,7 @@
         {"shape":"UnsupportedPricingPlanException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Starts an asynchronous job that generates a snapshot of a dashboard's output. You can request one or several of the following format configurations in each API call.</p> <ul> <li> <p>1 Paginated PDF</p> </li> <li> <p>1 Excel workbook that includes up to 5 table or pivot table visuals</p> </li> <li> <p>5 CSVs from table or pivot table visuals</p> </li> </ul> <p>The status of a submitted job can be polled with the <code>DescribeDashboardSnapshotJob</code> API. When you call the <code>DescribeDashboardSnapshotJob</code> API, check the <code>JobStatus</code> field in the response. Once the job reaches a <code>COMPLETED</code> or <code>FAILED</code> status, use the <code>DescribeDashboardSnapshotJobResult</code> API to obtain the URLs for the generated files. If the job fails, the <code>DescribeDashboardSnapshotJobResult</code> API returns detailed information about the error that occurred.</p> <p> <b>StartDashboardSnapshotJob API throttling</b> </p> <p>Amazon QuickSight utilizes API throttling to create a more consistent user experience within a time span for customers when they call the <code>StartDashboardSnapshotJob</code>. By default, 12 jobs can run simlutaneously in one Amazon Web Services account and users can submit up 10 API requests per second before an account is throttled. If an overwhelming number of API requests are made by the same user in a short period of time, Amazon QuickSight throttles the API calls to maintin an optimal experience and reliability for all Amazon QuickSight users.</p> <p> <b>Common throttling scenarios</b> </p> <p>The following list provides information about the most commin throttling scenarios that can occur.</p> <ul> <li> <p> <b>A large number of <code>SnapshotExport</code> API jobs are running simultaneously on an Amazon Web Services account.</b> When a new <code>StartDashboardSnapshotJob</code> is created and there are already 12 jobs with the <code>RUNNING</code> status, the new job request fails and returns a <code>LimitExceededException</code> error. Wait for a current job to comlpete before you resubmit the new job.</p> </li> <li> <p> <b>A large number of API requests are submitted on an Amazon Web Services account.</b> When a user makes more than 10 API calls to the Amazon QuickSight API in one second, a <code>ThrottlingException</code> is returned.</p> </li> </ul> <p>If your use case requires a higher throttling limit, contact your account admin or <a href=\"http://aws.amazon.com/contact-us/\">Amazon Web ServicesSupport</a> to explore options to tailor a more optimal expereince for your account.</p> <p> <b>Best practices to handle throttling</b> </p> <p>If your use case projects high levels of API traffic, try to reduce the degree of frequency and parallelism of API calls as much as you can to avoid throttling. You can also perform a timing test to calculate an estimate for the total processing time of your projected load that stays within the throttling limits of the Amazon QuickSight APIs. For example, if your projected traffic is 100 snapshot jobs before 12:00 PM per day, start 12 jobs in parallel and measure the amount of time it takes to proccess all 12 jobs. Once you obtain the result, multiply the duration by 9, for example <code>(12 minutes * 9 = 108 minutes)</code>. Use the new result to determine the latest time at which the jobs need to be started to meet your target deadline.</p> <p>The time that it takes to process a job can be impacted by the following factors:</p> <ul> <li> <p>The dataset type (Direct Query or SPICE).</p> </li> <li> <p>The size of the dataset.</p> </li> <li> <p>The complexity of the calculated fields that are used in the dashboard.</p> </li> <li> <p>The number of visuals that are on a sheet.</p> </li> <li> <p>The types of visuals that are on the sheet.</p> </li> <li> <p>The number of formats and snapshots that are requested in the job configuration.</p> </li> <li> <p>The size of the generated snapshots.</p> </li> </ul>"
+      "documentation":"<p>Starts an asynchronous job that generates a snapshot of a dashboard's output. You can request one or several of the following format configurations in each API call.</p> <ul> <li> <p>1 Paginated PDF</p> </li> <li> <p>1 Excel workbook that includes up to 5 table or pivot table visuals</p> </li> <li> <p>5 CSVs from table or pivot table visuals</p> </li> </ul> <p>The status of a submitted job can be polled with the <code>DescribeDashboardSnapshotJob</code> API. When you call the <code>DescribeDashboardSnapshotJob</code> API, check the <code>JobStatus</code> field in the response. Once the job reaches a <code>COMPLETED</code> or <code>FAILED</code> status, use the <code>DescribeDashboardSnapshotJobResult</code> API to obtain the URLs for the generated files. If the job fails, the <code>DescribeDashboardSnapshotJobResult</code> API returns detailed information about the error that occurred.</p> <p> <b>StartDashboardSnapshotJob API throttling</b> </p> <p>QuickSight utilizes API throttling to create a more consistent user experience within a time span for customers when they call the <code>StartDashboardSnapshotJob</code>. By default, 12 jobs can run simlutaneously in one Amazon Web Services account and users can submit up 10 API requests per second before an account is throttled. If an overwhelming number of API requests are made by the same user in a short period of time, QuickSight throttles the API calls to maintin an optimal experience and reliability for all QuickSight users.</p> <p> <b>Common throttling scenarios</b> </p> <p>The following list provides information about the most commin throttling scenarios that can occur.</p> <ul> <li> <p> <b>A large number of <code>SnapshotExport</code> API jobs are running simultaneously on an Amazon Web Services account.</b> When a new <code>StartDashboardSnapshotJob</code> is created and there are already 12 jobs with the <code>RUNNING</code> status, the new job request fails and returns a <code>LimitExceededException</code> error. Wait for a current job to comlpete before you resubmit the new job.</p> </li> <li> <p> <b>A large number of API requests are submitted on an Amazon Web Services account.</b> When a user makes more than 10 API calls to the QuickSight API in one second, a <code>ThrottlingException</code> is returned.</p> </li> </ul> <p>If your use case requires a higher throttling limit, contact your account admin or <a href=\"http://aws.amazon.com/contact-us/\">Amazon Web ServicesSupport</a> to explore options to tailor a more optimal expereince for your account.</p> <p> <b>Best practices to handle throttling</b> </p> <p>If your use case projects high levels of API traffic, try to reduce the degree of frequency and parallelism of API calls as much as you can to avoid throttling. You can also perform a timing test to calculate an estimate for the total processing time of your projected load that stays within the throttling limits of the QuickSight APIs. For example, if your projected traffic is 100 snapshot jobs before 12:00 PM per day, start 12 jobs in parallel and measure the amount of time it takes to proccess all 12 jobs. Once you obtain the result, multiply the duration by 9, for example <code>(12 minutes * 9 = 108 minutes)</code>. Use the new result to determine the latest time at which the jobs need to be started to meet your target deadline.</p> <p>The time that it takes to process a job can be impacted by the following factors:</p> <ul> <li> <p>The dataset type (Direct Query or SPICE).</p> </li> <li> <p>The size of the dataset.</p> </li> <li> <p>The complexity of the calculated fields that are used in the dashboard.</p> </li> <li> <p>The number of visuals that are on a sheet.</p> </li> <li> <p>The types of visuals that are on the sheet.</p> </li> <li> <p>The number of formats and snapshots that are requested in the job configuration.</p> </li> <li> <p>The size of the generated snapshots.</p> </li> </ul>"
     },
     "StartDashboardSnapshotJobSchedule":{
       "name":"StartDashboardSnapshotJobSchedule",
@@ -3063,7 +3097,7 @@
         {"shape":"UnsupportedUserEditionException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Starts an asynchronous job that runs an existing dashboard schedule and sends the dashboard snapshot through email. </p> <p>Only one job can run simultaneously in a given schedule. Repeated requests are skipped with a <code>202</code> HTTP status code.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sending-reports.html\">Scheduling and sending Amazon QuickSight reports by email</a> and <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/email-reports-from-dashboard.html\">Configuring email report settings for a Amazon QuickSight dashboard</a> in the <i>Amazon QuickSight User Guide</i>.</p>"
+      "documentation":"<p>Starts an asynchronous job that runs an existing dashboard schedule and sends the dashboard snapshot through email. </p> <p>Only one job can run simultaneously in a given schedule. Repeated requests are skipped with a <code>202</code> HTTP status code.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sending-reports.html\">Scheduling and sending QuickSight reports by email</a> and <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/email-reports-from-dashboard.html\">Configuring email report settings for a QuickSight dashboard</a> in the <i>Amazon QuickSight User Guide</i>.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -3081,7 +3115,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Assigns one or more tags (key-value pairs) to the specified Amazon QuickSight resource. </p> <p>Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only resources with certain tag values. You can use the <code>TagResource</code> operation with a resource that already has tags. If you specify a new tag key for the resource, this tag is appended to the list of tags associated with the resource. If you specify a tag key that is already associated with the resource, the new tag value that you specify replaces the previous value for that tag.</p> <p>You can associate as many as 50 tags with a resource. Amazon QuickSight supports tagging on data set, data source, dashboard, template, topic, and user. </p> <p>Tagging for Amazon QuickSight works in a similar way to tagging for other Amazon Web Services services, except for the following:</p> <ul> <li> <p>Tags are used to track costs for users in Amazon QuickSight. You can't tag other resources that Amazon QuickSight costs are based on, such as storage capacoty (SPICE), session usage, alert consumption, or reporting units.</p> </li> <li> <p>Amazon QuickSight doesn't currently support the tag editor for Resource Groups.</p> </li> </ul>"
+      "documentation":"<p>Assigns one or more tags (key-value pairs) to the specified QuickSight resource. </p> <p>Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only resources with certain tag values. You can use the <code>TagResource</code> operation with a resource that already has tags. If you specify a new tag key for the resource, this tag is appended to the list of tags associated with the resource. If you specify a tag key that is already associated with the resource, the new tag value that you specify replaces the previous value for that tag.</p> <p>You can associate as many as 50 tags with a resource. QuickSight supports tagging on data set, data source, dashboard, template, topic, and user. </p> <p>Tagging for QuickSight works in a similar way to tagging for other Amazon Web Services services, except for the following:</p> <ul> <li> <p>Tags are used to track costs for users in QuickSight. You can't tag other resources that QuickSight costs are based on, such as storage capacoty (SPICE), session usage, alert consumption, or reporting units.</p> </li> <li> <p>QuickSight doesn't currently support the tag editor for Resource Groups.</p> </li> </ul>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -3100,6 +3134,23 @@
       ],
       "documentation":"<p>Removes a tag or tags from a resource.</p>"
     },
+    "UpdateAccountCustomPermission":{
+      "name":"UpdateAccountCustomPermission",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/custom-permission"
+      },
+      "input":{"shape":"UpdateAccountCustomPermissionRequest"},
+      "output":{"shape":"UpdateAccountCustomPermissionResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Applies a custom permissions profile to an account.</p>"
+    },
     "UpdateAccountCustomization":{
       "name":"UpdateAccountCustomization",
       "http":{
@@ -3117,7 +3168,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Updates Amazon QuickSight customizations for the current Amazon Web Services Region. Currently, the only customization that you can use is a theme.</p> <p>You can use customizations for your Amazon Web Services account or, if you specify a namespace, for a Amazon QuickSight namespace instead. Customizations that apply to a namespace override customizations that apply to an Amazon Web Services account. To find out which customizations apply, use the <code>DescribeAccountCustomization</code> API operation. </p>"
+      "documentation":"<p>Updates Amazon QuickSight customizations for the current Amazon Web Services Region. Currently, the only customization that you can use is a theme.</p> <p>You can use customizations for your Amazon Web Services account or, if you specify a namespace, for a QuickSight namespace instead. Customizations that apply to a namespace override customizations that apply to an Amazon Web Services account. To find out which customizations apply, use the <code>DescribeAccountCustomization</code> API operation. </p>"
     },
     "UpdateAccountSettings":{
       "name":"UpdateAccountSettings",
@@ -3192,7 +3243,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Updates an Amazon QuickSight application with a token exchange grant. This operation only supports Amazon QuickSight applications that are registered with IAM Identity Center.</p>"
+      "documentation":"<p>Updates an QuickSight application with a token exchange grant. This operation only supports QuickSight applications that are registered with IAM Identity Center.</p>"
     },
     "UpdateBrand":{
       "name":"UpdateBrand",
@@ -3458,7 +3509,7 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Updates a Amazon Q Business application that is linked to a Amazon QuickSight account.</p>"
+      "documentation":"<p>Updates a Amazon Q Business application that is linked to a QuickSight account.</p>"
     },
     "UpdateFolder":{
       "name":"UpdateFolder",
@@ -3552,7 +3603,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Adds or updates services and authorized targets to configure what the Amazon QuickSight IAM Identity Center application can access.</p> <p>This operation is only supported for Amazon QuickSight accounts using IAM Identity Center</p>"
+      "documentation":"<p>Adds or updates services and authorized targets to configure what the QuickSight IAM Identity Center application can access.</p> <p>This operation is only supported for QuickSight accounts using IAM Identity Center</p>"
     },
     "UpdateIpRestriction":{
       "name":"UpdateIpRestriction",
@@ -3586,7 +3637,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Updates a customer managed key in a Amazon QuickSight account.</p>"
+      "documentation":"<p>Updates a customer managed key in a QuickSight account.</p>"
     },
     "UpdatePublicSharingSettings":{
       "name":"UpdatePublicSharingSettings",
@@ -3604,7 +3655,7 @@
         {"shape":"UnsupportedPricingPlanException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Use the <code>UpdatePublicSharingSettings</code> operation to turn on or turn off the public sharing settings of an Amazon QuickSight dashboard.</p> <p>To use this operation, turn on session capacity pricing for your Amazon QuickSight account.</p> <p>Before you can turn on public sharing on your account, make sure to give public sharing permissions to an administrative user in the Identity and Access Management (IAM) console. For more information on using IAM with Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/security_iam_service-with-iam.html\">Using Amazon QuickSight with IAM</a> in the <i>Amazon QuickSight User Guide</i>.</p>"
+      "documentation":"<p>Use the <code>UpdatePublicSharingSettings</code> operation to turn on or turn off the public sharing settings of an QuickSight dashboard.</p> <p>To use this operation, turn on session capacity pricing for your QuickSight account.</p> <p>Before you can turn on public sharing on your account, make sure to give public sharing permissions to an administrative user in the Identity and Access Management (IAM) console. For more information on using IAM with QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/security_iam_service-with-iam.html\">Using QuickSight with IAM</a> in the <i>QuickSight User Guide</i>.</p>"
     },
     "UpdateQPersonalizationConfiguration":{
       "name":"UpdateQPersonalizationConfiguration",
@@ -3641,7 +3692,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Updates the state of a Amazon QuickSight Q Search configuration.</p>"
+      "documentation":"<p>Updates the state of a QuickSight Q Search configuration.</p>"
     },
     "UpdateRefreshSchedule":{
       "name":"UpdateRefreshSchedule",
@@ -3696,7 +3747,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Updates the SPICE capacity configuration for a Amazon QuickSight account.</p>"
+      "documentation":"<p>Updates the SPICE capacity configuration for a QuickSight account.</p>"
     },
     "UpdateTemplate":{
       "name":"UpdateTemplate",
@@ -3952,7 +4003,7 @@
       "members":{
         "DefaultTheme":{
           "shape":"Arn",
-          "documentation":"<p>The default theme for this Amazon QuickSight subscription.</p>"
+          "documentation":"<p>The default theme for this QuickSight subscription.</p>"
         },
         "DefaultEmailCustomizationTemplate":{
           "shape":"Arn",
@@ -3966,19 +4017,19 @@
       "members":{
         "AccountName":{
           "shape":"String",
-          "documentation":"<p>The account name that you provided for the Amazon QuickSight subscription in your Amazon Web Services account. You create this name when you sign up for Amazon QuickSight. It's unique over all of Amazon Web Services, and it appears only when users sign in.</p>"
+          "documentation":"<p>The account name that you provided for the QuickSight subscription in your Amazon Web Services account. You create this name when you sign up for QuickSight. It's unique over all of Amazon Web Services, and it appears only when users sign in.</p>"
         },
         "Edition":{
           "shape":"Edition",
-          "documentation":"<p>The edition of your Amazon QuickSight account.</p>"
+          "documentation":"<p>The edition of your QuickSight account.</p>"
         },
         "NotificationEmail":{
           "shape":"String",
-          "documentation":"<p>The email address that will be used for Amazon QuickSight to send notifications regarding your Amazon Web Services account or Amazon QuickSight subscription.</p>"
+          "documentation":"<p>The email address that will be used for QuickSight to send notifications regarding your Amazon Web Services account or QuickSight subscription.</p>"
         },
         "AuthenticationType":{
           "shape":"String",
-          "documentation":"<p>The way that your Amazon QuickSight account is authenticated.</p>"
+          "documentation":"<p>The way that your QuickSight account is authenticated.</p>"
         },
         "AccountSubscriptionStatus":{
           "shape":"String",
@@ -3989,7 +4040,7 @@
           "documentation":"<p>The Amazon Resource Name (ARN) for the IAM Identity Center instance.</p>"
         }
       },
-      "documentation":"<p>A structure that contains the following account information elements:</p> <ul> <li> <p>Your Amazon QuickSight account name.</p> </li> <li> <p>The edition of Amazon QuickSight that your account is using.</p> </li> <li> <p>The notification email address that is associated with the Amazon QuickSight account. </p> </li> <li> <p>The authentication type of the Amazon QuickSight account.</p> </li> <li> <p>The status of the Amazon QuickSight account's subscription.</p> </li> </ul>"
+      "documentation":"<p>A structure that contains the following account information elements:</p> <ul> <li> <p>Your QuickSight account name.</p> </li> <li> <p>The edition of QuickSight that your account is using.</p> </li> <li> <p>The notification email address that is associated with the QuickSight account. </p> </li> <li> <p>The authentication type of the QuickSight account.</p> </li> <li> <p>The status of the QuickSight account's subscription.</p> </li> </ul>"
     },
     "AccountName":{
       "type":"string",
@@ -4002,30 +4053,30 @@
       "members":{
         "AccountName":{
           "shape":"String",
-          "documentation":"<p>The \"account name\" you provided for the Amazon QuickSight subscription in your Amazon Web Services account. You create this name when you sign up for Amazon QuickSight. It is unique in all of Amazon Web Services and it appears only when users sign in.</p>"
+          "documentation":"<p>The \"account name\" you provided for the QuickSight subscription in your Amazon Web Services account. You create this name when you sign up for QuickSight. It is unique in all of Amazon Web Services and it appears only when users sign in.</p>"
         },
         "Edition":{
           "shape":"Edition",
-          "documentation":"<p>The edition of Amazon QuickSight that you're currently subscribed to: Enterprise edition or Standard edition.</p>"
+          "documentation":"<p>The edition of QuickSight that you're currently subscribed to: Enterprise edition or Standard edition.</p>"
         },
         "DefaultNamespace":{
           "shape":"Namespace",
-          "documentation":"<p>The default Amazon QuickSight namespace for your Amazon Web Services account. </p>"
+          "documentation":"<p>The default QuickSight namespace for your Amazon Web Services account. </p>"
         },
         "NotificationEmail":{
           "shape":"String",
-          "documentation":"<p>The main notification email for your Amazon QuickSight subscription.</p>"
+          "documentation":"<p>The main notification email for your QuickSight subscription.</p>"
         },
         "PublicSharingEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>A Boolean value that indicates whether public sharing is turned on for an Amazon QuickSight account. For more information about turning on public sharing, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdatePublicSharingSettings.html\">UpdatePublicSharingSettings</a>.</p>"
+          "documentation":"<p>A Boolean value that indicates whether public sharing is turned on for an QuickSight account. For more information about turning on public sharing, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdatePublicSharingSettings.html\">UpdatePublicSharingSettings</a>.</p>"
         },
         "TerminationProtectionEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>A boolean value that determines whether or not an Amazon QuickSight account can be deleted. A <code>True</code> value doesn't allow the account to be deleted and results in an error message if a user tries to make a <code>DeleteAccountSubsctiption</code> request. A <code>False</code> value will allow the ccount to be deleted. </p>"
+          "documentation":"<p>A boolean value that determines whether or not an QuickSight account can be deleted. A <code>True</code> value doesn't allow the account to be deleted and results in an error message if a user tries to make a <code>DeleteAccountSubsctiption</code> request. A <code>False</code> value will allow the ccount to be deleted. </p>"
         }
       },
-      "documentation":"<p>The Amazon QuickSight settings associated with your Amazon Web Services account.</p>"
+      "documentation":"<p>The QuickSight settings associated with your Amazon Web Services account.</p>"
     },
     "ActionList":{
       "type":"list",
@@ -4245,32 +4296,32 @@
       "members":{
         "DataQnA":{
           "shape":"DataQnAConfigurations",
-          "documentation":"<p>Adds generative Q&amp;A capabilitiees to an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>Adds generative Q&amp;A capabilitiees to an embedded QuickSight console.</p>"
         },
         "GenerativeAuthoring":{
           "shape":"GenerativeAuthoringConfigurations",
-          "documentation":"<p>Adds the generative BI authoring experience to an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>Adds the generative BI authoring experience to an embedded QuickSight console.</p>"
         },
         "ExecutiveSummary":{
           "shape":"ExecutiveSummaryConfigurations",
-          "documentation":"<p>Adds the executive summaries feature to an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>Adds the executive summaries feature to an embedded QuickSight console.</p>"
         },
         "DataStories":{
           "shape":"DataStoriesConfigurations",
-          "documentation":"<p>Adds the data stories feature to an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>Adds the data stories feature to an embedded QuickSight console.</p>"
         }
       },
-      "documentation":"<p>A collection of Amazon Q feature configurations in an embedded Amazon QuickSight console.</p>"
+      "documentation":"<p>A collection of Amazon Q feature configurations in an embedded QuickSight console.</p>"
     },
     "AmazonQInQuickSightDashboardConfigurations":{
       "type":"structure",
       "members":{
         "ExecutiveSummary":{
           "shape":"ExecutiveSummaryConfigurations",
-          "documentation":"<p>A generated executive summary of an embedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>A generated executive summary of an embedded QuickSight dashboard.</p>"
         }
       },
-      "documentation":"<p>A collection of Amazon Q feature configurations in an embedded Amazon QuickSight dashboard.</p>"
+      "documentation":"<p>A collection of Amazon Q feature configurations in an embedded QuickSight dashboard.</p>"
     },
     "Analysis":{
       "type":"structure",
@@ -4490,7 +4541,7 @@
         },
         "Name":{
           "shape":"AnalysisName",
-          "documentation":"<p>The name of the analysis. This name is displayed in the Amazon QuickSight console. </p>"
+          "documentation":"<p>The name of the analysis. This name is displayed in the QuickSight console. </p>"
         },
         "Status":{
           "shape":"ResourceStatus",
@@ -4558,7 +4609,7 @@
       "members":{
         "InitialDashboardId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The dashboard ID for the dashboard that you want the user to see first. This ID is included in the output URL. When the URL in response is accessed, Amazon QuickSight renders this dashboard.</p> <p>The Amazon Resource Name (ARN) of this dashboard must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request will fail with <code>InvalidParameterValueException</code>.</p>"
+          "documentation":"<p>The dashboard ID for the dashboard that you want the user to see first. This ID is included in the output URL. When the URL in response is accessed, QuickSight renders this dashboard.</p> <p>The Amazon Resource Name (ARN) of this dashboard must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request will fail with <code>InvalidParameterValueException</code>.</p>"
         },
         "EnabledFeatures":{
           "shape":"AnonymousUserDashboardEmbeddingConfigurationEnabledFeatures",
@@ -4607,7 +4658,7 @@
       "members":{
         "InitialDashboardVisualId":{
           "shape":"DashboardVisualId",
-          "documentation":"<p>The visual ID for the visual that you want the user to see. This ID is included in the output URL. When the URL in response is accessed, Amazon QuickSight renders this visual.</p> <p>The Amazon Resource Name (ARN) of the dashboard that the visual belongs to must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request will fail with <code>InvalidParameterValueException</code>.</p>"
+          "documentation":"<p>The visual ID for the visual that you want the user to see. This ID is included in the output URL. When the URL in response is accessed, QuickSight renders this visual.</p> <p>The Amazon Resource Name (ARN) of the dashboard that the visual belongs to must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request will fail with <code>InvalidParameterValueException</code>.</p>"
         }
       },
       "documentation":"<p>The experience that you are embedding. You can use this object to generate a url that embeds a visual into your application.</p>"
@@ -4617,11 +4668,11 @@
       "members":{
         "Dashboard":{
           "shape":"AnonymousUserDashboardEmbeddingConfiguration",
-          "documentation":"<p>The type of embedding experience. In this case, Amazon QuickSight dashboards.</p>"
+          "documentation":"<p>The type of embedding experience. In this case, QuickSight dashboards.</p>"
         },
         "DashboardVisual":{
           "shape":"AnonymousUserDashboardVisualEmbeddingConfiguration",
-          "documentation":"<p>The type of embedding experience. In this case, Amazon QuickSight visuals.</p>"
+          "documentation":"<p>The type of embedding experience. In this case, QuickSight visuals.</p>"
         },
         "QSearchBar":{
           "shape":"AnonymousUserQSearchBarEmbeddingConfiguration",
@@ -4632,7 +4683,7 @@
           "documentation":"<p>The Generative Q&amp;A experience that you want to use for anonymous user embedding.</p>"
         }
       },
-      "documentation":"<p>The type of experience you want to embed. For anonymous users, you can embed Amazon QuickSight dashboards.</p>"
+      "documentation":"<p>The type of experience you want to embed. For anonymous users, you can embed QuickSight dashboards.</p>"
     },
     "AnonymousUserGenerativeQnAEmbeddingConfiguration":{
       "type":"structure",
@@ -4640,7 +4691,7 @@
       "members":{
         "InitialTopicId":{
           "shape":"RestrictiveResourceId",
-          "documentation":"<p>The Amazon QuickSight Q topic ID of the new reader experience topic that you want the anonymous user to see first. This ID is included in the output URL. When the URL in response is accessed, Amazon QuickSight renders the Generative Q&amp;A experience with this new reader experience topic pre selected.</p> <p>The Amazon Resource Name (ARN) of this Q new reader experience topic must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request fails with an <code>InvalidParameterValueException</code> error.</p>"
+          "documentation":"<p>The QuickSight Q topic ID of the new reader experience topic that you want the anonymous user to see first. This ID is included in the output URL. When the URL in response is accessed, QuickSight renders the Generative Q&amp;A experience with this new reader experience topic pre selected.</p> <p>The Amazon Resource Name (ARN) of this Q new reader experience topic must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request fails with an <code>InvalidParameterValueException</code> error.</p>"
         }
       },
       "documentation":"<p>The settings that you want to use for the Generative Q&amp;A experience.</p>"
@@ -4651,7 +4702,7 @@
       "members":{
         "InitialTopicId":{
           "shape":"RestrictiveResourceId",
-          "documentation":"<p>The Amazon QuickSight Q topic ID of the legacy topic that you want the anonymous user to see first. This ID is included in the output URL. When the URL in response is accessed, Amazon QuickSight renders the Q search bar with this legacy topic pre-selected.</p> <p>The Amazon Resource Name (ARN) of this Q legacy topic must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request fails with an <code>InvalidParameterValueException</code> error.</p>"
+          "documentation":"<p>The QuickSight Q topic ID of the legacy topic that you want the anonymous user to see first. This ID is included in the output URL. When the URL in response is accessed, QuickSight renders the Q search bar with this legacy topic pre-selected.</p> <p>The Amazon Resource Name (ARN) of this Q legacy topic must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request fails with an <code>InvalidParameterValueException</code> error.</p>"
         }
       },
       "documentation":"<p>The settings that you want to use with the Q search bar.</p>"
@@ -6043,7 +6094,7 @@
           "documentation":"<p>A list of link sharing permissions for the dashboards that you want to apply overrides to.</p>"
         }
       },
-      "documentation":"<p>A structure that contains the configuration of a shared link to an Amazon QuickSight dashboard.</p>"
+      "documentation":"<p>A structure that contains the configuration of a shared link to an QuickSight dashboard.</p>"
     },
     "AssetBundleResourcePermissions":{
       "type":"structure",
@@ -6120,7 +6171,7 @@
         },
         "IdentityCenterConfiguration":{
           "shape":"IdentityCenterConfiguration",
-          "documentation":"<p>An optional parameter that configures IAM Identity Center authentication to grant Amazon QuickSight access to your workgroup.</p> <p>This parameter can only be specified if your Amazon QuickSight account is configured with IAM Identity Center.</p>"
+          "documentation":"<p>An optional parameter that configures IAM Identity Center authentication to grant QuickSight access to your workgroup.</p> <p>This parameter can only be specified if your QuickSight account is configured with IAM Identity Center.</p>"
         }
       },
       "documentation":"<p>Parameters for Amazon Athena.</p>"
@@ -7204,7 +7255,7 @@
       "members":{
         "BrandId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the Amazon QuickSight brand.</p>"
+          "documentation":"<p>The ID of the QuickSight brand.</p>"
         },
         "Arn":{
           "shape":"Arn",
@@ -7270,7 +7321,7 @@
         },
         "BrandId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the Amazon QuickSight brand.</p>"
+          "documentation":"<p>The ID of the QuickSight brand.</p>"
         },
         "BrandName":{
           "shape":"Name",
@@ -7541,9 +7592,17 @@
         "IncludeContentInScheduledReportsEmail":{
           "shape":"CapabilityState",
           "documentation":"<p>The ability to include content in scheduled email reports.</p>"
+        },
+        "Dashboard":{
+          "shape":"CapabilityState",
+          "documentation":"<p>The ability to perform dashboard-related actions.</p>"
+        },
+        "Analysis":{
+          "shape":"CapabilityState",
+          "documentation":"<p>The ability to perform analysis-related actions.</p>"
         }
       },
-      "documentation":"<p>A set of actions that correspond to Amazon QuickSight permissions.</p>"
+      "documentation":"<p>A set of actions that correspond to QuickSight permissions.</p>"
     },
     "CapabilityState":{
       "type":"string",
@@ -7717,11 +7776,11 @@
       "members":{
         "FilterListConfiguration":{
           "shape":"FilterListConfiguration",
-          "documentation":"<p>A list of filter configurations. In the Amazon QuickSight console, this filter type is called a filter list.</p>"
+          "documentation":"<p>A list of filter configurations. In the QuickSight console, this filter type is called a filter list.</p>"
         },
         "CustomFilterListConfiguration":{
           "shape":"CustomFilterListConfiguration",
-          "documentation":"<p>A list of custom filter values. In the Amazon QuickSight console, this filter type is called a custom filter list.</p>"
+          "documentation":"<p>A list of custom filter values. In the QuickSight console, this filter type is called a custom filter list.</p>"
         },
         "CustomFilterConfiguration":{
           "shape":"CustomFilterConfiguration",
@@ -8095,7 +8154,7 @@
       "members":{
         "Principals":{
           "shape":"PrincipalList",
-          "documentation":"<p>An array of Amazon Resource Names (ARNs) for Amazon QuickSight users or groups.</p>"
+          "documentation":"<p>An array of Amazon Resource Names (ARNs) for QuickSight users or groups.</p>"
         },
         "ColumnNames":{
           "shape":"ColumnNameList",
@@ -8811,19 +8870,19 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that you want to customize Amazon QuickSight for.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account that you want to customize QuickSight for.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The Amazon QuickSight namespace that you want to add customizations to.</p>",
+          "documentation":"<p>The QuickSight namespace that you want to add customizations to.</p>",
           "location":"querystring",
           "locationName":"namespace"
         },
         "AccountCustomization":{
           "shape":"AccountCustomization",
-          "documentation":"<p>The Amazon QuickSight customizations you're adding in the current Amazon Web Services Region. You can add these to an Amazon Web Services account and a QuickSight namespace. </p> <p>For example, you can add a default theme by setting <code>AccountCustomization</code> to the midnight theme: <code>\"AccountCustomization\": { \"DefaultTheme\": \"arn:aws:quicksight::aws:theme/MIDNIGHT\" }</code>. Or, you can add a custom theme by specifying <code>\"AccountCustomization\": { \"DefaultTheme\": \"arn:aws:quicksight:us-west-2:111122223333:theme/bdb844d0-0fe9-4d9d-b520-0fe602d93639\" }</code>. </p>"
+          "documentation":"<p>The QuickSight customizations you're adding in the current Amazon Web Services Region. You can add these to an Amazon Web Services account and a QuickSight namespace. </p> <p>For example, you can add a default theme by setting <code>AccountCustomization</code> to the midnight theme: <code>\"AccountCustomization\": { \"DefaultTheme\": \"arn:aws:quicksight::aws:theme/MIDNIGHT\" }</code>. Or, you can add a custom theme by specifying <code>\"AccountCustomization\": { \"DefaultTheme\": \"arn:aws:quicksight:us-west-2:111122223333:theme/bdb844d0-0fe9-4d9d-b520-0fe602d93639\" }</code>. </p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -8840,7 +8899,7 @@
         },
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that you want to customize Amazon QuickSight for.</p>"
+          "documentation":"<p>The ID for the Amazon Web Services account that you want to customize QuickSight for.</p>"
         },
         "Namespace":{
           "shape":"Namespace",
@@ -8848,7 +8907,7 @@
         },
         "AccountCustomization":{
           "shape":"AccountCustomization",
-          "documentation":"<p>The Amazon QuickSight customizations you're adding in the current Amazon Web Services Region. </p>"
+          "documentation":"<p>The QuickSight customizations you're adding in the current Amazon Web Services Region. </p>"
         },
         "RequestId":{
           "shape":"String",
@@ -8872,77 +8931,77 @@
       "members":{
         "Edition":{
           "shape":"Edition",
-          "documentation":"<p>The edition of Amazon QuickSight that you want your account to have. Currently, you can choose from <code>ENTERPRISE</code> or <code>ENTERPRISE_AND_Q</code>.</p> <p>If you choose <code>ENTERPRISE_AND_Q</code>, the following parameters are required:</p> <ul> <li> <p> <code>FirstName</code> </p> </li> <li> <p> <code>LastName</code> </p> </li> <li> <p> <code>EmailAddress</code> </p> </li> <li> <p> <code>ContactNumber</code> </p> </li> </ul>"
+          "documentation":"<p>The edition of QuickSight that you want your account to have. Currently, you can choose from <code>ENTERPRISE</code> or <code>ENTERPRISE_AND_Q</code>.</p> <p>If you choose <code>ENTERPRISE_AND_Q</code>, the following parameters are required:</p> <ul> <li> <p> <code>FirstName</code> </p> </li> <li> <p> <code>LastName</code> </p> </li> <li> <p> <code>EmailAddress</code> </p> </li> <li> <p> <code>ContactNumber</code> </p> </li> </ul>"
         },
         "AuthenticationMethod":{
           "shape":"AuthenticationMethodOption",
-          "documentation":"<p>The method that you want to use to authenticate your Amazon QuickSight account.</p> <p>If you choose <code>ACTIVE_DIRECTORY</code>, provide an <code>ActiveDirectoryName</code> and an <code>AdminGroup</code> associated with your Active Directory.</p> <p>If you choose <code>IAM_IDENTITY_CENTER</code>, provide an <code>AdminGroup</code> associated with your IAM Identity Center account.</p>"
+          "documentation":"<p>The method that you want to use to authenticate your QuickSight account.</p> <p>If you choose <code>ACTIVE_DIRECTORY</code>, provide an <code>ActiveDirectoryName</code> and an <code>AdminGroup</code> associated with your Active Directory.</p> <p>If you choose <code>IAM_IDENTITY_CENTER</code>, provide an <code>AdminGroup</code> associated with your IAM Identity Center account.</p>"
         },
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The Amazon Web Services account ID of the account that you're using to create your Amazon QuickSight account.</p>",
+          "documentation":"<p>The Amazon Web Services account ID of the account that you're using to create your QuickSight account.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "AccountName":{
           "shape":"AccountName",
-          "documentation":"<p>The name of your Amazon QuickSight account. This name is unique over all of Amazon Web Services, and it appears only when users sign in. You can't change <code>AccountName</code> value after the Amazon QuickSight account is created.</p>"
+          "documentation":"<p>The name of your QuickSight account. This name is unique over all of Amazon Web Services, and it appears only when users sign in. You can't change <code>AccountName</code> value after the QuickSight account is created.</p>"
         },
         "NotificationEmail":{
           "shape":"String",
-          "documentation":"<p>The email address that you want Amazon QuickSight to send notifications to regarding your Amazon QuickSight account or Amazon QuickSight subscription.</p>"
+          "documentation":"<p>The email address that you want QuickSight to send notifications to regarding your QuickSight account or QuickSight subscription.</p>"
         },
         "ActiveDirectoryName":{
           "shape":"String",
-          "documentation":"<p>The name of your Active Directory. This field is required if <code>ACTIVE_DIRECTORY</code> is the selected authentication method of the new Amazon QuickSight account.</p>"
+          "documentation":"<p>The name of your Active Directory. This field is required if <code>ACTIVE_DIRECTORY</code> is the selected authentication method of the new QuickSight account.</p>"
         },
         "Realm":{
           "shape":"String",
-          "documentation":"<p>The realm of the Active Directory that is associated with your Amazon QuickSight account. This field is required if <code>ACTIVE_DIRECTORY</code> is the selected authentication method of the new Amazon QuickSight account.</p>"
+          "documentation":"<p>The realm of the Active Directory that is associated with your QuickSight account. This field is required if <code>ACTIVE_DIRECTORY</code> is the selected authentication method of the new QuickSight account.</p>"
         },
         "DirectoryId":{
           "shape":"String",
-          "documentation":"<p>The ID of the Active Directory that is associated with your Amazon QuickSight account.</p>"
+          "documentation":"<p>The ID of the Active Directory that is associated with your QuickSight account.</p>"
         },
         "AdminGroup":{
           "shape":"GroupsList",
-          "documentation":"<p>The admin group associated with your Active Directory or IAM Identity Center account. Either this field or the <code>AdminProGroup</code> field is required if <code>ACTIVE_DIRECTORY</code> or <code>IAM_IDENTITY_CENTER</code> is the selected authentication method of the new Amazon QuickSight account.</p> <p>For more information about using IAM Identity Center in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide. For more information about using Active Directory in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide.</p>"
+          "documentation":"<p>The admin group associated with your Active Directory or IAM Identity Center account. Either this field or the <code>AdminProGroup</code> field is required if <code>ACTIVE_DIRECTORY</code> or <code>IAM_IDENTITY_CENTER</code> is the selected authentication method of the new QuickSight account.</p> <p>For more information about using IAM Identity Center in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with QuickSight Enterprise Edition</a> in the QuickSight User Guide. For more information about using Active Directory in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with QuickSight Enterprise Edition</a> in the QuickSight User Guide.</p>"
         },
         "AuthorGroup":{
           "shape":"GroupsList",
-          "documentation":"<p>The author group associated with your Active Directory or IAM Identity Center account.</p> <p>For more information about using IAM Identity Center in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide. For more information about using Active Directory in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide.</p>"
+          "documentation":"<p>The author group associated with your Active Directory or IAM Identity Center account.</p> <p>For more information about using IAM Identity Center in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with QuickSight Enterprise Edition</a> in the QuickSight User Guide. For more information about using Active Directory in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with QuickSight Enterprise Edition</a> in the QuickSight User Guide.</p>"
         },
         "ReaderGroup":{
           "shape":"GroupsList",
-          "documentation":"<p>The reader group associated with your Active Directory or IAM Identity Center account.</p> <p>For more information about using IAM Identity Center in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide. For more information about using Active Directory in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide.</p>"
+          "documentation":"<p>The reader group associated with your Active Directory or IAM Identity Center account.</p> <p>For more information about using IAM Identity Center in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with QuickSight Enterprise Edition</a> in the QuickSight User Guide. For more information about using Active Directory in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with QuickSight Enterprise Edition</a> in the QuickSight User Guide.</p>"
         },
         "AdminProGroup":{
           "shape":"GroupsList",
-          "documentation":"<p>The admin pro group associated with your Active Directory or IAM Identity Center account. Either this field or the <code>AdminGroup</code> field is required if <code>ACTIVE_DIRECTORY</code> or <code>IAM_IDENTITY_CENTER</code> is the selected authentication method of the new Amazon QuickSight account.</p> <p>For more information about using IAM Identity Center in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide. For more information about using Active Directory in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide.</p>"
+          "documentation":"<p>The admin pro group associated with your Active Directory or IAM Identity Center account. Either this field or the <code>AdminGroup</code> field is required if <code>ACTIVE_DIRECTORY</code> or <code>IAM_IDENTITY_CENTER</code> is the selected authentication method of the new QuickSight account.</p> <p>For more information about using IAM Identity Center in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with QuickSight Enterprise Edition</a> in the QuickSight User Guide. For more information about using Active Directory in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with QuickSight Enterprise Edition</a> in the QuickSight User Guide.</p>"
         },
         "AuthorProGroup":{
           "shape":"GroupsList",
-          "documentation":"<p>The author pro group associated with your Active Directory or IAM Identity Center account.</p> <p>For more information about using IAM Identity Center in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide. For more information about using Active Directory in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide.</p>"
+          "documentation":"<p>The author pro group associated with your Active Directory or IAM Identity Center account.</p> <p>For more information about using IAM Identity Center in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with QuickSight Enterprise Edition</a> in the QuickSight User Guide. For more information about using Active Directory in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with QuickSight Enterprise Edition</a> in the QuickSight User Guide.</p>"
         },
         "ReaderProGroup":{
           "shape":"GroupsList",
-          "documentation":"<p>The reader pro group associated with your Active Directory or IAM Identity Center account.</p> <p>For more information about using IAM Identity Center in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide. For more information about using Active Directory in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with Amazon QuickSight Enterprise Edition</a> in the Amazon QuickSight User Guide.</p>"
+          "documentation":"<p>The reader pro group associated with your Active Directory or IAM Identity Center account.</p> <p>For more information about using IAM Identity Center in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/sec-identity-management-identity-center.html\">Using IAM Identity Center with QuickSight Enterprise Edition</a> in the QuickSight User Guide. For more information about using Active Directory in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/aws-directory-service.html\">Using Active Directory with QuickSight Enterprise Edition</a> in the QuickSight User Guide.</p>"
         },
         "FirstName":{
           "shape":"String",
-          "documentation":"<p>The first name of the author of the Amazon QuickSight account to use for future communications. This field is required if <code>ENTERPPRISE_AND_Q</code> is the selected edition of the new Amazon QuickSight account.</p>"
+          "documentation":"<p>The first name of the author of the QuickSight account to use for future communications. This field is required if <code>ENTERPPRISE_AND_Q</code> is the selected edition of the new QuickSight account.</p>"
         },
         "LastName":{
           "shape":"String",
-          "documentation":"<p>The last name of the author of the Amazon QuickSight account to use for future communications. This field is required if <code>ENTERPPRISE_AND_Q</code> is the selected edition of the new Amazon QuickSight account.</p>"
+          "documentation":"<p>The last name of the author of the QuickSight account to use for future communications. This field is required if <code>ENTERPPRISE_AND_Q</code> is the selected edition of the new QuickSight account.</p>"
         },
         "EmailAddress":{
           "shape":"String",
-          "documentation":"<p>The email address of the author of the Amazon QuickSight account to use for future communications. This field is required if <code>ENTERPPRISE_AND_Q</code> is the selected edition of the new Amazon QuickSight account.</p>"
+          "documentation":"<p>The email address of the author of the QuickSight account to use for future communications. This field is required if <code>ENTERPPRISE_AND_Q</code> is the selected edition of the new QuickSight account.</p>"
         },
         "ContactNumber":{
           "shape":"String",
-          "documentation":"<p>A 10-digit phone number for the author of the Amazon QuickSight account to use for future communications. This field is required if <code>ENTERPPRISE_AND_Q</code> is the selected edition of the new Amazon QuickSight account.</p>"
+          "documentation":"<p>A 10-digit phone number for the author of the QuickSight account to use for future communications. This field is required if <code>ENTERPPRISE_AND_Q</code> is the selected edition of the new QuickSight account.</p>"
         },
         "IAMIdentityCenterInstanceArn":{
           "shape":"String",
@@ -8955,7 +9014,7 @@
       "members":{
         "SignupResponse":{
           "shape":"SignupResponse",
-          "documentation":"<p>A <code>SignupResponse</code> object that returns information about a newly created Amazon QuickSight account.</p>"
+          "documentation":"<p>A <code>SignupResponse</code> object that returns information about a newly created QuickSight account.</p>"
         },
         "Status":{
           "shape":"StatusCode",
@@ -8990,7 +9049,7 @@
         },
         "Name":{
           "shape":"AnalysisName",
-          "documentation":"<p>A descriptive name for the analysis that you're creating. This name displays for the analysis in the Amazon QuickSight console. </p>"
+          "documentation":"<p>A descriptive name for the analysis that you're creating. This name displays for the analysis in the QuickSight console. </p>"
         },
         "Parameters":{
           "shape":"Parameters",
@@ -9006,7 +9065,7 @@
         },
         "ThemeArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN for the theme to apply to the analysis that you're creating. To see the theme in the Amazon QuickSight console, make sure that you have access to it.</p>"
+          "documentation":"<p>The ARN for the theme to apply to the analysis that you're creating. To see the theme in the QuickSight console, make sure that you have access to it.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -9022,7 +9081,7 @@
         },
         "FolderArns":{
           "shape":"FolderArnList",
-          "documentation":"<p>When you create the analysis, Amazon QuickSight adds the analysis to these folders.</p>"
+          "documentation":"<p>When you create the analysis, QuickSight adds the analysis to these folders.</p>"
         }
       }
     },
@@ -9067,7 +9126,7 @@
         },
         "BrandId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the Amazon QuickSight brand.</p>",
+          "documentation":"<p>The ID of the QuickSight brand.</p>",
           "location":"uri",
           "locationName":"BrandId"
         },
@@ -9187,7 +9246,7 @@
         },
         "SourceEntity":{
           "shape":"DashboardSourceEntity",
-          "documentation":"<p>The entity that you are using as a source when you create the dashboard. In <code>SourceEntity</code>, you specify the type of object you're using as source. You can only create a dashboard from a template, so you use a <code>SourceTemplate</code> entity. If you need to create a dashboard from an analysis, first convert the analysis to a template by using the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_CreateTemplate.html\">CreateTemplate</a> </code> API operation. For <code>SourceTemplate</code>, specify the Amazon Resource Name (ARN) of the source template. The <code>SourceTemplate</code>ARN can contain any Amazon Web Services account and any Amazon QuickSight-supported Amazon Web Services Region. </p> <p>Use the <code>DataSetReferences</code> entity within <code>SourceTemplate</code> to list the replacement datasets for the placeholders listed in the original. The schema in each dataset must match its placeholder. </p> <p>Either a <code>SourceEntity</code> or a <code>Definition</code> must be provided in order for the request to be valid.</p>"
+          "documentation":"<p>The entity that you are using as a source when you create the dashboard. In <code>SourceEntity</code>, you specify the type of object you're using as source. You can only create a dashboard from a template, so you use a <code>SourceTemplate</code> entity. If you need to create a dashboard from an analysis, first convert the analysis to a template by using the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_CreateTemplate.html\">CreateTemplate</a> </code> API operation. For <code>SourceTemplate</code>, specify the Amazon Resource Name (ARN) of the source template. The <code>SourceTemplate</code>ARN can contain any Amazon Web Services account and any QuickSight-supported Amazon Web Services Region. </p> <p>Use the <code>DataSetReferences</code> entity within <code>SourceTemplate</code> to list the replacement datasets for the placeholders listed in the original. The schema in each dataset must match its placeholder. </p> <p>Either a <code>SourceEntity</code> or a <code>Definition</code> must be provided in order for the request to be valid.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -9199,7 +9258,7 @@
         },
         "DashboardPublishOptions":{
           "shape":"DashboardPublishOptions",
-          "documentation":"<p>Options for publishing the dashboard when you create it:</p> <ul> <li> <p> <code>AvailabilityStatus</code> for <code>AdHocFilteringOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. When this is set to <code>DISABLED</code>, Amazon QuickSight disables the left filter pane on the published dashboard, which can be used for ad hoc (one-time) filtering. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExportToCSVOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The visual option to export data to .CSV format isn't enabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>VisibilityState</code> for <code>SheetControlsOption</code> - This visibility state can be either <code>COLLAPSED</code> or <code>EXPANDED</code>. This option is <code>COLLAPSED</code> by default. </p> </li> </ul>"
+          "documentation":"<p>Options for publishing the dashboard when you create it:</p> <ul> <li> <p> <code>AvailabilityStatus</code> for <code>AdHocFilteringOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. When this is set to <code>DISABLED</code>, QuickSight disables the left filter pane on the published dashboard, which can be used for ad hoc (one-time) filtering. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExportToCSVOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The visual option to export data to .CSV format isn't enabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>VisibilityState</code> for <code>SheetControlsOption</code> - This visibility state can be either <code>COLLAPSED</code> or <code>EXPANDED</code>. This option is <code>COLLAPSED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExecutiveSummaryOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The option to build an executive summary is disabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default.</p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>DataStoriesSharingOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The option to share a data story is disabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default.</p> </li> </ul>"
         },
         "ThemeArn":{
           "shape":"Arn",
@@ -9215,7 +9274,7 @@
         },
         "FolderArns":{
           "shape":"FolderArnList",
-          "documentation":"<p>When you create the dashboard, Amazon QuickSight adds the dashboard to these folders.</p>"
+          "documentation":"<p>When you create the dashboard, QuickSight adds the dashboard to these folders.</p>"
         },
         "LinkSharingConfiguration":{
           "shape":"LinkSharingConfiguration",
@@ -9295,7 +9354,7 @@
         },
         "ColumnGroups":{
           "shape":"ColumnGroupList",
-          "documentation":"<p>Groupings of columns that work together in certain Amazon QuickSight features. Currently, only geospatial hierarchy is supported.</p>"
+          "documentation":"<p>Groupings of columns that work together in certain QuickSight features. Currently, only geospatial hierarchy is supported.</p>"
         },
         "FieldFolders":{
           "shape":"FieldFolderMap",
@@ -9328,7 +9387,7 @@
         },
         "FolderArns":{
           "shape":"FolderArnList",
-          "documentation":"<p>When you create the dataset, Amazon QuickSight adds the dataset to these folders.</p>"
+          "documentation":"<p>When you create the dataset, QuickSight adds the dataset to these folders.</p>"
         },
         "PerformanceConfiguration":{
           "shape":"PerformanceConfiguration",
@@ -9399,11 +9458,11 @@
         },
         "DataSourceParameters":{
           "shape":"DataSourceParameters",
-          "documentation":"<p>The parameters that Amazon QuickSight uses to connect to your underlying source.</p>"
+          "documentation":"<p>The parameters that QuickSight uses to connect to your underlying source.</p>"
         },
         "Credentials":{
           "shape":"DataSourceCredentials",
-          "documentation":"<p>The credentials Amazon QuickSight that uses to connect to your underlying source. Currently, only credentials based on user name and password are supported.</p>"
+          "documentation":"<p>The credentials QuickSight that uses to connect to your underlying source. Currently, only credentials based on user name and password are supported.</p>"
         },
         "Permissions":{
           "shape":"ResourcePermissionList",
@@ -9411,11 +9470,11 @@
         },
         "VpcConnectionProperties":{
           "shape":"VpcConnectionProperties",
-          "documentation":"<p>Use this parameter only when you want Amazon QuickSight to use a VPC connection when connecting to your underlying source.</p>"
+          "documentation":"<p>Use this parameter only when you want QuickSight to use a VPC connection when connecting to your underlying source.</p>"
         },
         "SslProperties":{
           "shape":"SslProperties",
-          "documentation":"<p>Secure Socket Layer (SSL) properties that apply when Amazon QuickSight connects to your underlying source.</p>"
+          "documentation":"<p>Secure Socket Layer (SSL) properties that apply when QuickSight connects to your underlying source.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -9423,7 +9482,7 @@
         },
         "FolderArns":{
           "shape":"FolderArnList",
-          "documentation":"<p>When you create the data source, Amazon QuickSight adds the data source to these folders.</p>"
+          "documentation":"<p>When you create the data source, QuickSight adds the data source to these folders.</p>"
         }
       }
     },
@@ -9686,7 +9745,7 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID of the Amazon Web Services account where you want to assign an IAM policy to Amazon QuickSight users or groups.</p>",
+          "documentation":"<p>The ID of the Amazon Web Services account where you want to assign an IAM policy to QuickSight users or groups.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
@@ -9700,11 +9759,11 @@
         },
         "PolicyArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN for the IAM policy to apply to the Amazon QuickSight users and groups specified in this assignment.</p>"
+          "documentation":"<p>The ARN for the IAM policy to apply to the QuickSight users and groups specified in this assignment.</p>"
         },
         "Identities":{
           "shape":"IdentityMap",
-          "documentation":"<p>The Amazon QuickSight users, groups, or both that you want to assign the policy to.</p>"
+          "documentation":"<p>The QuickSight users, groups, or both that you want to assign the policy to.</p>"
         },
         "Namespace":{
           "shape":"Namespace",
@@ -9731,11 +9790,11 @@
         },
         "PolicyArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN for the IAM policy that is applied to the Amazon QuickSight users and groups specified in this assignment.</p>"
+          "documentation":"<p>The ARN for the IAM policy that is applied to the QuickSight users and groups specified in this assignment.</p>"
         },
         "Identities":{
           "shape":"IdentityMap",
-          "documentation":"<p>The Amazon QuickSight users, groups, or both that the IAM policy is assigned to.</p>"
+          "documentation":"<p>The QuickSight users, groups, or both that the IAM policy is assigned to.</p>"
         },
         "RequestId":{
           "shape":"String",
@@ -9816,7 +9875,7 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that you want to create the Amazon QuickSight namespace in.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account that you want to create the QuickSight namespace in.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
@@ -9839,7 +9898,7 @@
       "members":{
         "Arn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the Amazon QuickSight namespace you created. </p>"
+          "documentation":"<p>The ARN of the QuickSight namespace you created. </p>"
         },
         "Name":{
           "shape":"Namespace",
@@ -9988,7 +10047,7 @@
         },
         "AliasName":{
           "shape":"AliasName",
-          "documentation":"<p>The name that you want to give to the template alias that you're creating. Don't start the alias name with the <code>$</code> character. Alias names that start with <code>$</code> are reserved by Amazon QuickSight. </p>",
+          "documentation":"<p>The name that you want to give to the template alias that you're creating. Don't start the alias name with the <code>$</code> character. Alias names that start with <code>$</code> are reserved by QuickSight. </p>",
           "location":"uri",
           "locationName":"AliasName"
         },
@@ -10045,7 +10104,7 @@
         },
         "SourceEntity":{
           "shape":"TemplateSourceEntity",
-          "documentation":"<p>The entity that you are using as a source when you create the template. In <code>SourceEntity</code>, you specify the type of object you're using as source: <code>SourceTemplate</code> for a template or <code>SourceAnalysis</code> for an analysis. Both of these require an Amazon Resource Name (ARN). For <code>SourceTemplate</code>, specify the ARN of the source template. For <code>SourceAnalysis</code>, specify the ARN of the source analysis. The <code>SourceTemplate</code> ARN can contain any Amazon Web Services account and any Amazon QuickSight-supported Amazon Web Services Region. </p> <p>Use the <code>DataSetReferences</code> entity within <code>SourceTemplate</code> or <code>SourceAnalysis</code> to list the replacement datasets for the placeholders listed in the original. The schema in each dataset must match its placeholder. </p> <p>Either a <code>SourceEntity</code> or a <code>Definition</code> must be provided in order for the request to be valid.</p>"
+          "documentation":"<p>The entity that you are using as a source when you create the template. In <code>SourceEntity</code>, you specify the type of object you're using as source: <code>SourceTemplate</code> for a template or <code>SourceAnalysis</code> for an analysis. Both of these require an Amazon Resource Name (ARN). For <code>SourceTemplate</code>, specify the ARN of the source template. For <code>SourceAnalysis</code>, specify the ARN of the source analysis. The <code>SourceTemplate</code> ARN can contain any Amazon Web Services account and any QuickSight-supported Amazon Web Services Region. </p> <p>Use the <code>DataSetReferences</code> entity within <code>SourceTemplate</code> or <code>SourceAnalysis</code> to list the replacement datasets for the placeholders listed in the original. The schema in each dataset must match its placeholder. </p> <p>Either a <code>SourceEntity</code> or a <code>Definition</code> must be provided in order for the request to be valid.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -10622,6 +10681,16 @@
       "member":{"shape":"CustomColor"},
       "max":50
     },
+    "CustomConnectionParameters":{
+      "type":"structure",
+      "members":{
+        "ConnectionType":{
+          "shape":"String",
+          "documentation":"<p>The type of custom connector.</p>"
+        }
+      },
+      "documentation":"<p>The parameters that are required to connect to a custom connection data source.</p>"
+    },
     "CustomContentConfiguration":{
       "type":"structure",
       "members":{
@@ -10889,7 +10958,7 @@
           "documentation":"<p>The Amazon Web Services request ID for this operation.</p>"
         }
       },
-      "documentation":"<p>The customer managed key that is registered to your Amazon QuickSight account is unavailable.</p>",
+      "documentation":"<p>The customer managed key that is registered to your QuickSight account is unavailable.</p>",
       "error":{"httpStatusCode":400},
       "exception":true
     },
@@ -11044,7 +11113,15 @@
         },
         "DataQAEnabledOption":{
           "shape":"DataQAEnabledOption",
-          "documentation":"<p>Adds Q&amp;A capabilities to an Amazon QuickSight dashboard. If no topic is linked, Dashboard Q&amp;A uses the data values that are rendered on the dashboard. End users can use Dashboard Q&amp;A to ask for different slices of the data that they see on the dashboard. If a topic is linked, Topic Q&amp;A is used.</p>"
+          "documentation":"<p>Adds Q&amp;A capabilities to an QuickSight dashboard. If no topic is linked, Dashboard Q&amp;A uses the data values that are rendered on the dashboard. End users can use Dashboard Q&amp;A to ask for different slices of the data that they see on the dashboard. If a topic is linked, Topic Q&amp;A is used.</p>"
+        },
+        "ExecutiveSummaryOption":{
+          "shape":"ExecutiveSummaryOption",
+          "documentation":"<p>Executive summary option.</p>"
+        },
+        "DataStoriesSharingOption":{
+          "shape":"DataStoriesSharingOption",
+          "documentation":"<p>Data stories sharing option.</p>"
         }
       },
       "documentation":"<p>Dashboard publish options.</p>"
@@ -11279,18 +11356,18 @@
       "members":{
         "DashboardId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the dashboard that has the visual that you want to embed. The <code>DashboardId</code> can be found in the <code>IDs for developers</code> section of the <code>Embed visual</code> pane of the visual's on-visual menu of the Amazon QuickSight console. You can also get the <code>DashboardId</code> with a <code>ListDashboards</code> API operation.</p>"
+          "documentation":"<p>The ID of the dashboard that has the visual that you want to embed. The <code>DashboardId</code> can be found in the <code>IDs for developers</code> section of the <code>Embed visual</code> pane of the visual's on-visual menu of the QuickSight console. You can also get the <code>DashboardId</code> with a <code>ListDashboards</code> API operation.</p>"
         },
         "SheetId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the sheet that the has visual that you want to embed. The <code>SheetId</code> can be found in the <code>IDs for developers</code> section of the <code>Embed visual</code> pane of the visual's on-visual menu of the Amazon QuickSight console.</p>"
+          "documentation":"<p>The ID of the sheet that the has visual that you want to embed. The <code>SheetId</code> can be found in the <code>IDs for developers</code> section of the <code>Embed visual</code> pane of the visual's on-visual menu of the QuickSight console.</p>"
         },
         "VisualId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the visual that you want to embed. The <code>VisualID</code> can be found in the <code>IDs for developers</code> section of the <code>Embed visual</code> pane of the visual's on-visual menu of the Amazon QuickSight console.</p>"
+          "documentation":"<p>The ID of the visual that you want to embed. The <code>VisualID</code> can be found in the <code>IDs for developers</code> section of the <code>Embed visual</code> pane of the visual's on-visual menu of the QuickSight console.</p>"
         }
       },
-      "documentation":"<p>A structure that contains the following elements:</p> <ul> <li> <p>The <code>DashboardId</code> of the dashboard that has the visual that you want to embed.</p> </li> <li> <p>The <code>SheetId</code> of the sheet that has the visual that you want to embed.</p> </li> <li> <p>The <code>VisualId</code> of the visual that you want to embed.</p> </li> </ul> <p>The <code>DashboardId</code>, <code>SheetId</code>, and <code>VisualId</code> can be found in the <code>IDs for developers</code> section of the <code>Embed visual</code> pane of the visual's on-visual menu of the Amazon QuickSight console. You can also get the <code>DashboardId</code> with a <code>ListDashboards</code> API operation.</p>"
+      "documentation":"<p>A structure that contains the following elements:</p> <ul> <li> <p>The <code>DashboardId</code> of the dashboard that has the visual that you want to embed.</p> </li> <li> <p>The <code>SheetId</code> of the sheet that has the visual that you want to embed.</p> </li> <li> <p>The <code>VisualId</code> of the visual that you want to embed.</p> </li> </ul> <p>The <code>DashboardId</code>, <code>SheetId</code>, and <code>VisualId</code> can be found in the <code>IDs for developers</code> section of the <code>Embed visual</code> pane of the visual's on-visual menu of the QuickSight console. You can also get the <code>DashboardId</code> with a <code>ListDashboards</code> API operation.</p>"
     },
     "DashboardVisualPublishOptions":{
       "type":"structure",
@@ -11684,10 +11761,10 @@
       "members":{
         "Enabled":{
           "shape":"Boolean",
-          "documentation":"<p>The generative Q&amp;A settings of an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>The generative Q&amp;A settings of an embedded QuickSight console.</p>"
         }
       },
-      "documentation":"<p>The generative Q&amp;A settings of an embedded Amazon QuickSight console.</p>"
+      "documentation":"<p>The generative Q&amp;A settings of an embedded QuickSight console.</p>"
     },
     "DataSet":{
       "type":"structure",
@@ -12047,11 +12124,11 @@
         },
         "VpcConnectionProperties":{
           "shape":"VpcConnectionProperties",
-          "documentation":"<p>The VPC connection information. You need to use this parameter only when you want Amazon QuickSight to use a VPC connection when connecting to your underlying source.</p>"
+          "documentation":"<p>The VPC connection information. You need to use this parameter only when you want QuickSight to use a VPC connection when connecting to your underlying source.</p>"
         },
         "SslProperties":{
           "shape":"SslProperties",
-          "documentation":"<p>Secure Socket Layer (SSL) properties that apply when Amazon QuickSight connects to your underlying source.</p>"
+          "documentation":"<p>Secure Socket Layer (SSL) properties that apply when QuickSight connects to your underlying source.</p>"
         },
         "ErrorInfo":{
           "shape":"DataSourceErrorInfo",
@@ -12233,6 +12310,10 @@
         "ImpalaParameters":{
           "shape":"ImpalaParameters",
           "documentation":"<p>The parameters for Impala.</p>"
+        },
+        "CustomConnectionParameters":{
+          "shape":"CustomConnectionParameters",
+          "documentation":"<p>The parameters for custom connectors.</p>"
         }
       },
       "documentation":"<p>The parameters that Amazon QuickSight uses to connect to your underlying data source. This is a variant type structure. For this structure to be valid, only one of the attributes can be non-null.</p>"
@@ -12337,7 +12418,8 @@
         "DATABRICKS",
         "STARBURST",
         "TRINO",
-        "BIGQUERY"
+        "BIGQUERY",
+        "GOOGLESHEETS"
       ]
     },
     "DataStoriesConfigurations":{
@@ -12346,10 +12428,20 @@
       "members":{
         "Enabled":{
           "shape":"Boolean",
-          "documentation":"<p>The data story settings of an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>The data story settings of an embedded QuickSight console.</p>"
+        }
+      },
+      "documentation":"<p>The data story settings of an embedded QuickSight console.</p>"
+    },
+    "DataStoriesSharingOption":{
+      "type":"structure",
+      "members":{
+        "AvailabilityStatus":{
+          "shape":"DashboardBehavior",
+          "documentation":"<p>Availability status.</p>"
         }
       },
-      "documentation":"<p>The data story settings of an embedded Amazon QuickSight console.</p>"
+      "documentation":"<p>Executive summary option.</p>"
     },
     "Database":{
       "type":"string",
@@ -13230,19 +13322,44 @@
       },
       "documentation":"<p>The default options that correspond to the <code>TextField</code> filter control type.</p>"
     },
+    "DeleteAccountCustomPermissionRequest":{
+      "type":"structure",
+      "required":["AwsAccountId"],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the Amazon Web Services account from which you want to unapply the custom permissions profile.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        }
+      }
+    },
+    "DeleteAccountCustomPermissionResponse":{
+      "type":"structure",
+      "members":{
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Web Services request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>"
+        }
+      }
+    },
     "DeleteAccountCustomizationRequest":{
       "type":"structure",
       "required":["AwsAccountId"],
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that you want to delete Amazon QuickSight customizations from in this Amazon Web Services Region.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account that you want to delete QuickSight customizations from in this Amazon Web Services Region.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The Amazon QuickSight namespace that you're deleting the customizations from.</p>",
+          "documentation":"<p>The QuickSight namespace that you're deleting the customizations from.</p>",
           "location":"querystring",
           "locationName":"namespace"
         }
@@ -13309,7 +13426,7 @@
         },
         "RecoveryWindowInDays":{
           "shape":"RecoveryWindowInDays",
-          "documentation":"<p>A value that specifies the number of days that Amazon QuickSight waits before it deletes the analysis. You can't use this parameter with the <code>ForceDeleteWithoutRecovery</code> option in the same API call. The default value is 30.</p>",
+          "documentation":"<p>A value that specifies the number of days that QuickSight waits before it deletes the analysis. You can't use this parameter with the <code>ForceDeleteWithoutRecovery</code> option in the same API call. The default value is 30.</p>",
           "location":"querystring",
           "locationName":"recovery-window-in-days"
         },
@@ -13383,7 +13500,7 @@
         },
         "BrandId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the Amazon QuickSight brand.</p>",
+          "documentation":"<p>The ID of the QuickSight brand.</p>",
           "location":"uri",
           "locationName":"BrandId"
         }
@@ -13612,13 +13729,13 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID of the Amazon QuickSight account that you want to disconnect from a Amazon Q Business application.</p>",
+          "documentation":"<p>The ID of the QuickSight account that you want to disconnect from a Amazon Q Business application.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The Amazon QuickSight namespace that you want to delete a linked Amazon Q Business application from. If this field is left blank, the Amazon Q Business application is deleted from the default namespace. Currently, the default namespace is the only valid value for this parameter.</p>",
+          "documentation":"<p>The QuickSight namespace that you want to delete a linked Amazon Q Business application from. If this field is left blank, the Amazon Q Business application is deleted from the default namespace. Currently, the default namespace is the only valid value for this parameter.</p>",
           "location":"querystring",
           "locationName":"namespace"
         }
@@ -13910,7 +14027,7 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that you want to delete the Amazon QuickSight namespace from.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account that you want to delete the QuickSight namespace from.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
@@ -14562,25 +14679,54 @@
       "max":1,
       "min":1
     },
+    "DescribeAccountCustomPermissionRequest":{
+      "type":"structure",
+      "required":["AwsAccountId"],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the Amazon Web Services account for which you want to describe the applied custom permissions profile.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        }
+      }
+    },
+    "DescribeAccountCustomPermissionResponse":{
+      "type":"structure",
+      "members":{
+        "CustomPermissionsName":{
+          "shape":"CustomPermissionsName",
+          "documentation":"<p>The name of the custom permissions profile.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Web Services request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>"
+        }
+      }
+    },
     "DescribeAccountCustomizationRequest":{
       "type":"structure",
       "required":["AwsAccountId"],
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that you want to describe Amazon QuickSight customizations for.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account that you want to describe QuickSight customizations for.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The Amazon QuickSight namespace that you want to describe Amazon QuickSight customizations for.</p>",
+          "documentation":"<p>The QuickSight namespace that you want to describe QuickSight customizations for.</p>",
           "location":"querystring",
           "locationName":"namespace"
         },
         "Resolved":{
           "shape":"boolean",
-          "documentation":"<p>The <code>Resolved</code> flag works with the other parameters to determine which view of Amazon QuickSight customizations is returned. You can add this flag to your command to use the same view that Amazon QuickSight uses to identify which customizations to apply to the console. Omit this flag, or set it to <code>no-resolved</code>, to reveal customizations that are configured at different levels. </p>",
+          "documentation":"<p>The <code>Resolved</code> flag works with the other parameters to determine which view of QuickSight customizations is returned. You can add this flag to your command to use the same view that QuickSight uses to identify which customizations to apply to the console. Omit this flag, or set it to <code>no-resolved</code>, to reveal customizations that are configured at different levels. </p>",
           "location":"querystring",
           "locationName":"resolved"
         }
@@ -14599,11 +14745,11 @@
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The Amazon QuickSight namespace that you're describing. </p>"
+          "documentation":"<p>The QuickSight namespace that you're describing. </p>"
         },
         "AccountCustomization":{
           "shape":"AccountCustomization",
-          "documentation":"<p>The Amazon QuickSight customizations that exist in the current Amazon Web Services Region. </p>"
+          "documentation":"<p>The QuickSight customizations that exist in the current Amazon Web Services Region. </p>"
         },
         "RequestId":{
           "shape":"String",
@@ -14633,7 +14779,7 @@
       "members":{
         "AccountSettings":{
           "shape":"AccountSettings",
-          "documentation":"<p>The Amazon QuickSight settings for this Amazon Web Services account. This information includes the edition of Amazon Amazon QuickSight that you subscribed to (Standard or Enterprise) and the notification email for the Amazon QuickSight subscription. </p> <p>In the QuickSight console, the Amazon QuickSight subscription is sometimes referred to as a QuickSight \"account\" even though it's technically not an account by itself. Instead, it's a subscription to the Amazon QuickSight service for your Amazon Web Services account. The edition that you subscribe to applies to Amazon QuickSight in every Amazon Web Services Region where you use it.</p>"
+          "documentation":"<p>The QuickSight settings for this Amazon Web Services account. This information includes the edition of Amazon QuickSight that you subscribed to (Standard or Enterprise) and the notification email for the QuickSight subscription. </p> <p>In the QuickSight console, the QuickSight subscription is sometimes referred to as a QuickSight \"account\" even though it's technically not an account by itself. Instead, it's a subscription to the QuickSight service for your Amazon Web Services account. The edition that you subscribe to applies to QuickSight in every Amazon Web Services Region where you use it.</p>"
         },
         "RequestId":{
           "shape":"String",
@@ -14652,7 +14798,7 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The Amazon Web Services account ID associated with your Amazon QuickSight account.</p>",
+          "documentation":"<p>The Amazon Web Services account ID associated with your QuickSight account.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         }
@@ -14663,7 +14809,7 @@
       "members":{
         "AccountInfo":{
           "shape":"AccountInfo",
-          "documentation":"<p>A structure that contains the following elements:</p> <ul> <li> <p>Your Amazon QuickSight account name.</p> </li> <li> <p>The edition of Amazon QuickSight that your account is using.</p> </li> <li> <p>The notification email address that is associated with the Amazon QuickSight account. </p> </li> <li> <p>The authentication type of the Amazon QuickSight account.</p> </li> <li> <p>The status of the Amazon QuickSight account's subscription.</p> </li> </ul>"
+          "documentation":"<p>A structure that contains the following elements:</p> <ul> <li> <p>Your QuickSight account name.</p> </li> <li> <p>The edition of QuickSight that your account is using.</p> </li> <li> <p>The notification email address that is associated with the QuickSight account. </p> </li> <li> <p>The authentication type of the QuickSight account.</p> </li> <li> <p>The status of the QuickSight account's subscription.</p> </li> </ul>"
         },
         "Status":{
           "shape":"StatusCode",
@@ -15055,7 +15201,7 @@
         },
         "BrandId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the Amazon QuickSight brand.</p>",
+          "documentation":"<p>The ID of the QuickSight brand.</p>",
           "location":"uri",
           "locationName":"BrandId"
         }
@@ -15093,7 +15239,7 @@
         },
         "BrandId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the Amazon QuickSight brand.</p>",
+          "documentation":"<p>The ID of the QuickSight brand.</p>",
           "location":"uri",
           "locationName":"BrandId"
         },
@@ -15231,7 +15377,7 @@
         },
         "DashboardPublishOptions":{
           "shape":"DashboardPublishOptions",
-          "documentation":"<p>Options for publishing the dashboard:</p> <ul> <li> <p> <code>AvailabilityStatus</code> for <code>AdHocFilteringOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. When this is set to <code>DISABLED</code>, Amazon QuickSight disables the left filter pane on the published dashboard, which can be used for ad hoc (one-time) filtering. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExportToCSVOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The visual option to export data to .CSV format isn't enabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>VisibilityState</code> for <code>SheetControlsOption</code> - This visibility state can be either <code>COLLAPSED</code> or <code>EXPANDED</code>. This option is <code>COLLAPSED</code> by default. </p> </li> </ul>"
+          "documentation":"<p>Options for publishing the dashboard:</p> <ul> <li> <p> <code>AvailabilityStatus</code> for <code>AdHocFilteringOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. When this is set to <code>DISABLED</code>, QuickSight disables the left filter pane on the published dashboard, which can be used for ad hoc (one-time) filtering. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExportToCSVOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The visual option to export data to .CSV format isn't enabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>VisibilityState</code> for <code>SheetControlsOption</code> - This visibility state can be either <code>COLLAPSED</code> or <code>EXPANDED</code>. This option is <code>COLLAPSED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExecutiveSummaryOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The option to build an executive summary is disabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default.</p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>DataStoriesSharingOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The option to share a data story is disabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default.</p> </li> </ul>"
         }
       }
     },
@@ -15727,13 +15873,13 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID of the Amazon QuickSight account that is linked to the Amazon Q Business application that you want described.</p>",
+          "documentation":"<p>The ID of the QuickSight account that is linked to the Amazon Q Business application that you want described.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The Amazon QuickSight namespace that contains the linked Amazon Q Business application. If this field is left blank, the default namespace is used. Currently, the default namespace is the only valid value for this parameter.</p>",
+          "documentation":"<p>The QuickSight namespace that contains the linked Amazon Q Business application. If this field is left blank, the default namespace is used. Currently, the default namespace is the only valid value for this parameter.</p>",
           "location":"querystring",
           "locationName":"namespace"
         }
@@ -15753,7 +15899,7 @@
         },
         "ApplicationId":{
           "shape":"String",
-          "documentation":"<p>The ID of the Amazon Q Business application that is linked to the Amazon QuickSight account.</p>"
+          "documentation":"<p>The ID of the Amazon Q Business application that is linked to the QuickSight account.</p>"
         }
       }
     },
@@ -16197,7 +16343,11 @@
         },
         "KeyRegistration":{
           "shape":"KeyRegistration",
-          "documentation":"<p>A list of <code>RegisteredCustomerManagedKey</code> objects in a Amazon QuickSight account.</p>"
+          "documentation":"<p>A list of <code>RegisteredCustomerManagedKey</code> objects in a QuickSight account.</p>"
+        },
+        "QDataKey":{
+          "shape":"QDataKey",
+          "documentation":"<p>A list of <code>QDataKey</code> objects in a QuickSight account.</p>"
         },
         "RequestId":{
           "shape":"NonEmptyString",
@@ -16218,7 +16368,7 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that contains the Amazon QuickSight namespace that you want to describe.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account that contains the QuickSight namespace that you want to describe.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
@@ -16284,7 +16434,7 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID of the Amazon Web Services account that contains the Amazon QuickSight Q Search configuration that the user wants described.</p>",
+          "documentation":"<p>The ID of the Amazon Web Services account that contains the QuickSight Q Search configuration that the user wants described.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         }
@@ -16295,7 +16445,7 @@
       "members":{
         "QSearchStatus":{
           "shape":"QSearchStatus",
-          "documentation":"<p>The status of Amazon QuickSight Q Search configuration.</p>"
+          "documentation":"<p>The status of QuickSight Q Search configuration.</p>"
         },
         "RequestId":{
           "shape":"String",
@@ -17200,7 +17350,7 @@
       "members":{
         "LabelVisibility":{
           "shape":"Visibility",
-          "documentation":"<p>Determines the visibility of the label in a donut chart. In the Amazon QuickSight console, this option is called <code>'Show total'</code>.</p>"
+          "documentation":"<p>Determines the visibility of the label in a donut chart. In the QuickSight console, this option is called <code>'Show total'</code>.</p>"
         }
       },
       "documentation":"<p>The label options of the label that is displayed in the center of a donut chart. This option isn't available for pie charts.</p>"
@@ -17320,7 +17470,7 @@
           "documentation":"<p>The list of custom actions that are configured for a visual.</p>"
         }
       },
-      "documentation":"<p>An empty visual.</p> <p>Empty visuals are used in layouts but have not been configured to show any data. A new visual created in the Amazon QuickSight console is considered an <code>EmptyVisual</code> until a visual type is selected.</p>"
+      "documentation":"<p>An empty visual.</p> <p>Empty visuals are used in layouts but have not been configured to show any data. A new visual created in the QuickSight console is considered an <code>EmptyVisual</code> until a visual type is selected.</p>"
     },
     "Entity":{
       "type":"structure",
@@ -17427,10 +17577,20 @@
       "members":{
         "Enabled":{
           "shape":"Boolean",
-          "documentation":"<p>The executive summary settings of an embedded Amazon QuickSight console or dashboard.</p>"
+          "documentation":"<p>The executive summary settings of an embedded QuickSight console or dashboard.</p>"
         }
       },
-      "documentation":"<p>The executive summary settings of an embedded Amazon QuickSight console or dashboard.</p>"
+      "documentation":"<p>The executive summary settings of an embedded QuickSight console or dashboard.</p>"
+    },
+    "ExecutiveSummaryOption":{
+      "type":"structure",
+      "members":{
+        "AvailabilityStatus":{
+          "shape":"DashboardBehavior",
+          "documentation":"<p>Availability status.</p>"
+        }
+      },
+      "documentation":"<p>Data stories sharing option.</p>"
     },
     "ExplicitHierarchy":{
       "type":"structure",
@@ -17522,10 +17682,10 @@
         },
         "SenderFault":{
           "shape":"Boolean",
-          "documentation":"<p>A boolean that indicates whether a <code>FailedKeyRegistrationEntry</code> resulted from user error. If the value of this property is <code>True</code>, the error was caused by user error. If the value of this property is <code>False</code>, the error occurred on the backend. If your job continues fail and with a <code>False</code> <code>SenderFault</code> value, contact Amazon Web ServicesSupport.</p>"
+          "documentation":"<p>A boolean that indicates whether a <code>FailedKeyRegistrationEntry</code> resulted from user error. If the value of this property is <code>True</code>, the error was caused by user error. If the value of this property is <code>False</code>, the error occurred on the backend. If your job continues fail and with a <code>False</code> <code>SenderFault</code> value, contact Amazon Web Services Support.</p>"
         }
       },
-      "documentation":"<p>An entry that appears when a <code>KeyRegistration</code> update to Amazon QuickSight fails.</p>"
+      "documentation":"<p>An entry that appears when a <code>KeyRegistration</code> update to QuickSight fails.</p>"
     },
     "FieldBasedTooltip":{
       "type":"structure",
@@ -18431,7 +18591,7 @@
           "documentation":"<p>The sharing scope of the folder.</p>"
         }
       },
-      "documentation":"<p>A folder in Amazon QuickSight.</p>"
+      "documentation":"<p>A folder in QuickSight.</p>"
     },
     "FolderArnList":{
       "type":"list",
@@ -18467,7 +18627,7 @@
           "documentation":"<p>The type of asset that it is.</p>"
         }
       },
-      "documentation":"<p>An asset in a Amazon QuickSight folder, such as a dashboard, analysis, or dataset.</p>"
+      "documentation":"<p>An asset in a QuickSight folder, such as a dashboard, analysis, or dataset.</p>"
     },
     "FolderMemberList":{
       "type":"list",
@@ -18495,7 +18655,7 @@
           "documentation":"<p>The value of the named item (in this example, <code>PARENT_FOLDER_ARN</code>), that you want to use as a filter. For example, <code>\"Value\": \"arn:aws:quicksight:us-east-1:1:folder/folderId\"</code>.</p>"
         }
       },
-      "documentation":"<p>A filter to use to search an Amazon QuickSight folder.</p>"
+      "documentation":"<p>A filter to use to search an QuickSight folder.</p>"
     },
     "FolderSearchFilterList":{
       "type":"list",
@@ -18534,7 +18694,7 @@
           "documentation":"<p>The sharing scope of the folder.</p>"
         }
       },
-      "documentation":"<p>A summary of information about an existing Amazon QuickSight folder. </p>"
+      "documentation":"<p>A summary of information about an existing QuickSight folder. </p>"
     },
     "FolderSummaryList":{
       "type":"list",
@@ -19262,7 +19422,7 @@
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The Amazon QuickSight namespace that the anonymous user virtually belongs to. If you are not using an Amazon QuickSight custom namespace, set this to <code>default</code>.</p>"
+          "documentation":"<p>The QuickSight namespace that the anonymous user virtually belongs to. If you are not using an Amazon QuickSight custom namespace, set this to <code>default</code>.</p>"
         },
         "SessionTags":{
           "shape":"SessionTagList",
@@ -19270,7 +19430,7 @@
         },
         "AuthorizedResourceArns":{
           "shape":"ArnList",
-          "documentation":"<p>The Amazon Resource Names (ARNs) for the Amazon QuickSight resources that the user is authorized to access during the lifetime of the session.</p> <p>If you choose <code>Dashboard</code> embedding experience, pass the list of dashboard ARNs in the account that you want the user to be able to view.</p> <p>If you want to make changes to the theme of your embedded content, pass a list of theme ARNs that the anonymous users need access to.</p> <p>Currently, you can pass up to 25 theme ARNs in each API call.</p>"
+          "documentation":"<p>The Amazon Resource Names (ARNs) for the QuickSight resources that the user is authorized to access during the lifetime of the session.</p> <p>If you choose <code>Dashboard</code> embedding experience, pass the list of dashboard ARNs in the account that you want the user to be able to view.</p> <p>If you want to make changes to the theme of your embedded content, pass a list of theme ARNs that the anonymous users need access to.</p> <p>Currently, you can pass up to 25 theme ARNs in each API call.</p>"
         },
         "ExperienceConfiguration":{
           "shape":"AnonymousUserEmbeddingExperienceConfiguration",
@@ -19278,7 +19438,7 @@
         },
         "AllowedDomains":{
           "shape":"StringList",
-          "documentation":"<p>The domains that you want to add to the allow list for access to the generated URL that is then embedded. This optional parameter overrides the static domains that are configured in the Manage QuickSight menu in the Amazon QuickSight console. Instead, it allows only the domains that you include in this parameter. You can list up to three domains or subdomains in each API call.</p> <p>To include all subdomains under a specific domain to the allow list, use <code>*</code>. For example, <code>https://*.sapp.amazon.com</code> includes all subdomains under <code>https://sapp.amazon.com</code>.</p>"
+          "documentation":"<p>The domains that you want to add to the allow list for access to the generated URL that is then embedded. This optional parameter overrides the static domains that are configured in the Manage QuickSight menu in the QuickSight console. Instead, it allows only the domains that you include in this parameter. You can list up to three domains or subdomains in each API call.</p> <p>To include all subdomains under a specific domain to the allow list, use <code>*</code>. For example, <code>https://*.sapp.amazon.com</code> includes all subdomains under <code>https://sapp.amazon.com</code>.</p>"
         }
       }
     },
@@ -19334,11 +19494,11 @@
         },
         "ExperienceConfiguration":{
           "shape":"RegisteredUserEmbeddingExperienceConfiguration",
-          "documentation":"<p>The experience that you want to embed. For registered users, you can embed Amazon QuickSight dashboards, Amazon QuickSight visuals, the Amazon QuickSight Q search bar, the Amazon QuickSight Generative Q&amp;A experience, or the entire Amazon QuickSight console.</p>"
+          "documentation":"<p>The experience that you want to embed. For registered users, you can embed QuickSight dashboards, QuickSight visuals, the QuickSight Q search bar, the QuickSight Generative Q&amp;A experience, or the entire QuickSight console.</p>"
         },
         "AllowedDomains":{
           "shape":"StringList",
-          "documentation":"<p>The domains that you want to add to the allow list for access to the generated URL that is then embedded. This optional parameter overrides the static domains that are configured in the Manage QuickSight menu in the Amazon QuickSight console. Instead, it allows only the domains that you include in this parameter. You can list up to three domains or subdomains in each API call.</p> <p>To include all subdomains under a specific domain to the allow list, use <code>*</code>. For example, <code>https://*.sapp.amazon.com</code> includes all subdomains under <code>https://sapp.amazon.com</code>.</p>"
+          "documentation":"<p>The domains that you want to add to the allow list for access to the generated URL that is then embedded. This optional parameter overrides the static domains that are configured in the Manage QuickSight menu in the QuickSight console. Instead, it allows only the domains that you include in this parameter. You can list up to three domains or subdomains in each API call.</p> <p>To include all subdomains under a specific domain to the allow list, use <code>*</code>. For example, <code>https://*.sapp.amazon.com</code> includes all subdomains under <code>https://sapp.amazon.com</code>.</p>"
         }
       }
     },
@@ -19352,7 +19512,7 @@
       "members":{
         "EmbedUrl":{
           "shape":"EmbeddingUrl",
-          "documentation":"<p>The embed URL for the Amazon QuickSight dashboard, visual, Q search bar, Generative Q&amp;A experience, or console.</p>"
+          "documentation":"<p>The embed URL for the QuickSight dashboard, visual, Q search bar, Generative Q&amp;A experience, or console.</p>"
         },
         "Status":{
           "shape":"StatusCode",
@@ -19464,10 +19624,10 @@
       "members":{
         "Enabled":{
           "shape":"Boolean",
-          "documentation":"<p>The generative BI authoring settings of an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>The generative BI authoring settings of an embedded QuickSight console.</p>"
         }
       },
-      "documentation":"<p>The generative BI authoring settings of an embedded Amazon QuickSight console.</p>"
+      "documentation":"<p>The generative BI authoring settings of an embedded QuickSight console.</p>"
     },
     "GeoSpatialColumnGroup":{
       "type":"structure",
@@ -20258,7 +20418,7 @@
         },
         "StatePersistenceEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>Adds persistence of state for the user session in an embedded dashboard. Persistence applies to the sheet and the parameter settings. These are control settings that the dashboard subscriber (Amazon QuickSight reader) chooses while viewing the dashboard. If this is set to <code>TRUE</code>, the settings are the same when the subscriber reopens the same dashboard URL. The state is stored in Amazon QuickSight, not in a browser cookie. If this is set to FALSE, the state of the user session is not persisted. The default is <code>FALSE</code>.</p>",
+          "documentation":"<p>Adds persistence of state for the user session in an embedded dashboard. Persistence applies to the sheet and the parameter settings. These are control settings that the dashboard subscriber (QuickSight reader) chooses while viewing the dashboard. If this is set to <code>TRUE</code>, the settings are the same when the subscriber reopens the same dashboard URL. The state is stored in QuickSight, not in a browser cookie. If this is set to FALSE, the state of the user session is not persisted. The default is <code>FALSE</code>.</p>",
           "location":"querystring",
           "locationName":"state-persistence-enabled"
         },
@@ -20270,13 +20430,13 @@
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The Amazon QuickSight namespace that contains the dashboard IDs in this request. If you're not using a custom namespace, set <code>Namespace = default</code>.</p>",
+          "documentation":"<p>The QuickSight namespace that contains the dashboard IDs in this request. If you're not using a custom namespace, set <code>Namespace = default</code>.</p>",
           "location":"querystring",
           "locationName":"namespace"
         },
         "AdditionalDashboardIds":{
           "shape":"AdditionalDashboardIdList",
-          "documentation":"<p>A list of one or more dashboard IDs that you want anonymous users to have tempporary access to. Currently, the <code>IdentityType</code> parameter must be set to <code>ANONYMOUS</code> because other identity types authenticate as Amazon QuickSight or IAM users. For example, if you set \"<code>--dashboard-id dash_id1 --dashboard-id dash_id2 dash_id3 identity-type ANONYMOUS</code>\", the session can access all three dashboards.</p>",
+          "documentation":"<p>A list of one or more dashboard IDs that you want anonymous users to have tempporary access to. Currently, the <code>IdentityType</code> parameter must be set to <code>ANONYMOUS</code> because other identity types authenticate as QuickSight or IAM users. For example, if you set \"<code>--dashboard-id dash_id1 --dashboard-id dash_id2 dash_id3 identity-type ANONYMOUS</code>\", the session can access all three dashboards.</p>",
           "location":"querystring",
           "locationName":"additional-dashboard-ids"
         }
@@ -20307,13 +20467,13 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account associated with your Amazon QuickSight subscription.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account associated with your QuickSight subscription.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "EntryPoint":{
           "shape":"EntryPoint",
-          "documentation":"<p>The URL you use to access the embedded session. The entry point URL is constrained to the following paths:</p> <ul> <li> <p> <code>/start</code> </p> </li> <li> <p> <code>/start/analyses</code> </p> </li> <li> <p> <code>/start/dashboards</code> </p> </li> <li> <p> <code>/start/favorites</code> </p> </li> <li> <p> <code>/dashboards/<i>DashboardId</i> </code> - where <code>DashboardId</code> is the actual ID key from the Amazon QuickSight console URL of the dashboard</p> </li> <li> <p> <code>/analyses/<i>AnalysisId</i> </code> - where <code>AnalysisId</code> is the actual ID key from the Amazon QuickSight console URL of the analysis</p> </li> </ul>",
+          "documentation":"<p>The URL you use to access the embedded session. The entry point URL is constrained to the following paths:</p> <ul> <li> <p> <code>/start</code> </p> </li> <li> <p> <code>/start/analyses</code> </p> </li> <li> <p> <code>/start/dashboards</code> </p> </li> <li> <p> <code>/start/favorites</code> </p> </li> <li> <p> <code>/dashboards/<i>DashboardId</i> </code> - where <code>DashboardId</code> is the actual ID key from the QuickSight console URL of the dashboard</p> </li> <li> <p> <code>/analyses/<i>AnalysisId</i> </code> - where <code>AnalysisId</code> is the actual ID key from the QuickSight console URL of the analysis</p> </li> </ul>",
           "location":"querystring",
           "locationName":"entry-point"
         },
@@ -20336,7 +20496,7 @@
       "members":{
         "EmbedUrl":{
           "shape":"EmbeddingUrl",
-          "documentation":"<p>A single-use URL that you can put into your server-side web page to embed your Amazon QuickSight session. This URL is valid for 5 minutes. The API operation provides the URL with an <code>auth_code</code> value that enables one (and only one) sign-on to a user session that is valid for 10 hours. </p>"
+          "documentation":"<p>A single-use URL that you can put into your server-side web page to embed your QuickSight session. This URL is valid for 5 minutes. The API operation provides the URL with an <code>auth_code</code> value that enables one (and only one) sign-on to a user session that is valid for 10 hours. </p>"
         },
         "Status":{
           "shape":"StatusCode",
@@ -20487,7 +20647,7 @@
       "members":{
         "ResizeOption":{
           "shape":"ResizeOption",
-          "documentation":"<p>This value determines the layout behavior when the viewport is resized.</p> <ul> <li> <p> <code>FIXED</code>: A fixed width will be used when optimizing the layout. In the Amazon QuickSight console, this option is called <code>Classic</code>.</p> </li> <li> <p> <code>RESPONSIVE</code>: The width of the canvas will be responsive and optimized to the view port. In the Amazon QuickSight console, this option is called <code>Tiled</code>.</p> </li> </ul>"
+          "documentation":"<p>This value determines the layout behavior when the viewport is resized.</p> <ul> <li> <p> <code>FIXED</code>: A fixed width will be used when optimizing the layout. In the QuickSight console, this option is called <code>Classic</code>.</p> </li> <li> <p> <code>RESPONSIVE</code>: The width of the canvas will be responsive and optimized to the view port. In the QuickSight console, this option is called <code>Tiled</code>.</p> </li> </ul>"
         },
         "OptimizedViewPortWidth":{
           "shape":"PixelLength",
@@ -21906,7 +22066,7 @@
       "members":{
         "UniqueKey":{
           "shape":"Boolean",
-          "documentation":"<p>A value that indicates that a row in a table is uniquely identified by the columns in a join key. This is used by Amazon QuickSight to optimize query performance.</p>",
+          "documentation":"<p>A value that indicates that a row in a table is uniquely identified by the columns in a join key. This is used by QuickSight to optimize query performance.</p>",
           "box":true
         }
       },
@@ -23648,7 +23808,7 @@
       "members":{
         "Services":{
           "shape":"AuthorizedTargetsByServices",
-          "documentation":"<p>A list of services and their authorized targets that the Amazon QuickSight IAM Identity Center application can access.</p>"
+          "documentation":"<p>A list of services and their authorized targets that the QuickSight IAM Identity Center application can access.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -23732,7 +23892,7 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that contains the Amazon QuickSight namespaces that you want to list.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account that contains the QuickSight namespaces that you want to list.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
@@ -24201,7 +24361,7 @@
         },
         "Type":{
           "shape":"ThemeType",
-          "documentation":"<p>The type of themes that you want to list. Valid options include the following:</p> <ul> <li> <p> <code>ALL (default)</code>- Display all existing themes.</p> </li> <li> <p> <code>CUSTOM</code> - Display only the themes created by people using Amazon QuickSight.</p> </li> <li> <p> <code>QUICKSIGHT</code> - Display only the starting themes defined by Amazon QuickSight.</p> </li> </ul>",
+          "documentation":"<p>The type of themes that you want to list. Valid options include the following:</p> <ul> <li> <p> <code>ALL (default)</code>- Display all existing themes.</p> </li> <li> <p> <code>CUSTOM</code> - Display only the themes created by people using Amazon QuickSight.</p> </li> <li> <p> <code>QUICKSIGHT</code> - Display only the starting themes defined by QuickSight.</p> </li> </ul>",
           "location":"querystring",
           "locationName":"type"
         }
@@ -25120,7 +25280,8 @@
         "NUMERIC_EQUALITY_FILTER",
         "NUMERIC_RANGE_FILTER",
         "DATE_RANGE_FILTER",
-        "RELATIVE_DATE_FILTER"
+        "RELATIVE_DATE_FILTER",
+        "NULL_FILTER"
       ]
     },
     "Namespace":{
@@ -25368,6 +25529,14 @@
         "NULLS_ONLY"
       ]
     },
+    "NullFilterType":{
+      "type":"string",
+      "enum":[
+        "ALL_VALUES",
+        "NON_NULLS_ONLY",
+        "NULLS_ONLY"
+      ]
+    },
     "NullString":{
       "type":"string",
       "max":128,
@@ -26283,7 +26452,7 @@
           "documentation":"<p>The parameters that have a data type of date-time.</p>"
         }
       },
-      "documentation":"<p>A list of Amazon QuickSight parameters and the list's override values.</p>"
+      "documentation":"<p>A list of QuickSight parameters and the list's override values.</p>"
     },
     "Password":{
       "type":"string",
@@ -27171,7 +27340,7 @@
           "documentation":"<p>The alt text for the visual.</p>"
         }
       },
-      "documentation":"<p>A flexible visualization type that allows engineers to create new custom charts in Amazon QuickSight.</p>"
+      "documentation":"<p>A flexible visualization type that allows engineers to create new custom charts in QuickSight.</p>"
     },
     "PluginVisualAxisName":{
       "type":"string",
@@ -27609,6 +27778,27 @@
         "DISABLED"
       ]
     },
+    "QDataKey":{
+      "type":"structure",
+      "members":{
+        "QDataKeyArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the KMS key that is registered to a QuickSight account for encryption and decryption use as a <code>QDataKey</code>.</p>"
+        },
+        "QDataKeyType":{
+          "shape":"QDataKeyType",
+          "documentation":"<p>The type of <code>QDataKey</code>.</p>"
+        }
+      },
+      "documentation":"<p>A structure that contains information about the <code>QDataKey</code>.</p>"
+    },
+    "QDataKeyType":{
+      "type":"string",
+      "enum":[
+        "AWS_OWNED",
+        "CMK"
+      ]
+    },
     "QSearchStatus":{
       "type":"string",
       "enum":[
@@ -27932,10 +28122,10 @@
       "members":{
         "Enabled":{
           "shape":"Boolean",
-          "documentation":"<p>The recent snapshots configuration for an embedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>The recent snapshots configuration for an embedded QuickSight dashboard.</p>"
         }
       },
-      "documentation":"<p>The recent snapshots configuration for an embedded Amazon QuickSight dashboard.</p>"
+      "documentation":"<p>The recent snapshots configuration for an embedded QuickSight dashboard.</p>"
     },
     "RecoveryWindowInDays":{
       "type":"long",
@@ -27948,22 +28138,22 @@
       "members":{
         "RoleArn":{
           "shape":"RoleArn",
-          "documentation":"<p>Use the <code>RoleArn</code> structure to allow Amazon QuickSight to call <code>redshift:GetClusterCredentials</code> on your cluster. The calling principal must have <code>iam:PassRole</code> access to pass the role to Amazon QuickSight. The role's trust policy must allow the Amazon QuickSight service principal to assume the role.</p>"
+          "documentation":"<p>Use the <code>RoleArn</code> structure to allow QuickSight to call <code>redshift:GetClusterCredentials</code> on your cluster. The calling principal must have <code>iam:PassRole</code> access to pass the role to QuickSight. The role's trust policy must allow the QuickSight service principal to assume the role.</p>"
         },
         "DatabaseUser":{
           "shape":"DatabaseUser",
-          "documentation":"<p>The user whose permissions and group memberships will be used by Amazon QuickSight to access the cluster. If this user already exists in your database, Amazon QuickSight is granted the same permissions that the user has. If the user doesn't exist, set the value of <code>AutoCreateDatabaseUser</code> to <code>True</code> to create a new user with PUBLIC permissions.</p>"
+          "documentation":"<p>The user whose permissions and group memberships will be used by QuickSight to access the cluster. If this user already exists in your database, QuickSight is granted the same permissions that the user has. If the user doesn't exist, set the value of <code>AutoCreateDatabaseUser</code> to <code>True</code> to create a new user with PUBLIC permissions.</p>"
         },
         "DatabaseGroups":{
           "shape":"DatabaseGroupList",
-          "documentation":"<p>A list of groups whose permissions will be granted to Amazon QuickSight to access the cluster. These permissions are combined with the permissions granted to Amazon QuickSight by the <code>DatabaseUser</code>. If you choose to include this parameter, the <code>RoleArn</code> must grant access to <code>redshift:JoinGroup</code>.</p>"
+          "documentation":"<p>A list of groups whose permissions will be granted to QuickSight to access the cluster. These permissions are combined with the permissions granted to QuickSight by the <code>DatabaseUser</code>. If you choose to include this parameter, the <code>RoleArn</code> must grant access to <code>redshift:JoinGroup</code>.</p>"
         },
         "AutoCreateDatabaseUser":{
           "shape":"Boolean",
           "documentation":"<p>Automatically creates a database user. If your database doesn't have a <code>DatabaseUser</code>, set this parameter to <code>True</code>. If there is no <code>DatabaseUser</code>, Amazon QuickSight can't connect to your cluster. The <code>RoleArn</code> that you use for this operation must grant access to <code>redshift:CreateClusterUser</code> to successfully create the user.</p>"
         }
       },
-      "documentation":"<p>A structure that grants Amazon QuickSight access to your cluster and make a call to the <code>redshift:GetClusterCredentials</code> API. For more information on the <code>redshift:GetClusterCredentials</code> API, see <a href=\"https://docs.aws.amazon.com/redshift/latest/APIReference/API_GetClusterCredentials.html\"> <code>GetClusterCredentials</code> </a>.</p>"
+      "documentation":"<p>A structure that grants QuickSight access to your cluster and make a call to the <code>redshift:GetClusterCredentials</code> API. For more information on the <code>redshift:GetClusterCredentials</code> API, see <a href=\"https://docs.aws.amazon.com/redshift/latest/APIReference/API_GetClusterCredentials.html\"> <code>GetClusterCredentials</code> </a>.</p>"
     },
     "RedshiftParameters":{
       "type":"structure",
@@ -27987,11 +28177,11 @@
         },
         "IAMParameters":{
           "shape":"RedshiftIAMParameters",
-          "documentation":"<p>An optional parameter that uses IAM authentication to grant Amazon QuickSight access to your cluster. This parameter can be used instead of <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSourceCredentials.html\">DataSourceCredentials</a>.</p>"
+          "documentation":"<p>An optional parameter that uses IAM authentication to grant QuickSight access to your cluster. This parameter can be used instead of <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DataSourceCredentials.html\">DataSourceCredentials</a>.</p>"
         },
         "IdentityCenterConfiguration":{
           "shape":"IdentityCenterConfiguration",
-          "documentation":"<p>An optional parameter that configures IAM Identity Center authentication to grant Amazon QuickSight access to your cluster.</p> <p>This parameter can only be specified if your Amazon QuickSight account is configured with IAM Identity Center.</p>"
+          "documentation":"<p>An optional parameter that configures IAM Identity Center authentication to grant QuickSight access to your cluster.</p> <p>This parameter can only be specified if your QuickSight account is configured with IAM Identity Center.</p>"
         }
       },
       "documentation":"<p>The parameters for Amazon Redshift. The <code>ClusterId</code> field can be blank if <code>Host</code> and <code>Port</code> are both set. The <code>Host</code> and <code>Port</code> fields can be blank if the <code>ClusterId</code> field is set.</p>"
@@ -28307,7 +28497,7 @@
       "members":{
         "IdentityType":{
           "shape":"IdentityType",
-          "documentation":"<p>The identity type that your Amazon QuickSight account uses to manage the identity of users.</p>"
+          "documentation":"<p>The identity type that your QuickSight account uses to manage the identity of users.</p>"
         },
         "Email":{
           "shape":"String",
@@ -28315,7 +28505,7 @@
         },
         "UserRole":{
           "shape":"UserRole",
-          "documentation":"<p>The Amazon QuickSight role for the user. The user role can be one of the following:</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, datasets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> <li> <p> <code>READER_PRO</code>: Reader Pro adds Generative BI capabilities to the Reader role. Reader Pros have access to Amazon Q in Amazon QuickSight, can build stories with Amazon Q, and can generate executive summaries from dashboards.</p> </li> <li> <p> <code>AUTHOR_PRO</code>: Author Pro adds Generative BI capabilities to the Author role. Author Pros can author dashboards with natural language with Amazon Q, build stories with Amazon Q, create Topics for Q&amp;A, and generate executive summaries from dashboards.</p> </li> <li> <p> <code>ADMIN_PRO</code>: Admin Pros are Author Pros who can also manage Amazon QuickSight administrative settings. Admin Pro users are billed at Author Pro pricing.</p> </li> <li> <p> <code>RESTRICTED_READER</code>: This role isn't currently available for use.</p> </li> <li> <p> <code>RESTRICTED_AUTHOR</code>: This role isn't currently available for use.</p> </li> </ul>"
+          "documentation":"<p>The Amazon QuickSight role for the user. The user role can be one of the following:</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, datasets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> <li> <p> <code>READER_PRO</code>: Reader Pro adds Generative BI capabilities to the Reader role. Reader Pros have access to Amazon Q in QuickSight, can build stories with Amazon Q, and can generate executive summaries from dashboards.</p> </li> <li> <p> <code>AUTHOR_PRO</code>: Author Pro adds Generative BI capabilities to the Author role. Author Pros can author dashboards with natural language with Amazon Q, build stories with Amazon Q, create Topics for Q&amp;A, and generate executive summaries from dashboards.</p> </li> <li> <p> <code>ADMIN_PRO</code>: Admin Pros are Author Pros who can also manage Amazon QuickSight administrative settings. Admin Pro users are billed at Author Pro pricing.</p> </li> <li> <p> <code>RESTRICTED_READER</code>: This role isn't currently available for use.</p> </li> <li> <p> <code>RESTRICTED_AUTHOR</code>: This role isn't currently available for use.</p> </li> </ul>"
         },
         "IamArn":{
           "shape":"String",
@@ -28343,7 +28533,7 @@
         },
         "CustomPermissionsName":{
           "shape":"RoleName",
-          "documentation":"<p>(Enterprise edition only) The name of the custom permissions profile that you want to assign to this user. Customized permissions allows you to control a user's access by restricting access the following operations:</p> <ul> <li> <p>Create and update data sources</p> </li> <li> <p>Create and update datasets</p> </li> <li> <p>Create and update email reports</p> </li> <li> <p>Subscribe to email reports</p> </li> </ul> <p>To add custom permissions to an existing user, use <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateUser.html\">UpdateUser</a> </code> instead.</p> <p>A set of custom permissions includes any combination of these restrictions. Currently, you need to create the profile names for custom permission sets by using the Amazon QuickSight console. Then, you use the <code>RegisterUser</code> API operation to assign the named set of permissions to a Amazon QuickSight user. </p> <p>Amazon QuickSight custom permissions are applied through IAM policies. Therefore, they override the permissions typically granted by assigning Amazon QuickSight users to one of the default security cohorts in Amazon QuickSight (admin, author, reader, admin pro, author pro, reader pro).</p> <p>This feature is available only to Amazon QuickSight Enterprise edition subscriptions.</p>"
+          "documentation":"<p>(Enterprise edition only) The name of the custom permissions profile that you want to assign to this user. Customized permissions allows you to control a user's access by restricting access the following operations:</p> <ul> <li> <p>Create and update data sources</p> </li> <li> <p>Create and update datasets</p> </li> <li> <p>Create and update email reports</p> </li> <li> <p>Subscribe to email reports</p> </li> </ul> <p>To add custom permissions to an existing user, use <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateUser.html\">UpdateUser</a> </code> instead.</p> <p>A set of custom permissions includes any combination of these restrictions. Currently, you need to create the profile names for custom permission sets by using the QuickSight console. Then, you use the <code>RegisterUser</code> API operation to assign the named set of permissions to a QuickSight user. </p> <p>QuickSight custom permissions are applied through IAM policies. Therefore, they override the permissions typically granted by assigning QuickSight users to one of the default security cohorts in QuickSight (admin, author, reader, admin pro, author pro, reader pro).</p> <p>This feature is available only to QuickSight Enterprise edition subscriptions.</p>"
         },
         "ExternalLoginFederationProviderType":{
           "shape":"String",
@@ -28351,7 +28541,7 @@
         },
         "CustomFederationProviderUrl":{
           "shape":"String",
-          "documentation":"<p>The URL of the custom OpenID Connect (OIDC) provider that provides identity to let a user federate into Amazon QuickSight with an associated Identity and Access Management(IAM) role. This parameter should only be used when <code>ExternalLoginFederationProviderType</code> parameter is set to <code>CUSTOM_OIDC</code>.</p>"
+          "documentation":"<p>The URL of the custom OpenID Connect (OIDC) provider that provides identity to let a user federate into QuickSight with an associated Identity and Access Management(IAM) role. This parameter should only be used when <code>ExternalLoginFederationProviderType</code> parameter is set to <code>CUSTOM_OIDC</code>.</p>"
         },
         "ExternalLoginId":{
           "shape":"String",
@@ -28390,21 +28580,21 @@
       "members":{
         "KeyArn":{
           "shape":"String",
-          "documentation":"<p>The ARN of the KMS key that is registered to a Amazon QuickSight account for encryption and decryption use.</p>"
+          "documentation":"<p>The ARN of the KMS key that is registered to a QuickSight account for encryption and decryption use.</p>"
         },
         "DefaultKey":{
           "shape":"Boolean",
           "documentation":"<p>Indicates whether a <code>RegisteredCustomerManagedKey</code> is set as the default key for encryption and decryption use.</p>"
         }
       },
-      "documentation":"<p>A customer managed key structure that contains the information listed below: </p> <ul> <li> <p> <code>KeyArn</code> - The ARN of a KMS key that is registered to a Amazon QuickSight account for encryption and decryption use.</p> </li> <li> <p> <code>DefaultKey</code> - Indicates whether the current key is set as the default key for encryption and decryption use.</p> </li> </ul>"
+      "documentation":"<p>A customer managed key structure that contains the information listed below: </p> <ul> <li> <p> <code>KeyArn</code> - The ARN of a KMS key that is registered to a QuickSight account for encryption and decryption use.</p> </li> <li> <p> <code>DefaultKey</code> - Indicates whether the current key is set as the default key for encryption and decryption use.</p> </li> </ul>"
     },
     "RegisteredUserConsoleFeatureConfigurations":{
       "type":"structure",
       "members":{
         "StatePersistence":{
           "shape":"StatePersistenceConfigurations",
-          "documentation":"<p>The state persistence configurations of an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>The state persistence configurations of an embedded QuickSight console.</p>"
         },
         "SharedView":{
           "shape":"SharedViewConfigurations",
@@ -28412,22 +28602,22 @@
         },
         "AmazonQInQuickSight":{
           "shape":"AmazonQInQuickSightConsoleConfigurations",
-          "documentation":"<p>The Amazon Q configurations of an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>The Amazon Q configurations of an embedded QuickSight console.</p>"
         },
         "Schedules":{
           "shape":"SchedulesConfigurations",
-          "documentation":"<p>The schedules configuration for an embedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>The schedules configuration for an embedded QuickSight dashboard.</p>"
         },
         "RecentSnapshots":{
           "shape":"RecentSnapshotsConfigurations",
-          "documentation":"<p>The recent snapshots configuration for an embedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>The recent snapshots configuration for an embedded QuickSight dashboard.</p>"
         },
         "ThresholdAlerts":{
           "shape":"ThresholdAlertsConfigurations",
-          "documentation":"<p>The threshold alerts configuration for an embedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>The threshold alerts configuration for an embedded QuickSight dashboard.</p>"
         }
       },
-      "documentation":"<p>The feature configurations of an embedded Amazon QuickSight console.</p>"
+      "documentation":"<p>The feature configurations of an embedded QuickSight console.</p>"
     },
     "RegisteredUserDashboardEmbeddingConfiguration":{
       "type":"structure",
@@ -28435,11 +28625,11 @@
       "members":{
         "InitialDashboardId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The dashboard ID for the dashboard that you want the user to see first. This ID is included in the output URL. When the URL in response is accessed, Amazon QuickSight renders this dashboard if the user has permissions to view it.</p> <p>If the user does not have permission to view this dashboard, they see a permissions error message.</p>"
+          "documentation":"<p>The dashboard ID for the dashboard that you want the user to see first. This ID is included in the output URL. When the URL in response is accessed, QuickSight renders this dashboard if the user has permissions to view it.</p> <p>If the user does not have permission to view this dashboard, they see a permissions error message.</p>"
         },
         "FeatureConfigurations":{
           "shape":"RegisteredUserDashboardFeatureConfigurations",
-          "documentation":"<p>The feature configurations of an embbedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>The feature configurations of an embbedded QuickSight dashboard.</p>"
         }
       },
       "documentation":"<p>Information about the dashboard you want to embed.</p>"
@@ -28457,23 +28647,23 @@
         },
         "Bookmarks":{
           "shape":"BookmarksConfigurations",
-          "documentation":"<p>The bookmarks configuration for an embedded dashboard in Amazon QuickSight.</p>"
+          "documentation":"<p>The bookmarks configuration for an embedded dashboard in QuickSight.</p>"
         },
         "AmazonQInQuickSight":{
           "shape":"AmazonQInQuickSightDashboardConfigurations",
-          "documentation":"<p>The Amazon Q configurations of an embedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>The Amazon Q configurations of an embedded QuickSight dashboard.</p>"
         },
         "Schedules":{
           "shape":"SchedulesConfigurations",
-          "documentation":"<p>The schedules configuration for an embedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>The schedules configuration for an embedded QuickSight dashboard.</p>"
         },
         "RecentSnapshots":{
           "shape":"RecentSnapshotsConfigurations",
-          "documentation":"<p>The recent snapshots configuration for an Amazon QuickSight embedded dashboard</p>"
+          "documentation":"<p>The recent snapshots configuration for an QuickSight embedded dashboard</p>"
         },
         "ThresholdAlerts":{
           "shape":"ThresholdAlertsConfigurations",
-          "documentation":"<p>The threshold alerts configuration for an Amazon QuickSight embedded dashboard.</p>"
+          "documentation":"<p>The threshold alerts configuration for an QuickSight embedded dashboard.</p>"
         }
       },
       "documentation":"<p>The feature configuration for an embedded dashboard.</p>"
@@ -28484,7 +28674,7 @@
       "members":{
         "InitialDashboardVisualId":{
           "shape":"DashboardVisualId",
-          "documentation":"<p>The visual ID for the visual that you want the user to embed. This ID is included in the output URL. When the URL in response is accessed, Amazon QuickSight renders this visual.</p> <p>The Amazon Resource Name (ARN) of the dashboard that the visual belongs to must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request will fail with <code>InvalidParameterValueException</code>.</p>"
+          "documentation":"<p>The visual ID for the visual that you want the user to embed. This ID is included in the output URL. When the URL in response is accessed, QuickSight renders this visual.</p> <p>The Amazon Resource Name (ARN) of the dashboard that the visual belongs to must be included in the <code>AuthorizedResourceArns</code> parameter. Otherwise, the request will fail with <code>InvalidParameterValueException</code>.</p>"
         }
       },
       "documentation":"<p>The experience that you are embedding. You can use this object to generate a url that embeds a visual into your application.</p>"
@@ -28498,29 +28688,29 @@
         },
         "QuickSightConsole":{
           "shape":"RegisteredUserQuickSightConsoleEmbeddingConfiguration",
-          "documentation":"<p>The configuration details for providing each Amazon QuickSight console embedding experience. This can be used along with custom permissions to restrict access to certain features. For more information, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/customizing-permissions-to-the-quicksight-console.html\">Customizing Access to the Amazon QuickSight Console</a> in the <i>Amazon QuickSight User Guide</i>.</p> <p>Use <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_GenerateEmbedUrlForRegisteredUser.html\">GenerateEmbedUrlForRegisteredUser</a> </code> where you want to provide an authoring portal that allows users to create data sources, datasets, analyses, and dashboards. The users who accesses an embedded Amazon QuickSight console needs to belong to the author or admin security cohort. If you want to restrict permissions to some of these features, add a custom permissions profile to the user with the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateUser.html\">UpdateUser</a> </code> API operation. Use the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_RegisterUser.html\">RegisterUser</a> </code> API operation to add a new user with a custom permission profile attached. For more information, see the following sections in the <i>Amazon QuickSight User Guide</i>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedded-analytics-full-console-for-authenticated-users.html\">Embedding the Full Functionality of the Amazon QuickSight Console for Authenticated Users</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/customizing-permissions-to-the-quicksight-console.html\">Customizing Access to the Amazon QuickSight Console</a> </p> </li> </ul> <p>For more information about the high-level steps for embedding and for an interactive demo of the ways you can customize embedding, visit the <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/quicksight-dev-portal.html\">Amazon QuickSight Developer Portal</a>.</p>"
+          "documentation":"<p>The configuration details for providing each QuickSight console embedding experience. This can be used along with custom permissions to restrict access to certain features. For more information, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/customizing-permissions-to-the-quicksight-console.html\">Customizing Access to the QuickSight Console</a> in the <i>Amazon QuickSight User Guide</i>.</p> <p>Use <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_GenerateEmbedUrlForRegisteredUser.html\">GenerateEmbedUrlForRegisteredUser</a> </code> where you want to provide an authoring portal that allows users to create data sources, datasets, analyses, and dashboards. The users who accesses an embedded QuickSight console needs to belong to the author or admin security cohort. If you want to restrict permissions to some of these features, add a custom permissions profile to the user with the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_UpdateUser.html\">UpdateUser</a> </code> API operation. Use the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_RegisterUser.html\">RegisterUser</a> </code> API operation to add a new user with a custom permission profile attached. For more information, see the following sections in the <i>Amazon QuickSight User Guide</i>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedded-analytics-full-console-for-authenticated-users.html\">Embedding the Full Functionality of the QuickSight Console for Authenticated Users</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/customizing-permissions-to-the-quicksight-console.html\">Customizing Access to the Amazon QuickSight Console</a> </p> </li> </ul> <p>For more information about the high-level steps for embedding and for an interactive demo of the ways you can customize embedding, visit the <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/quicksight-dev-portal.html\">Amazon QuickSight Developer Portal</a>.</p>"
         },
         "QSearchBar":{
           "shape":"RegisteredUserQSearchBarEmbeddingConfiguration",
-          "documentation":"<p>The configuration details for embedding the Q search bar.</p> <p>For more information about embedding the Q search bar, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedding-overview.html\">Embedding Overview</a> in the <i>Amazon QuickSight User Guide</i>.</p>"
+          "documentation":"<p>The configuration details for embedding the Q search bar.</p> <p>For more information about embedding the Q search bar, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedding-overview.html\">Embedding Overview</a> in the <i>QuickSight User Guide</i>.</p>"
         },
         "DashboardVisual":{
           "shape":"RegisteredUserDashboardVisualEmbeddingConfiguration",
-          "documentation":"<p>The type of embedding experience. In this case, Amazon QuickSight visuals.</p>"
+          "documentation":"<p>The type of embedding experience. In this case, QuickSight visuals.</p>"
         },
         "GenerativeQnA":{
           "shape":"RegisteredUserGenerativeQnAEmbeddingConfiguration",
-          "documentation":"<p>The configuration details for embedding the Generative Q&amp;A experience.</p> <p>For more information about embedding the Generative Q&amp;A experience, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedding-overview.html\">Embedding Overview</a> in the <i>Amazon QuickSight User Guide</i>.</p>"
+          "documentation":"<p>The configuration details for embedding the Generative Q&amp;A experience.</p> <p>For more information about embedding the Generative Q&amp;A experience, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedding-overview.html\">Embedding Overview</a> in the <i>QuickSight User Guide</i>.</p>"
         }
       },
-      "documentation":"<p>The type of experience you want to embed. For registered users, you can embed Amazon QuickSight dashboards or the Amazon QuickSight console.</p> <note> <p>Exactly one of the experience configurations is required. You can choose <code>Dashboard</code> or <code>QuickSightConsole</code>. You cannot choose more than one experience configuration.</p> </note>"
+      "documentation":"<p>The type of experience you want to embed. For registered users, you can embed QuickSight dashboards or the QuickSight console.</p> <note> <p>Exactly one of the experience configurations is required. You can choose <code>Dashboard</code> or <code>QuickSightConsole</code>. You cannot choose more than one experience configuration.</p> </note>"
     },
     "RegisteredUserGenerativeQnAEmbeddingConfiguration":{
       "type":"structure",
       "members":{
         "InitialTopicId":{
           "shape":"RestrictiveResourceId",
-          "documentation":"<p>The ID of the new Q reader experience topic that you want to make the starting topic in the Generative Q&amp;A experience. You can find a topic ID by navigating to the Topics pane in the Amazon QuickSight application and opening a topic. The ID is in the URL for the topic that you open.</p> <p>If you don't specify an initial topic or you specify a legacy topic, a list of all shared new reader experience topics is shown in the Generative Q&amp;A experience for your readers. When you select an initial new reader experience topic, you can specify whether or not readers are allowed to select other new reader experience topics from the available ones in the list.</p>"
+          "documentation":"<p>The ID of the new Q reader experience topic that you want to make the starting topic in the Generative Q&amp;A experience. You can find a topic ID by navigating to the Topics pane in the QuickSight application and opening a topic. The ID is in the URL for the topic that you open.</p> <p>If you don't specify an initial topic or you specify a legacy topic, a list of all shared new reader experience topics is shown in the Generative Q&amp;A experience for your readers. When you select an initial new reader experience topic, you can specify whether or not readers are allowed to select other new reader experience topics from the available ones in the list.</p>"
         }
       },
       "documentation":"<p>An object that provides information about the configuration of a Generative Q&amp;A experience.</p>"
@@ -28530,7 +28720,7 @@
       "members":{
         "InitialTopicId":{
           "shape":"RestrictiveResourceId",
-          "documentation":"<p>The ID of the legacy Q topic that you want to use as the starting topic in the Q search bar. To locate the topic ID of the topic that you want to use, open the <a href=\"https://quicksight.aws.amazon.com/\">Amazon QuickSight console</a>, navigate to the <b>Topics</b> pane, and choose thre topic that you want to use. The <code>TopicID</code> is located in the URL of the topic that opens. When you select an initial topic, you can specify whether or not readers are allowed to select other topics from the list of available topics.</p> <p>If you don't specify an initial topic or if you specify a new reader experience topic, a list of all shared legacy topics is shown in the Q bar. </p>"
+          "documentation":"<p>The ID of the legacy Q topic that you want to use as the starting topic in the Q search bar. To locate the topic ID of the topic that you want to use, open the <a href=\"https://quicksight.aws.amazon.com/\">QuickSight console</a>, navigate to the <b>Topics</b> pane, and choose thre topic that you want to use. The <code>TopicID</code> is located in the URL of the topic that opens. When you select an initial topic, you can specify whether or not readers are allowed to select other topics from the list of available topics.</p> <p>If you don't specify an initial topic or if you specify a new reader experience topic, a list of all shared legacy topics is shown in the Q bar. </p>"
         }
       },
       "documentation":"<p>Information about the Q search bar embedding experience.</p>"
@@ -28540,14 +28730,14 @@
       "members":{
         "InitialPath":{
           "shape":"EntryPath",
-          "documentation":"<p>The initial URL path for the Amazon QuickSight console. <code>InitialPath</code> is required.</p> <p>The entry point URL is constrained to the following paths:</p> <ul> <li> <p> <code>/start</code> </p> </li> <li> <p> <code>/start/analyses</code> </p> </li> <li> <p> <code>/start/dashboards</code> </p> </li> <li> <p> <code>/start/favorites</code> </p> </li> <li> <p> <code>/dashboards/DashboardId</code>. <i>DashboardId</i> is the actual ID key from the Amazon QuickSight console URL of the dashboard.</p> </li> <li> <p> <code>/analyses/AnalysisId</code>. <i>AnalysisId</i> is the actual ID key from the Amazon QuickSight console URL of the analysis.</p> </li> </ul>"
+          "documentation":"<p>The initial URL path for the QuickSight console. <code>InitialPath</code> is required.</p> <p>The entry point URL is constrained to the following paths:</p> <ul> <li> <p> <code>/start</code> </p> </li> <li> <p> <code>/start/analyses</code> </p> </li> <li> <p> <code>/start/dashboards</code> </p> </li> <li> <p> <code>/start/favorites</code> </p> </li> <li> <p> <code>/dashboards/DashboardId</code>. <i>DashboardId</i> is the actual ID key from the QuickSight console URL of the dashboard.</p> </li> <li> <p> <code>/analyses/AnalysisId</code>. <i>AnalysisId</i> is the actual ID key from the QuickSight console URL of the analysis.</p> </li> </ul>"
         },
         "FeatureConfigurations":{
           "shape":"RegisteredUserConsoleFeatureConfigurations",
-          "documentation":"<p>The embedding configuration of an embedded Amazon QuickSight console.</p>"
+          "documentation":"<p>The embedding configuration of an embedded QuickSight console.</p>"
         }
       },
-      "documentation":"<p>Information about the Amazon QuickSight console that you want to embed.</p>"
+      "documentation":"<p>Information about the QuickSight console that you want to embed.</p>"
     },
     "RelationalTable":{
       "type":"structure",
@@ -29108,7 +29298,7 @@
           "documentation":"<p>The region that the Amazon S3 bucket is located in. The bucket must be located in the same region that the <code>StartDashboardSnapshotJob</code> API call is made.</p>"
         }
       },
-      "documentation":"<p>An optional structure that contains the Amazon S3 bucket configuration that the generated snapshots are stored in. If you don't provide this information, generated snapshots are stored in the default Amazon QuickSight bucket.</p>"
+      "documentation":"<p>An optional structure that contains the Amazon S3 bucket configuration that the generated snapshots are stored in. If you don't provide this information, generated snapshots are stored in the default QuickSight bucket.</p>"
     },
     "S3Key":{
       "type":"string",
@@ -29121,7 +29311,7 @@
       "members":{
         "ManifestFileLocation":{
           "shape":"ManifestFileLocation",
-          "documentation":"<p>Location of the Amazon S3 manifest file. This is NULL if the manifest file was uploaded into Amazon QuickSight.</p>"
+          "documentation":"<p>Location of the Amazon S3 manifest file. This is NULL if the manifest file was uploaded into QuickSight.</p>"
         },
         "RoleArn":{
           "shape":"RoleArn",
@@ -29447,10 +29637,10 @@
       "members":{
         "Enabled":{
           "shape":"Boolean",
-          "documentation":"<p>The schedules configuration for an embedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>The schedules configuration for an embedded QuickSight dashboard.</p>"
         }
       },
-      "documentation":"<p>The schedules configuration for an embedded Amazon QuickSight dashboard.</p>"
+      "documentation":"<p>The schedules configuration for an embedded QuickSight dashboard.</p>"
     },
     "ScrollBarOptions":{
       "type":"structure",
@@ -30256,7 +30446,7 @@
         },
         "Name":{
           "shape":"SheetName",
-          "documentation":"<p>The name of a sheet. This name is displayed on the sheet's tab in the Amazon QuickSight console.</p>"
+          "documentation":"<p>The name of a sheet. This name is displayed on the sheet's tab in the QuickSight console.</p>"
         },
         "Images":{
           "shape":"SheetImageList",
@@ -30372,7 +30562,7 @@
         },
         "Name":{
           "shape":"SheetName",
-          "documentation":"<p>The name of the sheet. This name is displayed on the sheet's tab in the Amazon QuickSight console.</p>"
+          "documentation":"<p>The name of the sheet. This name is displayed on the sheet's tab in the QuickSight console.</p>"
         },
         "ParameterControls":{
           "shape":"ParameterControlList",
@@ -30694,19 +30884,19 @@
       "members":{
         "IAMUser":{
           "shape":"Boolean",
-          "documentation":"<p>A Boolean that is <code>TRUE</code> if the Amazon QuickSight uses IAM as an authentication method.</p>"
+          "documentation":"<p>A Boolean that is <code>TRUE</code> if the QuickSight uses IAM as an authentication method.</p>"
         },
         "userLoginName":{
           "shape":"String",
-          "documentation":"<p>The user login name for your Amazon QuickSight account.</p>"
+          "documentation":"<p>The user login name for your QuickSight account.</p>"
         },
         "accountName":{
           "shape":"String",
-          "documentation":"<p>The name of your Amazon QuickSight account.</p>"
+          "documentation":"<p>The name of your QuickSight account.</p>"
         },
         "directoryType":{
           "shape":"String",
-          "documentation":"<p>The type of Active Directory that is being used to authenticate the Amazon QuickSight account. Valid values are <code>SIMPLE_AD</code>, <code>AD_CONNECTOR</code>, and <code>MICROSOFT_AD</code>.</p>"
+          "documentation":"<p>The type of Active Directory that is being used to authenticate the QuickSight account. Valid values are <code>SIMPLE_AD</code>, <code>AD_CONNECTOR</code>, and <code>MICROSOFT_AD</code>.</p>"
         }
       },
       "documentation":"<p>A <code>SignupResponse</code> object that contains a summary of a newly created account.</p>"
@@ -30867,7 +31057,7 @@
       "members":{
         "RowLevelPermissionTags":{
           "shape":"SessionTagList",
-          "documentation":"<p>The tags to be used for row-level security (RLS). Make sure that the relevant datasets have RLS tags configured before you start a snapshot export job. You can configure the RLS tags of a dataset with a <code>DataSet$RowLevelPermissionTagConfiguration</code> API call.</p> <p>These are not the tags that are used for Amazon Web Services resource tagging. For more information on row level security in Amazon QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/quicksight-dev-rls-tags.html\">Using Row-Level Security (RLS) with Tags</a>in the <i>Amazon QuickSight User Guide</i>.</p>"
+          "documentation":"<p>The tags to be used for row-level security (RLS). Make sure that the relevant datasets have RLS tags configured before you start a snapshot export job. You can configure the RLS tags of a dataset with a <code>DataSet$RowLevelPermissionTagConfiguration</code> API call.</p> <p>These are not the tags that are used for Amazon Web Services resource tagging. For more information on row level security in QuickSight, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/quicksight-dev-rls-tags.html\">Using Row-Level Security (RLS) with Tags</a>in the <i>Amazon QuickSight User Guide</i>.</p>"
         }
       },
       "documentation":"<p>A structure that contains information on the anonymous user configuration.</p>"
@@ -31167,7 +31357,7 @@
         },
         "OAuthParameters":{
           "shape":"OAuthParameters",
-          "documentation":"<p>An object that contains information needed to create a data source connection between an Amazon QuickSight account and Snowflake.</p>"
+          "documentation":"<p>An object that contains information needed to create a data source connection between an QuickSight account and Snowflake.</p>"
         }
       },
       "documentation":"<p>The parameters for Snowflake.</p>"
@@ -31283,7 +31473,7 @@
           "documentation":"<p>A Boolean option to control whether SSL should be disabled.</p>"
         }
       },
-      "documentation":"<p>Secure Socket Layer (SSL) properties that apply when Amazon QuickSight connects to your underlying data source.</p>"
+      "documentation":"<p>Secure Socket Layer (SSL) properties that apply when QuickSight connects to your underlying data source.</p>"
     },
     "StarburstParameters":{
       "type":"structure",
@@ -31319,7 +31509,7 @@
         },
         "OAuthParameters":{
           "shape":"OAuthParameters",
-          "documentation":"<p>An object that contains information needed to create a data source connection between an Amazon QuickSight account and Starburst.</p>"
+          "documentation":"<p>An object that contains information needed to create a data source connection between an QuickSight account and Starburst.</p>"
         }
       },
       "documentation":"<p>The parameters that are required to connect to a Starburst data source.</p>"
@@ -31438,7 +31628,7 @@
         },
         "FailureAction":{
           "shape":"AssetBundleImportFailureAction",
-          "documentation":"<p>The failure action for the import job.</p> <p>If you choose <code>ROLLBACK</code>, failed import jobs will attempt to undo any asset changes caused by the failed job.</p> <p>If you choose <code>DO_NOTHING</code>, failed import jobs will not attempt to roll back any asset changes caused by the failed job, possibly keeping the Amazon QuickSight account in an inconsistent state.</p>"
+          "documentation":"<p>The failure action for the import job.</p> <p>If you choose <code>ROLLBACK</code>, failed import jobs will attempt to undo any asset changes caused by the failed job.</p> <p>If you choose <code>DO_NOTHING</code>, failed import jobs will not attempt to roll back any asset changes caused by the failed job, possibly keeping the QuickSight account in an inconsistent state.</p>"
         },
         "OverridePermissions":{
           "shape":"AssetBundleImportJobOverridePermissions",
@@ -31504,7 +31694,7 @@
         },
         "UserConfiguration":{
           "shape":"SnapshotUserConfiguration",
-          "documentation":"<p> A structure that contains information about the anonymous users that the generated snapshot is for. This API will not return information about registered Amazon QuickSight.</p>"
+          "documentation":"<p> A structure that contains information about the anonymous users that the generated snapshot is for. This API will not return information about registered QuickSight.</p>"
         },
         "SnapshotConfiguration":{
           "shape":"SnapshotConfiguration",
@@ -31556,7 +31746,7 @@
         },
         "ScheduleId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the schedule that you want to start a snapshot job schedule for. The schedule ID can be found in the Amazon QuickSight console in the <b>Schedules</b> pane of the dashboard that the schedule is configured for.</p>",
+          "documentation":"<p>The ID of the schedule that you want to start a snapshot job schedule for. The schedule ID can be found in the QuickSight console in the <b>Schedules</b> pane of the dashboard that the schedule is configured for.</p>",
           "location":"uri",
           "locationName":"ScheduleId"
         }
@@ -31582,7 +31772,7 @@
       "members":{
         "Enabled":{
           "shape":"Boolean",
-          "documentation":"<p>Determines if a Amazon QuickSight dashboard's state persistence settings are turned on or off.</p>"
+          "documentation":"<p>Determines if a QuickSight dashboard's state persistence settings are turned on or off.</p>"
         }
       },
       "documentation":"<p>The state perssitence configuration of an embedded dashboard.</p>"
@@ -31906,7 +32096,7 @@
           "documentation":"<p>The HTTP status of a <code>SuccessfulKeyRegistrationEntry</code> entry.</p>"
         }
       },
-      "documentation":"<p>A success entry that occurs when a <code>KeyRegistration</code> job is successfully applied to the Amazon QuickSight account.</p>"
+      "documentation":"<p>A success entry that occurs when a <code>KeyRegistration</code> job is successfully applied to the QuickSight account.</p>"
     },
     "Suffix":{
       "type":"string",
@@ -32600,7 +32790,7 @@
           "documentation":"<p>Time when this was created.</p>"
         }
       },
-      "documentation":"<p>A template object. A <i>template</i> is an entity in Amazon QuickSight that encapsulates the metadata required to create an analysis and that you can use to create a dashboard. A template adds a layer of abstraction by using placeholders to replace the dataset associated with an analysis. You can use templates to create dashboards by replacing dataset placeholders with datasets that follow the same schema that was used to create the source analysis and template.</p> <p>You can share templates across Amazon Web Services accounts by allowing users in other Amazon Web Services accounts to create a template or a dashboard from an existing template.</p>"
+      "documentation":"<p>A template object. A <i>template</i> is an entity in QuickSight that encapsulates the metadata required to create an analysis and that you can use to create a dashboard. A template adds a layer of abstraction by using placeholders to replace the dataset associated with an analysis. You can use templates to create dashboards by replacing dataset placeholders with datasets that follow the same schema that was used to create the source analysis and template.</p> <p>You can share templates across Amazon Web Services accounts by allowing users in other Amazon Web Services accounts to create a template or a dashboard from an existing template.</p>"
     },
     "TemplateAlias":{
       "type":"structure",
@@ -33141,7 +33331,7 @@
         },
         "BaseThemeId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The Amazon QuickSight-defined ID of the theme that a custom theme inherits from. All themes initially inherit from a default Amazon QuickSight theme.</p>"
+          "documentation":"<p>The Amazon QuickSight-defined ID of the theme that a custom theme inherits from. All themes initially inherit from a default QuickSight theme.</p>"
         },
         "CreatedTime":{
           "shape":"Timestamp",
@@ -33217,10 +33407,10 @@
       "members":{
         "Enabled":{
           "shape":"Boolean",
-          "documentation":"<p>The threshold alerts configuration for an embedded Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>The threshold alerts configuration for an embedded QuickSight dashboard.</p>"
         }
       },
-      "documentation":"<p>The threshold alerts configuration for an embedded Amazon QuickSight dashboard.</p>"
+      "documentation":"<p>The threshold alerts configuration for an embedded QuickSight dashboard.</p>"
     },
     "ThrottlingException":{
       "type":"structure",
@@ -33972,6 +34162,10 @@
         "RelativeDateFilter":{
           "shape":"TopicRelativeDateFilter",
           "documentation":"<p>The relative date filter.</p>"
+        },
+        "NullFilter":{
+          "shape":"TopicNullFilter",
+          "documentation":"<p>The null filter.</p>"
         }
       },
       "documentation":"<p>A structure that represents a filter used to select items for a topic.</p>"
@@ -34298,6 +34492,21 @@
       },
       "documentation":"<p>A structure that represents a named entity.</p>"
     },
+    "TopicNullFilter":{
+      "type":"structure",
+      "members":{
+        "NullFilterType":{
+          "shape":"NullFilterType",
+          "documentation":"<p>The type of the null filter. Valid values for this type are <code>NULLS_ONLY</code>, <code>NON_NULLS_ONLY</code>, and <code>ALL_VALUES</code>.</p>"
+        },
+        "Constant":{"shape":"TopicSingularFilterConstant"},
+        "Inverse":{
+          "shape":"Boolean",
+          "documentation":"<p>A Boolean value that indicates if the filter is inverse.</p>"
+        }
+      },
+      "documentation":"<p>The structure that represents a null filter.</p>"
+    },
     "TopicNumericEqualityFilter":{
       "type":"structure",
       "members":{
@@ -35208,7 +35417,7 @@
           "documentation":"<p>The Amazon Web Services request ID for this request.</p>"
         }
       },
-      "documentation":"<p>This error indicates that you are calling an embedding operation in Amazon QuickSight without the required pricing plan on your Amazon Web Services account. Before you can use embedding for anonymous users, a QuickSight administrator needs to add capacity pricing to Amazon QuickSight. You can do this on the <b>Manage Amazon QuickSight</b> page. </p> <p>After capacity pricing is added, you can use the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_GetDashboardEmbedUrl.html\">GetDashboardEmbedUrl</a> </code> API operation with the <code>--identity-type ANONYMOUS</code> option.</p>",
+      "documentation":"<p>This error indicates that you are calling an embedding operation in Amazon QuickSight without the required pricing plan on your Amazon Web Services account. Before you can use embedding for anonymous users, a QuickSight administrator needs to add capacity pricing to QuickSight. You can do this on the <b>Manage QuickSight</b> page. </p> <p>After capacity pricing is added, you can use the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_GetDashboardEmbedUrl.html\">GetDashboardEmbedUrl</a> </code> API operation with the <code>--identity-type ANONYMOUS</code> option.</p>",
       "error":{"httpStatusCode":403},
       "exception":true
     },
@@ -35221,7 +35430,7 @@
           "documentation":"<p>The Amazon Web Services request ID for this request.</p>"
         }
       },
-      "documentation":"<p>This error indicates that you are calling an operation on an Amazon QuickSight subscription where the edition doesn't include support for that operation. Amazon Amazon QuickSight currently has Standard Edition and Enterprise Edition. Not every operation and capability is available in every edition.</p>",
+      "documentation":"<p>This error indicates that you are calling an operation on an Amazon QuickSight subscription where the edition doesn't include support for that operation. Amazon QuickSight currently has Standard Edition and Enterprise Edition. Not every operation and capability is available in every edition.</p>",
       "error":{"httpStatusCode":403},
       "exception":true
     },
@@ -35278,6 +35487,38 @@
         }
       }
     },
+    "UpdateAccountCustomPermissionRequest":{
+      "type":"structure",
+      "required":[
+        "CustomPermissionsName",
+        "AwsAccountId"
+      ],
+      "members":{
+        "CustomPermissionsName":{
+          "shape":"CustomPermissionsName",
+          "documentation":"<p>The name of the custom permissions profile that you want to apply to an account.</p>"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the Amazon Web Services account for which you want to apply a custom permissions profile.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        }
+      }
+    },
+    "UpdateAccountCustomPermissionResponse":{
+      "type":"structure",
+      "members":{
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Web Services request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>"
+        }
+      }
+    },
     "UpdateAccountCustomizationRequest":{
       "type":"structure",
       "required":[
@@ -35287,19 +35528,19 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that you want to update Amazon QuickSight customizations for.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account that you want to update QuickSight customizations for.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The namespace that you want to update Amazon QuickSight customizations for.</p>",
+          "documentation":"<p>The namespace that you want to update QuickSight customizations for.</p>",
           "location":"querystring",
           "locationName":"namespace"
         },
         "AccountCustomization":{
           "shape":"AccountCustomization",
-          "documentation":"<p>The Amazon QuickSight customizations you're updating in the current Amazon Web Services Region. </p>"
+          "documentation":"<p>The QuickSight customizations you're updating in the current Amazon Web Services Region. </p>"
         }
       }
     },
@@ -35312,7 +35553,7 @@
         },
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that you want to update Amazon QuickSight customizations for.</p>"
+          "documentation":"<p>The ID for the Amazon Web Services account that you want to update QuickSight customizations for.</p>"
         },
         "Namespace":{
           "shape":"Namespace",
@@ -35320,7 +35561,7 @@
         },
         "AccountCustomization":{
           "shape":"AccountCustomization",
-          "documentation":"<p>The Amazon QuickSight customizations you're updating in the current Amazon Web Services Region. </p>"
+          "documentation":"<p>The QuickSight customizations you're updating in the current Amazon Web Services Region. </p>"
         },
         "RequestId":{
           "shape":"String",
@@ -35342,21 +35583,21 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the Amazon Web Services account that contains the Amazon QuickSight settings that you want to list.</p>",
+          "documentation":"<p>The ID for the Amazon Web Services account that contains the QuickSight settings that you want to list.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "DefaultNamespace":{
           "shape":"Namespace",
-          "documentation":"<p>The default namespace for this Amazon Web Services account. Currently, the default is <code>default</code>. IAM users that register for the first time with Amazon QuickSight provide an email address that becomes associated with the default namespace. </p>"
+          "documentation":"<p>The default namespace for this Amazon Web Services account. Currently, the default is <code>default</code>. IAM users that register for the first time with QuickSight provide an email address that becomes associated with the default namespace. </p>"
         },
         "NotificationEmail":{
           "shape":"String",
-          "documentation":"<p>The email address that you want Amazon QuickSight to send notifications to regarding your Amazon Web Services account or Amazon QuickSight subscription.</p>"
+          "documentation":"<p>The email address that you want QuickSight to send notifications to regarding your Amazon Web Services account or QuickSight subscription.</p>"
         },
         "TerminationProtectionEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>A boolean value that determines whether or not an Amazon QuickSight account can be deleted. A <code>True</code> value doesn't allow the account to be deleted and results in an error message if a user tries to make a <code>DeleteAccountSubscription</code> request. A <code>False</code> value will allow the account to be deleted.</p>"
+          "documentation":"<p>A boolean value that determines whether or not an QuickSight account can be deleted. A <code>True</code> value doesn't allow the account to be deleted and results in an error message if a user tries to make a <code>DeleteAccountSubscription</code> request. A <code>False</code> value will allow the account to be deleted.</p>"
         }
       }
     },
@@ -35451,7 +35692,7 @@
         },
         "Name":{
           "shape":"AnalysisName",
-          "documentation":"<p>A descriptive name for the analysis that you're updating. This name displays for the analysis in the Amazon QuickSight console.</p>"
+          "documentation":"<p>A descriptive name for the analysis that you're updating. This name displays for the analysis in the QuickSight console.</p>"
         },
         "Parameters":{
           "shape":"Parameters",
@@ -35463,7 +35704,7 @@
         },
         "ThemeArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the theme to apply to the analysis that you're creating. To see the theme in the Amazon QuickSight console, make sure that you have access to it.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for the theme to apply to the analysis that you're creating. To see the theme in the QuickSight console, make sure that you have access to it.</p>"
         },
         "Definition":{
           "shape":"AnalysisDefinition",
@@ -35516,7 +35757,7 @@
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The namespace of the Amazon QuickSight application.</p>",
+          "documentation":"<p>The namespace of the QuickSight application.</p>",
           "location":"querystring",
           "locationName":"namespace"
         }
@@ -35584,7 +35825,7 @@
         },
         "BrandId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the Amazon QuickSight brand.</p>",
+          "documentation":"<p>The ID of the QuickSight brand.</p>",
           "location":"uri",
           "locationName":"BrandId"
         },
@@ -35622,7 +35863,7 @@
         },
         "BrandId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The ID of the Amazon QuickSight brand.</p>",
+          "documentation":"<p>The ID of the QuickSight brand.</p>",
           "location":"uri",
           "locationName":"BrandId"
         },
@@ -35802,7 +36043,7 @@
         },
         "LinkSharingConfiguration":{
           "shape":"LinkSharingConfiguration",
-          "documentation":"<p>Updates the permissions of a shared link to an Amazon QuickSight dashboard.</p>"
+          "documentation":"<p>Updates the permissions of a shared link to an QuickSight dashboard.</p>"
         }
       }
     },
@@ -35882,7 +36123,7 @@
         },
         "SourceEntity":{
           "shape":"DashboardSourceEntity",
-          "documentation":"<p>The entity that you are using as a source when you update the dashboard. In <code>SourceEntity</code>, you specify the type of object you're using as source. You can only update a dashboard from a template, so you use a <code>SourceTemplate</code> entity. If you need to update a dashboard from an analysis, first convert the analysis to a template by using the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_CreateTemplate.html\">CreateTemplate</a> </code> API operation. For <code>SourceTemplate</code>, specify the Amazon Resource Name (ARN) of the source template. The <code>SourceTemplate</code> ARN can contain any Amazon Web Services account and any Amazon QuickSight-supported Amazon Web Services Region. </p> <p>Use the <code>DataSetReferences</code> entity within <code>SourceTemplate</code> to list the replacement datasets for the placeholders listed in the original. The schema in each dataset must match its placeholder. </p>"
+          "documentation":"<p>The entity that you are using as a source when you update the dashboard. In <code>SourceEntity</code>, you specify the type of object you're using as source. You can only update a dashboard from a template, so you use a <code>SourceTemplate</code> entity. If you need to update a dashboard from an analysis, first convert the analysis to a template by using the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_CreateTemplate.html\">CreateTemplate</a> </code> API operation. For <code>SourceTemplate</code>, specify the Amazon Resource Name (ARN) of the source template. The <code>SourceTemplate</code> ARN can contain any Amazon Web Services account and any QuickSight-supported Amazon Web Services Region. </p> <p>Use the <code>DataSetReferences</code> entity within <code>SourceTemplate</code> to list the replacement datasets for the placeholders listed in the original. The schema in each dataset must match its placeholder. </p>"
         },
         "Parameters":{
           "shape":"Parameters",
@@ -35894,7 +36135,7 @@
         },
         "DashboardPublishOptions":{
           "shape":"DashboardPublishOptions",
-          "documentation":"<p>Options for publishing the dashboard when you create it:</p> <ul> <li> <p> <code>AvailabilityStatus</code> for <code>AdHocFilteringOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. When this is set to <code>DISABLED</code>, Amazon QuickSight disables the left filter pane on the published dashboard, which can be used for ad hoc (one-time) filtering. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExportToCSVOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The visual option to export data to .CSV format isn't enabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>VisibilityState</code> for <code>SheetControlsOption</code> - This visibility state can be either <code>COLLAPSED</code> or <code>EXPANDED</code>. This option is <code>COLLAPSED</code> by default. </p> </li> </ul>"
+          "documentation":"<p>Options for publishing the dashboard when you create it:</p> <ul> <li> <p> <code>AvailabilityStatus</code> for <code>AdHocFilteringOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. When this is set to <code>DISABLED</code>, QuickSight disables the left filter pane on the published dashboard, which can be used for ad hoc (one-time) filtering. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExportToCSVOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The visual option to export data to .CSV format isn't enabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>VisibilityState</code> for <code>SheetControlsOption</code> - This visibility state can be either <code>COLLAPSED</code> or <code>EXPANDED</code>. This option is <code>COLLAPSED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExecutiveSummaryOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The option to build an executive summary is disabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default.</p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>DataStoriesSharingOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The option to share a data story is disabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default.</p> </li> </ul>"
         },
         "ThemeArn":{
           "shape":"Arn",
@@ -36067,7 +36308,7 @@
         },
         "ColumnGroups":{
           "shape":"ColumnGroupList",
-          "documentation":"<p>Groupings of columns that work together in certain Amazon QuickSight features. Currently, only geospatial hierarchy is supported.</p>"
+          "documentation":"<p>Groupings of columns that work together in certain QuickSight features. Currently, only geospatial hierarchy is supported.</p>"
         },
         "FieldFolders":{
           "shape":"FieldFolderMap",
@@ -36203,19 +36444,19 @@
         },
         "DataSourceParameters":{
           "shape":"DataSourceParameters",
-          "documentation":"<p>The parameters that Amazon QuickSight uses to connect to your underlying source.</p>"
+          "documentation":"<p>The parameters that QuickSight uses to connect to your underlying source.</p>"
         },
         "Credentials":{
           "shape":"DataSourceCredentials",
-          "documentation":"<p>The credentials that Amazon QuickSight that uses to connect to your underlying source. Currently, only credentials based on user name and password are supported.</p>"
+          "documentation":"<p>The credentials that QuickSight that uses to connect to your underlying source. Currently, only credentials based on user name and password are supported.</p>"
         },
         "VpcConnectionProperties":{
           "shape":"VpcConnectionProperties",
-          "documentation":"<p>Use this parameter only when you want Amazon QuickSight to use a VPC connection when connecting to your underlying source.</p>"
+          "documentation":"<p>Use this parameter only when you want QuickSight to use a VPC connection when connecting to your underlying source.</p>"
         },
         "SslProperties":{
           "shape":"SslProperties",
-          "documentation":"<p>Secure Socket Layer (SSL) properties that apply when Amazon QuickSight connects to your underlying source.</p>"
+          "documentation":"<p>Secure Socket Layer (SSL) properties that apply when QuickSight connects to your underlying source.</p>"
         }
       }
     },
@@ -36254,13 +36495,13 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID of the Amazon QuickSight account that is connected to the Amazon Q Business application that you want to update.</p>",
+          "documentation":"<p>The ID of the QuickSight account that is connected to the Amazon Q Business application that you want to update.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The Amazon QuickSight namespace that contains the linked Amazon Q Business application. If this field is left blank, the default namespace is used. Currently, the default namespace is the only valid value for this parameter.</p>",
+          "documentation":"<p>The QuickSight namespace that contains the linked Amazon Q Business application. If this field is left blank, the default namespace is used. Currently, the default namespace is the only valid value for this parameter.</p>",
           "location":"querystring",
           "locationName":"namespace"
         },
@@ -36468,11 +36709,11 @@
         },
         "PolicyArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN for the IAM policy to apply to the Amazon QuickSight users and groups specified in this assignment.</p>"
+          "documentation":"<p>The ARN for the IAM policy to apply to the QuickSight users and groups specified in this assignment.</p>"
         },
         "Identities":{
           "shape":"IdentityMap",
-          "documentation":"<p>The Amazon QuickSight users, groups, or both that you want to assign the policy to.</p>"
+          "documentation":"<p>The QuickSight users, groups, or both that you want to assign the policy to.</p>"
         }
       }
     },
@@ -36489,11 +36730,11 @@
         },
         "PolicyArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN for the IAM policy applied to the Amazon QuickSight users and groups specified in this assignment.</p>"
+          "documentation":"<p>The ARN for the IAM policy applied to the QuickSight users and groups specified in this assignment.</p>"
         },
         "Identities":{
           "shape":"IdentityMap",
-          "documentation":"<p>The Amazon QuickSight users, groups, or both that the IAM policy is assigned to.</p>"
+          "documentation":"<p>The QuickSight users, groups, or both that the IAM policy is assigned to.</p>"
         },
         "AssignmentStatus":{
           "shape":"AssignmentStatus",
@@ -36610,7 +36851,7 @@
         },
         "KeyRegistration":{
           "shape":"KeyRegistration",
-          "documentation":"<p>A list of <code>RegisteredCustomerManagedKey</code> objects to be updated to the Amazon QuickSight account.</p>"
+          "documentation":"<p>A list of <code>RegisteredCustomerManagedKey</code> objects to be updated to the QuickSight account.</p>"
         }
       }
     },
@@ -36642,13 +36883,13 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The Amazon Web Services account ID associated with your Amazon QuickSight subscription.</p>",
+          "documentation":"<p>The Amazon Web Services account ID associated with your QuickSight subscription.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "PublicSharingEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>A Boolean value that indicates whether public sharing is turned on for an Amazon QuickSight account.</p>"
+          "documentation":"<p>A Boolean value that indicates whether public sharing is turned on for an QuickSight account.</p>"
         }
       }
     },
@@ -36681,7 +36922,7 @@
         },
         "PersonalizationMode":{
           "shape":"PersonalizationMode",
-          "documentation":"<p>An option to allow Amazon QuickSight to customize data stories with user specific metadata, specifically location and job information, in your IAM Identity Center instance.</p>"
+          "documentation":"<p>An option to allow QuickSight to customize data stories with user specific metadata, specifically location and job information, in your IAM Identity Center instance.</p>"
         }
       }
     },
@@ -36712,13 +36953,13 @@
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID of the Amazon Web Services account that contains the Amazon QuickSight Q Search configuration that you want to update.</p>",
+          "documentation":"<p>The ID of the Amazon Web Services account that contains the QuickSight Q Search configuration that you want to update.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "QSearchStatus":{
           "shape":"QSearchStatus",
-          "documentation":"<p>The status of the Amazon QuickSight Q Search configuration that the user wants to update.</p>"
+          "documentation":"<p>The status of the QuickSight Q Search configuration that the user wants to update.</p>"
         }
       }
     },
@@ -36727,7 +36968,7 @@
       "members":{
         "QSearchStatus":{
           "shape":"QSearchStatus",
-          "documentation":"<p>The status of the Amazon QuickSight Q Search configuration.</p>"
+          "documentation":"<p>The status of the QuickSight Q Search configuration.</p>"
         },
         "RequestId":{
           "shape":"String",
@@ -36999,7 +37240,7 @@
         },
         "SourceEntity":{
           "shape":"TemplateSourceEntity",
-          "documentation":"<p>The entity that you are using as a source when you update the template. In <code>SourceEntity</code>, you specify the type of object you're using as source: <code>SourceTemplate</code> for a template or <code>SourceAnalysis</code> for an analysis. Both of these require an Amazon Resource Name (ARN). For <code>SourceTemplate</code>, specify the ARN of the source template. For <code>SourceAnalysis</code>, specify the ARN of the source analysis. The <code>SourceTemplate</code> ARN can contain any Amazon Web Services account and any Amazon QuickSight-supported Amazon Web Services Region;. </p> <p>Use the <code>DataSetReferences</code> entity within <code>SourceTemplate</code> or <code>SourceAnalysis</code> to list the replacement datasets for the placeholders listed in the original. The schema in each dataset must match its placeholder. </p>"
+          "documentation":"<p>The entity that you are using as a source when you update the template. In <code>SourceEntity</code>, you specify the type of object you're using as source: <code>SourceTemplate</code> for a template or <code>SourceAnalysis</code> for an analysis. Both of these require an Amazon Resource Name (ARN). For <code>SourceTemplate</code>, specify the ARN of the source template. For <code>SourceAnalysis</code>, specify the ARN of the source analysis. The <code>SourceTemplate</code> ARN can contain any Amazon Web Services account and any QuickSight-supported Amazon Web Services Region;. </p> <p>Use the <code>DataSetReferences</code> entity within <code>SourceTemplate</code> or <code>SourceAnalysis</code> to list the replacement datasets for the placeholders listed in the original. The schema in each dataset must match its placeholder. </p>"
         },
         "VersionDescription":{
           "shape":"VersionDescription",
@@ -37181,7 +37422,7 @@
         },
         "BaseThemeId":{
           "shape":"ShortRestrictiveResourceId",
-          "documentation":"<p>The theme ID, defined by Amazon QuickSight, that a custom theme inherits from. All themes initially inherit from a default Amazon QuickSight theme.</p>"
+          "documentation":"<p>The theme ID, defined by Amazon QuickSight, that a custom theme inherits from. All themes initially inherit from a default QuickSight theme.</p>"
         },
         "VersionDescription":{
           "shape":"VersionDescription",
@@ -37474,11 +37715,11 @@
         },
         "Role":{
           "shape":"UserRole",
-          "documentation":"<p>The Amazon QuickSight role of the user. The role can be one of the following default security cohorts:</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, datasets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> <li> <p> <code>READER_PRO</code>: Reader Pro adds Generative BI capabilities to the Reader role. Reader Pros have access to Amazon Q in Amazon QuickSight, can build stories with Amazon Q, and can generate executive summaries from dashboards.</p> </li> <li> <p> <code>AUTHOR_PRO</code>: Author Pro adds Generative BI capabilities to the Author role. Author Pros can author dashboards with natural language with Amazon Q, build stories with Amazon Q, create Topics for Q&amp;A, and generate executive summaries from dashboards.</p> </li> <li> <p> <code>ADMIN_PRO</code>: Admin Pros are Author Pros who can also manage Amazon QuickSight administrative settings. Admin Pro users are billed at Author Pro pricing.</p> </li> </ul> <p>The name of the Amazon QuickSight role is invisible to the user except for the console screens dealing with permissions.</p>"
+          "documentation":"<p>The Amazon QuickSight role of the user. The role can be one of the following default security cohorts:</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, datasets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> <li> <p> <code>READER_PRO</code>: Reader Pro adds Generative BI capabilities to the Reader role. Reader Pros have access to Amazon Q in QuickSight, can build stories with Amazon Q, and can generate executive summaries from dashboards.</p> </li> <li> <p> <code>AUTHOR_PRO</code>: Author Pro adds Generative BI capabilities to the Author role. Author Pros can author dashboards with natural language with Amazon Q, build stories with Amazon Q, create Topics for Q&amp;A, and generate executive summaries from dashboards.</p> </li> <li> <p> <code>ADMIN_PRO</code>: Admin Pros are Author Pros who can also manage Amazon QuickSight administrative settings. Admin Pro users are billed at Author Pro pricing.</p> </li> </ul> <p>The name of the QuickSight role is invisible to the user except for the console screens dealing with permissions.</p>"
         },
         "CustomPermissionsName":{
           "shape":"RoleName",
-          "documentation":"<p>(Enterprise edition only) The name of the custom permissions profile that you want to assign to this user. Customized permissions allows you to control a user's access by restricting access the following operations:</p> <ul> <li> <p>Create and update data sources</p> </li> <li> <p>Create and update datasets</p> </li> <li> <p>Create and update email reports</p> </li> <li> <p>Subscribe to email reports</p> </li> </ul> <p>A set of custom permissions includes any combination of these restrictions. Currently, you need to create the profile names for custom permission sets by using the Amazon QuickSight console. Then, you use the <code>RegisterUser</code> API operation to assign the named set of permissions to a Amazon QuickSight user. </p> <p>Amazon QuickSight custom permissions are applied through IAM policies. Therefore, they override the permissions typically granted by assigning Amazon QuickSight users to one of the default security cohorts in Amazon QuickSight (admin, author, reader).</p> <p>This feature is available only to Amazon QuickSight Enterprise edition subscriptions.</p>"
+          "documentation":"<p>(Enterprise edition only) The name of the custom permissions profile that you want to assign to this user. Customized permissions allows you to control a user's access by restricting access the following operations:</p> <ul> <li> <p>Create and update data sources</p> </li> <li> <p>Create and update datasets</p> </li> <li> <p>Create and update email reports</p> </li> <li> <p>Subscribe to email reports</p> </li> </ul> <p>A set of custom permissions includes any combination of these restrictions. Currently, you need to create the profile names for custom permission sets by using the QuickSight console. Then, you use the <code>RegisterUser</code> API operation to assign the named set of permissions to a QuickSight user. </p> <p>QuickSight custom permissions are applied through IAM policies. Therefore, they override the permissions typically granted by assigning QuickSight users to one of the default security cohorts in QuickSight (admin, author, reader).</p> <p>This feature is available only to QuickSight Enterprise edition subscriptions.</p>"
         },
         "UnapplyCustomPermissions":{
           "shape":"Boolean",
@@ -37486,11 +37727,11 @@
         },
         "ExternalLoginFederationProviderType":{
           "shape":"String",
-          "documentation":"<p>The type of supported external login provider that provides identity to let a user federate into Amazon QuickSight with an associated Identity and Access Management(IAM) role. The type of supported external login provider can be one of the following.</p> <ul> <li> <p> <code>COGNITO</code>: Amazon Cognito. The provider URL is cognito-identity.amazonaws.com. When choosing the <code>COGNITO</code> provider type, don’t use the \"CustomFederationProviderUrl\" parameter which is only needed when the external provider is custom.</p> </li> <li> <p> <code>CUSTOM_OIDC</code>: Custom OpenID Connect (OIDC) provider. When choosing <code>CUSTOM_OIDC</code> type, use the <code>CustomFederationProviderUrl</code> parameter to provide the custom OIDC provider URL.</p> </li> <li> <p> <code>NONE</code>: This clears all the previously saved external login information for a user. Use the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DescribeUser.html\">DescribeUser</a> </code> API operation to check the external login information.</p> </li> </ul>"
+          "documentation":"<p>The type of supported external login provider that provides identity to let a user federate into QuickSight with an associated Identity and Access Management(IAM) role. The type of supported external login provider can be one of the following.</p> <ul> <li> <p> <code>COGNITO</code>: Amazon Cognito. The provider URL is cognito-identity.amazonaws.com. When choosing the <code>COGNITO</code> provider type, don’t use the \"CustomFederationProviderUrl\" parameter which is only needed when the external provider is custom.</p> </li> <li> <p> <code>CUSTOM_OIDC</code>: Custom OpenID Connect (OIDC) provider. When choosing <code>CUSTOM_OIDC</code> type, use the <code>CustomFederationProviderUrl</code> parameter to provide the custom OIDC provider URL.</p> </li> <li> <p> <code>NONE</code>: This clears all the previously saved external login information for a user. Use the <code> <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DescribeUser.html\">DescribeUser</a> </code> API operation to check the external login information.</p> </li> </ul>"
         },
         "CustomFederationProviderUrl":{
           "shape":"String",
-          "documentation":"<p>The URL of the custom OpenID Connect (OIDC) provider that provides identity to let a user federate into Amazon QuickSight with an associated Identity and Access Management(IAM) role. This parameter should only be used when <code>ExternalLoginFederationProviderType</code> parameter is set to <code>CUSTOM_OIDC</code>.</p>"
+          "documentation":"<p>The URL of the custom OpenID Connect (OIDC) provider that provides identity to let a user federate into QuickSight with an associated Identity and Access Management(IAM) role. This parameter should only be used when <code>ExternalLoginFederationProviderType</code> parameter is set to <code>CUSTOM_OIDC</code>.</p>"
         },
         "ExternalLoginId":{
           "shape":"String",
@@ -37628,7 +37869,7 @@
         },
         "UserName":{
           "shape":"UserName",
-          "documentation":"<p>The user's user name. This value is required if you are registering a user that will be managed in Amazon QuickSight. In the output, the value for <code>UserName</code> is <code>N/A</code> when the value for <code>IdentityType</code> is <code>IAM</code> and the corresponding IAM user is deleted.</p>"
+          "documentation":"<p>The user's user name. This value is required if you are registering a user that will be managed in QuickSight. In the output, the value for <code>UserName</code> is <code>N/A</code> when the value for <code>IdentityType</code> is <code>IAM</code> and the corresponding IAM user is deleted.</p>"
         },
         "Email":{
           "shape":"String",
@@ -37636,7 +37877,7 @@
         },
         "Role":{
           "shape":"UserRole",
-          "documentation":"<p>The Amazon QuickSight role for the user. The user role can be one of the following:.</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, datasets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon Amazon QuickSight settings.</p> </li> <li> <p> <code>READER_PRO</code>: Reader Pro adds Generative BI capabilities to the Reader role. Reader Pros have access to Amazon Q in Amazon QuickSight, can build stories with Amazon Q, and can generate executive summaries from dashboards.</p> </li> <li> <p> <code>AUTHOR_PRO</code>: Author Pro adds Generative BI capabilities to the Author role. Author Pros can author dashboards with natural language with Amazon Q, build stories with Amazon Q, create Topics for Q&amp;A, and generate executive summaries from dashboards.</p> </li> <li> <p> <code>ADMIN_PRO</code>: Admin Pros are Author Pros who can also manage Amazon QuickSight administrative settings. Admin Pro users are billed at Author Pro pricing.</p> </li> <li> <p> <code>RESTRICTED_READER</code>: This role isn't currently available for use.</p> </li> <li> <p> <code>RESTRICTED_AUTHOR</code>: This role isn't currently available for use.</p> </li> </ul>"
+          "documentation":"<p>The Amazon QuickSight role for the user. The user role can be one of the following:.</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, datasets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> <li> <p> <code>READER_PRO</code>: Reader Pro adds Generative BI capabilities to the Reader role. Reader Pros have access to Amazon Q in QuickSight, can build stories with Amazon Q, and can generate executive summaries from dashboards.</p> </li> <li> <p> <code>AUTHOR_PRO</code>: Author Pro adds Generative BI capabilities to the Author role. Author Pros can author dashboards with natural language with Amazon Q, build stories with Amazon Q, create Topics for Q&amp;A, and generate executive summaries from dashboards.</p> </li> <li> <p> <code>ADMIN_PRO</code>: Admin Pros are Author Pros who can also manage Amazon QuickSight administrative settings. Admin Pro users are billed at Author Pro pricing.</p> </li> <li> <p> <code>RESTRICTED_READER</code>: This role isn't currently available for use.</p> </li> <li> <p> <code>RESTRICTED_AUTHOR</code>: This role isn't currently available for use.</p> </li> </ul>"
         },
         "IdentityType":{
           "shape":"IdentityType",
diff --git a/services/ram/pom.xml b/services/ram/pom.xml
index 0d38a8d1f56e..8928c7192c89 100644
--- a/services/ram/pom.xml
+++ b/services/ram/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ram</artifactId>
     <name>AWS Java SDK :: Services :: RAM</name>
diff --git a/services/rbin/pom.xml b/services/rbin/pom.xml
index 2a7c2740d26a..203b1ad3766b 100644
--- a/services/rbin/pom.xml
+++ b/services/rbin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>rbin</artifactId>
     <name>AWS Java SDK :: Services :: Rbin</name>
diff --git a/services/rds/pom.xml b/services/rds/pom.xml
index b455322aa885..7d1532593fef 100644
--- a/services/rds/pom.xml
+++ b/services/rds/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>rds</artifactId>
     <name>AWS Java SDK :: Services :: Amazon RDS</name>
diff --git a/services/rds/src/main/resources/codegen-resources/service-2.json b/services/rds/src/main/resources/codegen-resources/service-2.json
index b9932f7e3ce5..99b5efa8a436 100644
--- a/services/rds/src/main/resources/codegen-resources/service-2.json
+++ b/services/rds/src/main/resources/codegen-resources/service-2.json
@@ -5008,7 +5008,6 @@
       "required":[
         "DBProxyName",
         "EngineFamily",
-        "Auth",
         "RoleArn",
         "VpcSubnetIds"
       ],
@@ -5021,6 +5020,10 @@
           "shape":"EngineFamily",
           "documentation":"<p>The kinds of databases that the proxy can connect to. This value determines which database network protocol the proxy recognizes when it interprets network traffic to and from the database. For Aurora MySQL, RDS for MariaDB, and RDS for MySQL databases, specify <code>MYSQL</code>. For Aurora PostgreSQL and RDS for PostgreSQL databases, specify <code>POSTGRESQL</code>. For RDS for Microsoft SQL Server, specify <code>SQLSERVER</code>.</p>"
         },
+        "DefaultAuthScheme":{
+          "shape":"DefaultAuthScheme",
+          "documentation":"<p>The default authentication scheme that the proxy uses for client connections to the proxy and connections from the proxy to the underlying database. Valid values are <code>NONE</code> and <code>IAM_AUTH</code>. When set to <code>IAM_AUTH</code>, the proxy uses end-to-end IAM authentication to connect to the database. If you don't specify <code>DefaultAuthScheme</code> or specify this parameter as <code>NONE</code>, you must specify the <code>Auth</code> option.</p>"
+        },
         "Auth":{
           "shape":"UserAuthConfigList",
           "documentation":"<p>The authorization mechanism that the proxy uses.</p>"
@@ -7654,6 +7657,10 @@
           "shape":"StringList",
           "documentation":"<p>The EC2 subnet IDs for the proxy.</p>"
         },
+        "DefaultAuthScheme":{
+          "shape":"String",
+          "documentation":"<p>The default authentication scheme that the proxy uses for client connections to the proxy and connections from the proxy to the underlying database. Valid values are <code>NONE</code> and <code>IAM_AUTH</code>. When set to <code>IAM_AUTH</code>, the proxy uses end-to-end IAM authentication to connect to the database. </p>"
+        },
         "Auth":{
           "shape":"UserAuthConfigInfoList",
           "documentation":"<p>One or more data structures specifying the authorization mechanism to connect to the associated RDS DB instance or Aurora DB cluster.</p>"
@@ -8768,6 +8775,13 @@
         "advanced"
       ]
     },
+    "DefaultAuthScheme":{
+      "type":"string",
+      "enum":[
+        "IAM_AUTH",
+        "NONE"
+      ]
+    },
     "DeleteBlueGreenDeploymentRequest":{
       "type":"structure",
       "required":["BlueGreenDeploymentIdentifier"],
@@ -12897,6 +12911,10 @@
           "shape":"String",
           "documentation":"<p>The new identifier for the <code>DBProxy</code>. An identifier must begin with a letter and must contain only ASCII letters, digits, and hyphens; it can't end with a hyphen or contain two consecutive hyphens.</p>"
         },
+        "DefaultAuthScheme":{
+          "shape":"DefaultAuthScheme",
+          "documentation":"<p>The default authentication scheme that the proxy uses for client connections to the proxy and connections from the proxy to the underlying database. Valid values are <code>NONE</code> and <code>IAM_AUTH</code>. When set to <code>IAM_AUTH</code>, the proxy uses end-to-end IAM authentication to connect to the database.</p>"
+        },
         "Auth":{
           "shape":"UserAuthConfigList",
           "documentation":"<p>The new authentication settings for the <code>DBProxy</code>.</p>"
@@ -17214,7 +17232,9 @@
     },
     "UserAuthConfigList":{
       "type":"list",
-      "member":{"shape":"UserAuthConfig"}
+      "member":{"shape":"UserAuthConfig"},
+      "max":200,
+      "min":0
     },
     "ValidDBInstanceModificationsMessage":{
       "type":"structure",
diff --git a/services/rdsdata/pom.xml b/services/rdsdata/pom.xml
index 90ad2ce7513f..f9c9fdef57bb 100644
--- a/services/rdsdata/pom.xml
+++ b/services/rdsdata/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>rdsdata</artifactId>
     <name>AWS Java SDK :: Services :: RDS Data</name>
diff --git a/services/redshift/pom.xml b/services/redshift/pom.xml
index bb3d1760c6e3..1b41fe999559 100644
--- a/services/redshift/pom.xml
+++ b/services/redshift/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>redshift</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Redshift</name>
diff --git a/services/redshift/src/main/resources/codegen-resources/service-2.json b/services/redshift/src/main/resources/codegen-resources/service-2.json
index 52a20f2572bb..345bf9db2b22 100644
--- a/services/redshift/src/main/resources/codegen-resources/service-2.json
+++ b/services/redshift/src/main/resources/codegen-resources/service-2.json
@@ -510,7 +510,9 @@
         {"shape":"DependentServiceUnavailableFault"},
         {"shape":"UnsupportedOperationFault"},
         {"shape":"DependentServiceAccessDeniedFault"},
-        {"shape":"RedshiftIdcApplicationQuotaExceededFault"}
+        {"shape":"RedshiftIdcApplicationQuotaExceededFault"},
+        {"shape":"TagLimitExceededFault"},
+        {"shape":"InvalidTagFault"}
       ],
       "documentation":"<p>Creates an Amazon Redshift application for use with IAM Identity Center.</p>"
     },
@@ -4717,6 +4719,14 @@
         "ServiceIntegrations":{
           "shape":"ServiceIntegrationList",
           "documentation":"<p>A collection of service integrations for the Redshift IAM Identity Center application.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags.</p>"
+        },
+        "SsoTagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>A list of tags keys that Redshift Identity Center applications copy to IAM Identity Center. For each input key, the tag corresponding to the key-value pair is propagated.</p>"
         }
       }
     },
@@ -9643,6 +9653,14 @@
         "ServiceIntegrations":{
           "shape":"ServiceIntegrationList",
           "documentation":"<p>A list of service integrations for the Redshift IAM Identity Center application.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags.</p>"
+        },
+        "SsoTagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>A list of tags keys that Redshift Identity Center applications copy to IAM Identity Center. For each input key, the tag corresponding to the key-value pair is propagated.</p>"
         }
       },
       "documentation":"<p>Contains properties for the Redshift IDC application.</p>",
diff --git a/services/redshiftdata/pom.xml b/services/redshiftdata/pom.xml
index 5ec0a2b47f59..b61a15b40ad0 100644
--- a/services/redshiftdata/pom.xml
+++ b/services/redshiftdata/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>redshiftdata</artifactId>
     <name>AWS Java SDK :: Services :: Redshift Data</name>
diff --git a/services/redshiftserverless/pom.xml b/services/redshiftserverless/pom.xml
index ba28e0082c75..d4795d141028 100644
--- a/services/redshiftserverless/pom.xml
+++ b/services/redshiftserverless/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>redshiftserverless</artifactId>
     <name>AWS Java SDK :: Services :: Redshift Serverless</name>
diff --git a/services/rekognition/pom.xml b/services/rekognition/pom.xml
index 156bb6aeaefe..d1a1826772a7 100644
--- a/services/rekognition/pom.xml
+++ b/services/rekognition/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>rekognition</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Rekognition</name>
diff --git a/services/repostspace/pom.xml b/services/repostspace/pom.xml
index 018586e2197f..d5b1acac3147 100644
--- a/services/repostspace/pom.xml
+++ b/services/repostspace/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>repostspace</artifactId>
     <name>AWS Java SDK :: Services :: Repostspace</name>
diff --git a/services/resiliencehub/pom.xml b/services/resiliencehub/pom.xml
index aee4d17c94a4..e6a48d7c9b0c 100644
--- a/services/resiliencehub/pom.xml
+++ b/services/resiliencehub/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>resiliencehub</artifactId>
     <name>AWS Java SDK :: Services :: Resiliencehub</name>
diff --git a/services/resourceexplorer2/pom.xml b/services/resourceexplorer2/pom.xml
index 0885fb93f5e4..dcdcd2f7a577 100644
--- a/services/resourceexplorer2/pom.xml
+++ b/services/resourceexplorer2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>resourceexplorer2</artifactId>
     <name>AWS Java SDK :: Services :: Resource Explorer 2</name>
diff --git a/services/resourcegroups/pom.xml b/services/resourcegroups/pom.xml
index cda9d037f894..f50568922c1f 100644
--- a/services/resourcegroups/pom.xml
+++ b/services/resourcegroups/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>resourcegroups</artifactId>
diff --git a/services/resourcegroupstaggingapi/pom.xml b/services/resourcegroupstaggingapi/pom.xml
index 9e79e4430824..c256b2de3b3f 100644
--- a/services/resourcegroupstaggingapi/pom.xml
+++ b/services/resourcegroupstaggingapi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>resourcegroupstaggingapi</artifactId>
     <name>AWS Java SDK :: Services :: AWS Resource Groups Tagging API</name>
diff --git a/services/robomaker/pom.xml b/services/robomaker/pom.xml
index 2fc0c7587b3c..bf36a0c2783d 100644
--- a/services/robomaker/pom.xml
+++ b/services/robomaker/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>robomaker</artifactId>
     <name>AWS Java SDK :: Services :: RoboMaker</name>
diff --git a/services/rolesanywhere/pom.xml b/services/rolesanywhere/pom.xml
index 16241b542cc4..95e4a92f0906 100644
--- a/services/rolesanywhere/pom.xml
+++ b/services/rolesanywhere/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>rolesanywhere</artifactId>
     <name>AWS Java SDK :: Services :: Roles Anywhere</name>
diff --git a/services/route53/pom.xml b/services/route53/pom.xml
index 9dd57163804f..0412fa080423 100644
--- a/services/route53/pom.xml
+++ b/services/route53/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>route53</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Route53</name>
diff --git a/services/route53domains/pom.xml b/services/route53domains/pom.xml
index e3a421cfb36f..fc3aba430a7b 100644
--- a/services/route53domains/pom.xml
+++ b/services/route53domains/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>route53domains</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Route53 Domains</name>
diff --git a/services/route53profiles/pom.xml b/services/route53profiles/pom.xml
index 0a3dd7276ddd..672f5fef68a5 100644
--- a/services/route53profiles/pom.xml
+++ b/services/route53profiles/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>route53profiles</artifactId>
     <name>AWS Java SDK :: Services :: Route53 Profiles</name>
diff --git a/services/route53recoverycluster/pom.xml b/services/route53recoverycluster/pom.xml
index be1dfe98b59b..d4cec6e07a94 100644
--- a/services/route53recoverycluster/pom.xml
+++ b/services/route53recoverycluster/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>route53recoverycluster</artifactId>
     <name>AWS Java SDK :: Services :: Route53 Recovery Cluster</name>
diff --git a/services/route53recoverycontrolconfig/pom.xml b/services/route53recoverycontrolconfig/pom.xml
index c0da4b92a638..4451a0157668 100644
--- a/services/route53recoverycontrolconfig/pom.xml
+++ b/services/route53recoverycontrolconfig/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>route53recoverycontrolconfig</artifactId>
     <name>AWS Java SDK :: Services :: Route53 Recovery Control Config</name>
diff --git a/services/route53recoveryreadiness/pom.xml b/services/route53recoveryreadiness/pom.xml
index 4c2fc3cfc684..141e0fdb6128 100644
--- a/services/route53recoveryreadiness/pom.xml
+++ b/services/route53recoveryreadiness/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>route53recoveryreadiness</artifactId>
     <name>AWS Java SDK :: Services :: Route53 Recovery Readiness</name>
diff --git a/services/route53resolver/pom.xml b/services/route53resolver/pom.xml
index bfb30ddfa3cf..c18000e524b6 100644
--- a/services/route53resolver/pom.xml
+++ b/services/route53resolver/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>route53resolver</artifactId>
     <name>AWS Java SDK :: Services :: Route53Resolver</name>
diff --git a/services/rum/pom.xml b/services/rum/pom.xml
index 3e87322c8722..eab8108283a7 100644
--- a/services/rum/pom.xml
+++ b/services/rum/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>rum</artifactId>
     <name>AWS Java SDK :: Services :: RUM</name>
diff --git a/services/s3/pom.xml b/services/s3/pom.xml
index 91094507365b..b031904b1014 100644
--- a/services/s3/pom.xml
+++ b/services/s3/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>s3</artifactId>
     <name>AWS Java SDK :: Services :: Amazon S3</name>
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolver.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolver.java
deleted file mode 100644
index 9f8ab6e66910..000000000000
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolver.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file 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.
- */
-
-package software.amazon.awssdk.services.s3.internal.endpoints;
-
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.services.s3.internal.ConfiguredS3SdkHttpRequest;
-
-/**
- * An S3 endpoint resolver returns a {@link ConfiguredS3SdkHttpRequest} based on the HTTP context and previously
- * set execution attributes.
- * <p/>
- * @see software.amazon.awssdk.services.s3.internal.handlers.EndpointAddressInterceptor
- */
-@SdkInternalApi
-public interface S3EndpointResolver {
-
-    ConfiguredS3SdkHttpRequest applyEndpointConfiguration(S3EndpointResolverContext context);
-}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContext.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContext.java
deleted file mode 100644
index a04c04443c75..000000000000
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContext.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file 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.
- */
-
-package software.amazon.awssdk.services.s3.internal.endpoints;
-
-import java.net.URI;
-import java.util.Objects;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.SdkRequest;
-import software.amazon.awssdk.http.SdkHttpRequest;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Configuration;
-
-/**
- * Contains the information needed to resolve S3 endpoints.
- */
-@SdkInternalApi
-public final class S3EndpointResolverContext {
-    private final SdkHttpRequest request;
-    private final SdkRequest originalRequest;
-    private final Region region;
-    private final S3Configuration serviceConfiguration;
-    private final URI endpointOverride;
-    private final boolean disableHostPrefixInjection;
-    private final boolean fipsEnabled;
-
-    private S3EndpointResolverContext(Builder builder) {
-        this.request = builder.request;
-        this.originalRequest = builder.originalRequest;
-        this.region = builder.region;
-        this.serviceConfiguration = builder.serviceConfiguration;
-        this.endpointOverride = builder.endpointOverride;
-        this.disableHostPrefixInjection = builder.disableHostPrefixInjection;
-        this.fipsEnabled = builder.fipsEnabled != null ? builder.fipsEnabled : false;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public SdkHttpRequest request() {
-        return request;
-    }
-
-    public SdkRequest originalRequest() {
-        return originalRequest;
-    }
-
-    public Region region() {
-        return region;
-    }
-
-    public S3Configuration serviceConfiguration() {
-        return serviceConfiguration;
-    }
-
-    public boolean fipsEnabled() {
-        return fipsEnabled;
-    }
-
-    public URI endpointOverride() {
-        return endpointOverride;
-    }
-
-    public boolean isDisableHostPrefixInjection() {
-        return disableHostPrefixInjection;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        S3EndpointResolverContext that = (S3EndpointResolverContext) o;
-        return Objects.equals(endpointOverride, that.endpointOverride) &&
-               Objects.equals(request, that.request) &&
-               Objects.equals(originalRequest, that.originalRequest) &&
-               Objects.equals(region, that.region) &&
-               Objects.equals(serviceConfiguration, that.serviceConfiguration) &&
-               (disableHostPrefixInjection == that.disableHostPrefixInjection);
-    }
-
-    @Override
-    public int hashCode() {
-        int hashCode = 1;
-        hashCode = 31 * hashCode + Objects.hashCode(request());
-        hashCode = 31 * hashCode + Objects.hashCode(originalRequest());
-        hashCode = 31 * hashCode + Objects.hashCode(region());
-        hashCode = 31 * hashCode + Objects.hashCode(serviceConfiguration());
-        hashCode = 31 * hashCode + Objects.hashCode(endpointOverride());
-        hashCode = 31 * hashCode + Objects.hashCode(isDisableHostPrefixInjection());
-        hashCode = 31 * hashCode + Boolean.hashCode(fipsEnabled());
-        return hashCode;
-    }
-
-    public Builder toBuilder() {
-        return builder().endpointOverride(endpointOverride)
-                        .request(request)
-                        .originalRequest(originalRequest)
-                        .region(region)
-                        .serviceConfiguration(serviceConfiguration)
-                        .fipsEnabled(fipsEnabled);
-    }
-
-    public static final class Builder {
-        private SdkHttpRequest request;
-        private SdkRequest originalRequest;
-        private Region region;
-        private S3Configuration serviceConfiguration;
-        private URI endpointOverride;
-        private boolean disableHostPrefixInjection;
-        private Boolean fipsEnabled;
-
-        private Builder() {
-        }
-
-        public Builder request(SdkHttpRequest request) {
-            this.request = request;
-            return this;
-        }
-
-        public Builder originalRequest(SdkRequest originalRequest) {
-            this.originalRequest = originalRequest;
-            return this;
-        }
-
-        public Builder region(Region region) {
-            this.region = region;
-            return this;
-        }
-
-        public Builder serviceConfiguration(S3Configuration serviceConfiguration) {
-            this.serviceConfiguration = serviceConfiguration;
-            return this;
-        }
-
-        public Builder endpointOverride(URI endpointOverride) {
-            this.endpointOverride = endpointOverride;
-            return this;
-        }
-
-        public Builder disableHostPrefixInjection(boolean disableHostPrefixInjection) {
-            this.disableHostPrefixInjection = disableHostPrefixInjection;
-            return this;
-        }
-
-        public Builder fipsEnabled(Boolean fipsEnabled) {
-            this.fipsEnabled = fipsEnabled;
-            return this;
-        }
-
-        public S3EndpointResolverContext build() {
-            return new S3EndpointResolverContext(this);
-        }
-    }
-}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverFactoryContext.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverFactoryContext.java
deleted file mode 100644
index 73b2fc05a520..000000000000
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverFactoryContext.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file 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.
- */
-
-package software.amazon.awssdk.services.s3.internal.endpoints;
-
-import java.util.Optional;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.services.s3.model.S3Request;
-
-@SdkInternalApi
-public final class S3EndpointResolverFactoryContext {
-    private final String bucketName;
-    private final S3Request originalRequest;
-
-    private S3EndpointResolverFactoryContext(DefaultBuilder builder) {
-        this.bucketName = builder.bucketName;
-        this.originalRequest = builder.originalRequest;
-    }
-
-    public Optional<String> bucketName() {
-        return Optional.ofNullable(bucketName);
-    }
-
-    public S3Request originalRequest() {
-        return originalRequest;
-    }
-
-    public static Builder builder() {
-        return new DefaultBuilder();
-    }
-
-    public interface Builder {
-        Builder bucketName(String bucketName);
-
-        Builder originalRequest(S3Request originalRequest);
-
-        S3EndpointResolverFactoryContext build();
-    }
-
-    private static final class DefaultBuilder implements Builder {
-        private String bucketName;
-        private S3Request originalRequest;
-
-        @Override
-        public Builder bucketName(String bucketName) {
-            this.bucketName = bucketName;
-            return this;
-        }
-
-        @Override
-        public Builder originalRequest(S3Request originalRequest) {
-            this.originalRequest = originalRequest;
-            return this;
-        }
-
-        @Override
-        public S3EndpointResolverFactoryContext build() {
-            return new S3EndpointResolverFactoryContext(this);
-        }
-    }
-}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilder.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilder.java
deleted file mode 100644
index 72e0426d41b6..000000000000
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilder.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file 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.
- */
-
-package software.amazon.awssdk.services.s3.internal.endpoints;
-
-import java.net.URI;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.utils.Validate;
-
-/**
- * Endpoint builder for operations specific to S3 Object Lambda.
- */
-@SdkInternalApi
-public class S3ObjectLambdaOperationEndpointBuilder {
-    private String region;
-    private String protocol;
-    private String domain;
-
-    private S3ObjectLambdaOperationEndpointBuilder() {
-    }
-
-    /**
-     * Create a new instance of this builder class.
-     */
-    public static S3ObjectLambdaOperationEndpointBuilder create() {
-        return new S3ObjectLambdaOperationEndpointBuilder();
-    }
-
-
-    public S3ObjectLambdaOperationEndpointBuilder region(String region) {
-        this.region = region;
-        return this;
-    }
-
-    public S3ObjectLambdaOperationEndpointBuilder protocol(String protocol) {
-        this.protocol = protocol;
-        return this;
-    }
-
-    public S3ObjectLambdaOperationEndpointBuilder domain(String domain) {
-        this.domain = domain;
-        return this;
-    }
-
-    /**
-     * Generate an endpoint URI with no path that maps to the Object Lambdas Access Point information stored in this builder.
-     */
-    public URI toUri() {
-        Validate.paramNotBlank(protocol, "protocol");
-        Validate.paramNotBlank(domain, "domain");
-        Validate.paramNotBlank(region, "region");
-
-        String servicePrefix = "s3-object-lambda";
-
-        String uriString = String.format("%s://%s.%s.%s",
-                protocol,
-                servicePrefix,
-                region,
-                domain);
-
-        return URI.create(uriString);
-    }
-}
\ No newline at end of file
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriber.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriber.java
index 1ccae234631d..7466bda5b2a3 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriber.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriber.java
@@ -23,6 +23,7 @@
 import org.reactivestreams.Subscription;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
+import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
@@ -60,6 +61,11 @@ public class MultipartDownloaderSubscriber implements Subscriber<AsyncResponseTr
      */
     private final AtomicInteger completedParts;
 
+    /**
+     * The total number of getObject calls made. This tracks how many times we've actually called getObject.
+     */
+    private final AtomicInteger getObjectCallCount;
+
     /**
      * The subscription received from the publisher this subscriber subscribes to.
      */
@@ -94,6 +100,7 @@ public MultipartDownloaderSubscriber(S3AsyncClient s3, GetObjectRequest getObjec
         this.s3 = s3;
         this.getObjectRequest = getObjectRequest;
         this.completedParts = new AtomicInteger(completedParts);
+        this.getObjectCallCount = new AtomicInteger(completedParts);
     }
 
     @Override
@@ -126,11 +133,12 @@ public void onNext(AsyncResponseTransformer<GetObjectResponse, GetObjectResponse
         GetObjectRequest actualRequest = nextRequest(nextPartToGet);
         log.debug(() -> "Sending GetObjectRequest for next part with partNumber=" + nextPartToGet);
         CompletableFuture<GetObjectResponse> getObjectFuture = s3.getObject(actualRequest, asyncResponseTransformer);
+        getObjectCallCount.incrementAndGet();
         getObjectFutures.add(getObjectFuture);
         getObjectFuture.whenComplete((response, error) -> {
             if (error != null) {
                 log.debug(() -> "Error encountered during GetObjectRequest with partNumber=" + nextPartToGet);
-                onError(error);
+                handleError(error);
                 return;
             }
             requestMoreIfNeeded(response);
@@ -166,6 +174,7 @@ private void requestMoreIfNeeded(GetObjectResponse response) {
             if (totalParts != null && totalParts > 1 && totalComplete < totalParts) {
                 subscription.request(1);
             } else {
+                validatePartsCount();
                 log.debug(() -> String.format("Completing multipart download after a total of %d parts downloaded.", totalParts));
                 subscription.cancel();
             }
@@ -174,6 +183,13 @@ private void requestMoreIfNeeded(GetObjectResponse response) {
 
     @Override
     public void onError(Throwable t) {
+        handleError(t);
+    }
+
+    /**
+     * The method used by the Subscriber itself when error occured.
+     */
+    private void handleError(Throwable t) {
         CompletableFuture<GetObjectResponse> partFuture;
         while ((partFuture = getObjectFutures.poll()) != null) {
             partFuture.cancel(true);
@@ -198,4 +214,14 @@ private GetObjectRequest nextRequest(int nextPartToGet) {
             }
         });
     }
+
+    private void validatePartsCount() {
+        int actualGetCount = getObjectCallCount.get();
+        if (totalParts != null && actualGetCount != totalParts) {
+            String errorMessage = String.format("PartsCount validation failed. Expected %d, downloaded %d parts.", totalParts,
+                                                actualGetCount);
+            SdkClientException exception = SdkClientException.create(errorMessage);
+            handleError(exception);
+        }
+    }
 }
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContextTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContextTest.java
deleted file mode 100644
index d344e9b1d070..000000000000
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContextTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file 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.
- */
-
-package software.amazon.awssdk.services.s3.internal.endpoints;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import java.net.URI;
-import org.junit.jupiter.api.Test;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.http.SdkHttpMethod;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Configuration;
-import software.amazon.awssdk.services.s3.model.PutObjectRequest;
-
-public class S3EndpointResolverContextTest {
-
-    @Test
-    public void toBuilder_minimal() {
-        S3EndpointResolverContext context = S3EndpointResolverContext.builder().build();
-        assertNull(context.originalRequest());
-        assertNull(context.region());
-        assertNull(context.serviceConfiguration());
-        assertNull(context.request());
-    }
-
-    @Test
-    public void toBuilder_maximal() {
-        S3Configuration serviceConfiguration = S3Configuration.builder().build();
-        SdkHttpFullRequest httpRequest = SdkHttpFullRequest.builder().protocol("http").host("host").method(SdkHttpMethod.POST).build();
-        URI endpoint = URI.create("https://endpoint.com");
-        S3EndpointResolverContext context = S3EndpointResolverContext.builder()
-                                                                     .endpointOverride(endpoint)
-                                                                     .originalRequest(PutObjectRequest.builder().build())
-                                                                     .region(Region.US_EAST_1)
-                                                                     .serviceConfiguration(serviceConfiguration)
-                                                                     .request(httpRequest)
-                                                                     .build();
-        assertThat(context.endpointOverride()).isEqualTo(endpoint);
-        assertThat(context.originalRequest()).isInstanceOf(PutObjectRequest.class);
-        assertThat(context.region()).isEqualTo(Region.US_EAST_1);
-        assertThat(context.serviceConfiguration()).isEqualTo(serviceConfiguration);
-        assertThat(context.request()).isEqualTo(httpRequest);
-    }
-}
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilderTest.java
deleted file mode 100644
index 2d34476254a1..000000000000
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilderTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package software.amazon.awssdk.services.s3.internal.endpoints;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import java.net.URI;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-public class S3ObjectLambdaOperationEndpointBuilderTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Test
-    public void toUri_buildsCorrectEndpoint() {
-        URI endpoint = S3ObjectLambdaOperationEndpointBuilder.create()
-                .domain("my-domain.com")
-                .protocol("https")
-                .region("us-west-2")
-                .toUri();
-
-        assertThat(endpoint.toString(), is("https://s3-object-lambda.us-west-2.my-domain.com"));
-    }
-
-    @Test
-    public void toUri_disallowsNullProtocol() {
-        thrown.expect(NullPointerException.class);
-
-        S3ObjectLambdaOperationEndpointBuilder.create()
-                .domain("my-domain.com")
-                .protocol(null)
-                .region("us-west-2")
-                .toUri();
-    }
-
-    @Test
-    public void toUri_disallowsEmptyProtocol() {
-        thrown.expect(IllegalArgumentException.class);
-
-        S3ObjectLambdaOperationEndpointBuilder.create()
-                .domain("my-domain.com")
-                .protocol("")
-                .region("us-west-2")
-                .toUri();
-    }
-
-    @Test
-    public void toUri_disallowsNullRegion() {
-        thrown.expect(NullPointerException.class);
-
-        S3ObjectLambdaOperationEndpointBuilder.create()
-                .domain("my-domain.com")
-                .protocol("https")
-                .region(null)
-                .toUri();
-    }
-
-    @Test
-    public void toUri_disallowsEmptyRegion() {
-        thrown.expect(IllegalArgumentException.class);
-
-        S3ObjectLambdaOperationEndpointBuilder.create()
-                .domain("my-domain.com")
-                .protocol("https")
-                .region("")
-                .toUri();
-    }
-
-    @Test
-    public void toUri_disallowsNullDomain() {
-        thrown.expect(NullPointerException.class);
-
-        S3ObjectLambdaOperationEndpointBuilder.create()
-                .domain(null)
-                .protocol("https")
-                .region("region")
-                .toUri();
-    }
-
-    @Test
-    public void toUri_disallowsEmptyDomain() {
-        thrown.expect(IllegalArgumentException.class);
-
-        S3ObjectLambdaOperationEndpointBuilder.create()
-                .domain("")
-                .protocol("https")
-                .region("region")
-                .toUri();
-    }
-}
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriberPartCountValidationTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriberPartCountValidationTest.java
new file mode 100644
index 000000000000..8ff1eeac0ad5
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartDownloaderSubscriberPartCountValidationTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.multipart;
+
+
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.reactivestreams.Subscription;
+import software.amazon.awssdk.core.async.AsyncResponseTransformer;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+
+public class MultipartDownloaderSubscriberPartCountValidationTest {
+    @Mock
+    private S3AsyncClient s3Client;
+
+    @Mock
+    private Subscription subscription;
+
+    @Mock
+    private AsyncResponseTransformer<GetObjectResponse, GetObjectResponse> responseTransformer;
+
+    private GetObjectRequest getObjectRequest;
+    private MultipartDownloaderSubscriber subscriber;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+        getObjectRequest = GetObjectRequest.builder()
+                                           .bucket("test-bucket")
+                                           .key("test-key")
+                                           .build();
+    }
+
+    @Test
+    void callCountMatchesTotalParts_shouldPass() throws InterruptedException {
+        subscriber = new MultipartDownloaderSubscriber(s3Client, getObjectRequest);
+        GetObjectResponse response1 = createMockResponse(3, "etag1");
+        GetObjectResponse response2 = createMockResponse(3, "etag2");
+        GetObjectResponse response3 = createMockResponse(3, "etag3");
+
+        CompletableFuture<GetObjectResponse> future1 = CompletableFuture.completedFuture(response1);
+        CompletableFuture<GetObjectResponse> future2 = CompletableFuture.completedFuture(response2);
+        CompletableFuture<GetObjectResponse> future3 = CompletableFuture.completedFuture(response3);
+
+        when(s3Client.getObject(any(GetObjectRequest.class), eq(responseTransformer)))
+            .thenReturn(future1, future2, future3);
+
+        subscriber.onSubscribe(subscription);
+        subscriber.onNext(responseTransformer);
+        subscriber.onNext(responseTransformer);
+        subscriber.onNext(responseTransformer);
+        Thread.sleep(100);
+
+        subscriber.onComplete();
+
+        assertDoesNotThrow(() -> subscriber.future().get(1, TimeUnit.SECONDS));
+    }
+
+    @Test
+    void callCountMoreThanTotalParts_shouldThrowException() throws InterruptedException {
+        subscriber = new MultipartDownloaderSubscriber(s3Client, getObjectRequest, 3);
+        GetObjectResponse response1 = createMockResponse(2, "etag1");
+
+        CompletableFuture<GetObjectResponse> future1 = CompletableFuture.completedFuture(response1);
+
+        when(s3Client.getObject(any(GetObjectRequest.class), eq(responseTransformer)))
+            .thenReturn(future1);
+
+        subscriber.onSubscribe(subscription);
+        subscriber.onNext(responseTransformer);
+        Thread.sleep(100);
+
+        subscriber.onComplete();
+
+        ExecutionException exception = assertThrows(ExecutionException.class,
+                                                    () -> subscriber.future().get(1, TimeUnit.SECONDS));
+        assertTrue(exception.getCause() instanceof SdkClientException);
+        assertTrue(exception.getCause().getMessage().contains("PartsCount validation failed"));
+        assertTrue(exception.getCause().getMessage().contains("Expected 2, downloaded 4 parts"));
+
+    }
+
+    private GetObjectResponse createMockResponse(int partsCount, String etag) {
+        GetObjectResponse.Builder builder = GetObjectResponse.builder()
+                                                             .eTag(etag)
+                                                             .contentLength(1024L);
+
+        builder.partsCount(partsCount);
+        return builder.build();
+    }
+
+}
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java
index 9fd58e6a5fa0..449f245203c9 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java
@@ -34,6 +34,7 @@
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static software.amazon.awssdk.services.s3.internal.multipart.utils.MultipartDownloadTestUtils.internalErrorBody;
 import static software.amazon.awssdk.services.s3.internal.multipart.utils.MultipartDownloadTestUtils.transformersSuppliers;
+import static software.amazon.awssdk.services.s3.multipart.S3MultipartExecutionAttribute.MULTIPART_DOWNLOAD_RESUME_CONTEXT;
 
 import com.github.tomakehurst.wiremock.http.Fault;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
@@ -58,6 +59,7 @@
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.core.SplittingTransformerConfiguration;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
+import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.internal.async.ByteArrayAsyncResponseTransformer;
 import software.amazon.awssdk.core.internal.async.FileAsyncResponseTransformer;
 import software.amazon.awssdk.core.internal.async.InputStreamResponseTransformer;
@@ -67,6 +69,7 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.internal.multipart.utils.MultipartDownloadTestUtils;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.services.s3.model.S3Exception;
 import software.amazon.awssdk.services.s3.utils.AsyncResponseTransformerTestSupplier;
@@ -144,6 +147,47 @@ public <T> void errorOnThirdPart_shouldCompleteExceptionallyOnlyPartsGreaterThan
         }
     }
 
+    @ParameterizedTest
+    @MethodSource("partSizeAndTransformerParams")
+    public <T> void partCountValidationFailure_shouldThrowException(
+        AsyncResponseTransformerTestSupplier<T> supplier,
+        int partSize) {
+
+        // To trigger the partCount failure, the resumeContext is used to initialize the actualGetCount larger than the
+        // totalPart number set in the response. This won't happen in real scenario, just to test if the error can be surfaced
+        // to the user if the validation fails.
+        MultipartDownloadResumeContext resumeContext = new MultipartDownloadResumeContext();
+        resumeContext.addCompletedPart(1);
+        resumeContext.addCompletedPart(2);
+        resumeContext.addCompletedPart(3);
+        resumeContext.addToBytesToLastCompletedParts(3 * partSize);
+
+        GetObjectRequest request = GetObjectRequest.builder()
+                                                   .bucket(BUCKET)
+                                                   .key(KEY)
+                                                   .overrideConfiguration(config -> config
+                                                       .putExecutionAttribute(
+                                                           MULTIPART_DOWNLOAD_RESUME_CONTEXT,
+                                                           resumeContext))
+                                                   .build();
+
+        util.stubForPart(BUCKET, KEY, 4, 2, partSize);
+
+        // Skip the lazy transformer since the error won't surface unless the content is consumed
+        AsyncResponseTransformer<GetObjectResponse, T> transformer = supplier.transformer();
+        if (transformer instanceof InputStreamResponseTransformer || transformer instanceof PublisherAsyncResponseTransformer) {
+            return;
+        }
+
+        assertThatThrownBy(() -> {
+            T res = multipartClient.getObject(request, transformer).join();
+            supplier.body(res);
+        }).isInstanceOf(CompletionException.class)
+          .hasCauseInstanceOf(SdkClientException.class)
+          .hasMessageContaining("PartsCount validation failed. Expected 2, downloaded 4 parts");
+
+    }
+
     @ParameterizedTest
     @MethodSource("nonRetryableResponseTransformers")
     public <T> void errorOnFirstPart_shouldFail(AsyncResponseTransformerTestSupplier<T> supplier) {
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/utils/MultipartDownloadTestUtils.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/utils/MultipartDownloadTestUtils.java
index ac667912a33f..e12a7cee35a0 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/utils/MultipartDownloadTestUtils.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/utils/MultipartDownloadTestUtils.java
@@ -66,6 +66,7 @@ public byte[] stubForPart(String testBucket, String testKey,int part, int totalP
             aResponse()
                 .withHeader("x-amz-mp-parts-count", totalPart + "")
                 .withHeader("ETag", eTag)
+                .withHeader("Content-Length", String.valueOf(body.length))
                 .withBody(body)));
         return body;
     }
diff --git a/services/s3control/pom.xml b/services/s3control/pom.xml
index 4a09ab1097bc..d349092df916 100644
--- a/services/s3control/pom.xml
+++ b/services/s3control/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>s3control</artifactId>
     <name>AWS Java SDK :: Services :: Amazon S3 Control</name>
diff --git a/services/s3control/src/main/resources/codegen-resources/service-2.json b/services/s3control/src/main/resources/codegen-resources/service-2.json
index 6ffc29ea136b..e4a4e3baff92 100644
--- a/services/s3control/src/main/resources/codegen-resources/service-2.json
+++ b/services/s3control/src/main/resources/codegen-resources/service-2.json
@@ -2791,6 +2791,17 @@
       "documentation":"<p>The Amazon Web Services Security Token Service temporary credential that S3 Access Grants vends to grantees and client applications. </p>",
       "sensitive":true
     },
+    "DSSEKMSFilter":{
+      "type":"structure",
+      "members":{
+        "KmsKeyArn":{
+          "shape":"NonEmptyKmsKeyArnString",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the customer managed KMS key to use for the filter to return objects that are encrypted by the specified key. For best performance, we recommend using the <code>KMSKeyArn</code> filter in conjunction with other object metadata filters, like <code>MatchAnyPrefix</code>, <code>CreatedAfter</code>, or <code>MatchAnyStorageClass</code>.</p> <note> <p>You must provide the full KMS Key ARN. You can't use an alias name or alias ARN. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN\"> KMS keys</a> in the <i>Amazon Web Services Key Management Service Developer Guide</i>.</p> </note>",
+          "box":true
+        }
+      },
+      "documentation":"<p>A filter that returns objects that are encrypted by dual-layer server-side encryption with Amazon Web Services Key Management Service (KMS) keys (DSSE-KMS). You can further refine your filtering by optionally providing a KMS Key ARN to create an object list of DSSE-KMS objects with that specific KMS Key ARN.</p>"
+    },
     "DataSourceId":{
       "type":"string",
       "max":191
@@ -4978,6 +4989,10 @@
         "MatchAnyStorageClass":{
           "shape":"StorageClassList",
           "documentation":"<p>If provided, the generated manifest includes only source bucket objects that are stored with the specified storage class.</p>"
+        },
+        "MatchAnyObjectEncryption":{
+          "shape":"ObjectEncryptionFilterList",
+          "documentation":"<p>If provided, the generated object list includes only source bucket objects with the indicated server-side encryption type (SSE-S3, SSE-KMS, DSSE-KMS, SSE-C, or NOT-SSE). If you select SSE-KMS or DSSE-KMS, you can optionally further filter your results by specifying a specific KMS Key ARN. If you select SSE-KMS, you can also optionally further filter your results by Bucket Key enabled status.</p>"
         }
       },
       "documentation":"<p>The filter used to describe a set of objects for the job's manifest.</p>"
@@ -5310,7 +5325,7 @@
         },
         "NoncurrentVersionTransitions":{
           "shape":"NoncurrentVersionTransitionList",
-          "documentation":"<p> Specifies the transition rule for the lifecycle rule that describes when noncurrent objects transition to a specific storage class. If your bucket is versioning-enabled (or versioning is suspended), you can set this action to request that Amazon S3 transition noncurrent object versions to a specific storage class at a set period in the object's lifetime. </p> <note> <p>This is not supported by Amazon S3 on Outposts buckets.</p> </note>"
+          "documentation":"<p> Specifies the transition rule for the lifecycle rule that describes when non-current objects transition to a specific storage class. If your bucket is versioning-enabled (or versioning is suspended), you can set this action to request that Amazon S3 transition noncurrent object versions to a specific storage class at a set period in the object's lifetime. </p> <note> <p>This is not supported by Amazon S3 on Outposts buckets.</p> </note>"
         },
         "NoncurrentVersionExpiration":{
           "shape":"NoncurrentVersionExpiration",
@@ -6379,6 +6394,12 @@
       "exception":true
     },
     "NoSuchPublicAccessBlockConfigurationMessage":{"type":"string"},
+    "NonEmptyKmsKeyArnString":{
+      "type":"string",
+      "max":2000,
+      "min":1,
+      "pattern":"arn:aws[a-zA-Z0-9-]*:kms:[a-z0-9-]+:[0-9]{12}:key/[a-zA-Z0-9-]+"
+    },
     "NonEmptyMaxLength1024String":{
       "type":"string",
       "max":1024,
@@ -6448,8 +6469,54 @@
       "documentation":"<p/>",
       "exception":true
     },
+    "NotSSEFilter":{
+      "type":"structure",
+      "members":{},
+      "documentation":"<p>A filter that returns objects that aren't server-side encrypted.</p>"
+    },
     "ObjectAgeValue":{"type":"integer"},
     "ObjectCreationTime":{"type":"timestamp"},
+    "ObjectEncryptionFilter":{
+      "type":"structure",
+      "members":{
+        "SSES3":{
+          "shape":"SSES3Filter",
+          "documentation":"<p>Filters for objects that are encrypted by server-side encryption with Amazon S3 managed keys (SSE-S3).</p>",
+          "locationName":"SSE-S3"
+        },
+        "SSEKMS":{
+          "shape":"SSEKMSFilter",
+          "documentation":"<p>Filters for objects that are encrypted by server-side encryption with Amazon Web Services Key Management Service (KMS) keys (SSE-KMS).</p>",
+          "locationName":"SSE-KMS"
+        },
+        "DSSEKMS":{
+          "shape":"DSSEKMSFilter",
+          "documentation":"<p>Filters for objects that are encrypted by dual-layer server-side encryption with Amazon Web Services Key Management Service (KMS) keys (DSSE-KMS).</p>",
+          "locationName":"DSSE-KMS"
+        },
+        "SSEC":{
+          "shape":"SSECFilter",
+          "documentation":"<p>Filters for objects that are encrypted by server-side encryption with customer-provided keys (SSE-C).</p>",
+          "locationName":"SSE-C"
+        },
+        "NOTSSE":{
+          "shape":"NotSSEFilter",
+          "documentation":"<p>Filters for objects that are not encrypted by server-side encryption. </p>",
+          "locationName":"NOT-SSE"
+        }
+      },
+      "documentation":"<p>An optional filter for the <code>S3JobManifestGenerator</code> that identifies the subset of objects by encryption type. This filter is used to create an object list for S3 Batch Operations jobs. If provided, this filter will generate an object list that only includes objects with the specified encryption type.</p>",
+      "union":true
+    },
+    "ObjectEncryptionFilterList":{
+      "type":"list",
+      "member":{
+        "shape":"ObjectEncryptionFilter",
+        "locationName":"ObjectEncryption"
+      },
+      "max":1,
+      "min":1
+    },
     "ObjectLambdaAccessPoint":{
       "type":"structure",
       "required":["Name"],
@@ -8178,6 +8245,11 @@
       "value":{"shape":"MaxLength1024String"},
       "max":8192
     },
+    "SSECFilter":{
+      "type":"structure",
+      "members":{},
+      "documentation":"<p>A filter that returns objects that are encrypted by server-side encryption with customer-provided keys (SSE-C).</p>"
+    },
     "SSEKMS":{
       "type":"structure",
       "required":["KeyId"],
@@ -8202,6 +8274,22 @@
       "documentation":"<p>Configuration for the use of SSE-KMS to encrypt generated manifest objects.</p>",
       "locationName":"SSE-KMS"
     },
+    "SSEKMSFilter":{
+      "type":"structure",
+      "members":{
+        "KmsKeyArn":{
+          "shape":"NonEmptyKmsKeyArnString",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the customer managed KMS key to use for the filter to return objects that are encrypted by the specified key. For best performance, we recommend using the <code>KMSKeyArn</code> filter in conjunction with other object metadata filters, like <code>MatchAnyPrefix</code>, <code>CreatedAfter</code>, or <code>MatchAnyStorageClass</code>.</p> <note> <p>You must provide the full KMS Key ARN. You can't use an alias name or alias ARN. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN\"> KMS keys</a> in the <i>Amazon Web Services Key Management Service Developer Guide</i>.</p> </note>",
+          "box":true
+        },
+        "BucketKeyEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether Amazon S3 should use an S3 Bucket Key for object encryption with server-side encryption using Amazon Web Services Key Management Service (Amazon Web Services KMS) keys (SSE-KMS). If specified, will filter SSE-KMS encrypted objects by S3 Bucket Key status. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucket-key.html\">Reducing the cost of SSE-KMS with Amazon S3 Bucket Keys</a> in the <i>Amazon S3 User Guide</i>.</p>",
+          "box":true
+        }
+      },
+      "documentation":"<p>A filter that returns objects that are encrypted by server-side encryption with Amazon Web Services KMS (SSE-KMS).</p>"
+    },
     "SSEKMSKeyId":{"type":"string"},
     "SSES3":{
       "type":"structure",
@@ -8215,6 +8303,11 @@
       "documentation":"<p>Configuration for the use of SSE-S3 to encrypt generated manifest objects.</p>",
       "locationName":"SSE-S3"
     },
+    "SSES3Filter":{
+      "type":"structure",
+      "members":{},
+      "documentation":"<p>A filter that returns objects that are encrypted by server-side encryption with Amazon S3 managed keys (SSE-S3).</p>"
+    },
     "Scope":{
       "type":"structure",
       "members":{
diff --git a/services/s3outposts/pom.xml b/services/s3outposts/pom.xml
index bc4cc3e29809..e3f48285bfd5 100644
--- a/services/s3outposts/pom.xml
+++ b/services/s3outposts/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>s3outposts</artifactId>
     <name>AWS Java SDK :: Services :: S3 Outposts</name>
diff --git a/services/s3tables/pom.xml b/services/s3tables/pom.xml
index 93e780fb8bdd..8fbb8b9f4683 100644
--- a/services/s3tables/pom.xml
+++ b/services/s3tables/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>s3tables</artifactId>
     <name>AWS Java SDK :: Services :: S3 Tables</name>
diff --git a/services/s3vectors/pom.xml b/services/s3vectors/pom.xml
index bf398fe5f7b5..36ebc9bfda14 100644
--- a/services/s3vectors/pom.xml
+++ b/services/s3vectors/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>s3vectors</artifactId>
     <name>AWS Java SDK :: Services :: S3 Vectors</name>
diff --git a/services/sagemaker/pom.xml b/services/sagemaker/pom.xml
index e77e7bfb5074..5d16fd99766b 100644
--- a/services/sagemaker/pom.xml
+++ b/services/sagemaker/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sagemaker</artifactId>
diff --git a/services/sagemakera2iruntime/pom.xml b/services/sagemakera2iruntime/pom.xml
index 818d05687c13..737da3566a80 100644
--- a/services/sagemakera2iruntime/pom.xml
+++ b/services/sagemakera2iruntime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sagemakera2iruntime</artifactId>
     <name>AWS Java SDK :: Services :: SageMaker A2I Runtime</name>
diff --git a/services/sagemakeredge/pom.xml b/services/sagemakeredge/pom.xml
index 5982522fdb6a..4b61296102e5 100644
--- a/services/sagemakeredge/pom.xml
+++ b/services/sagemakeredge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sagemakeredge</artifactId>
     <name>AWS Java SDK :: Services :: Sagemaker Edge</name>
diff --git a/services/sagemakerfeaturestoreruntime/pom.xml b/services/sagemakerfeaturestoreruntime/pom.xml
index db6f50941111..f1597c201f09 100644
--- a/services/sagemakerfeaturestoreruntime/pom.xml
+++ b/services/sagemakerfeaturestoreruntime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sagemakerfeaturestoreruntime</artifactId>
     <name>AWS Java SDK :: Services :: Sage Maker Feature Store Runtime</name>
diff --git a/services/sagemakergeospatial/pom.xml b/services/sagemakergeospatial/pom.xml
index 66fe7266ed60..d51c2672632b 100644
--- a/services/sagemakergeospatial/pom.xml
+++ b/services/sagemakergeospatial/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sagemakergeospatial</artifactId>
     <name>AWS Java SDK :: Services :: Sage Maker Geospatial</name>
diff --git a/services/sagemakermetrics/pom.xml b/services/sagemakermetrics/pom.xml
index bed1370bf3a8..d5ddc08bc46e 100644
--- a/services/sagemakermetrics/pom.xml
+++ b/services/sagemakermetrics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sagemakermetrics</artifactId>
     <name>AWS Java SDK :: Services :: Sage Maker Metrics</name>
diff --git a/services/sagemakerruntime/pom.xml b/services/sagemakerruntime/pom.xml
index cda91dc1df24..c2b9accd4185 100644
--- a/services/sagemakerruntime/pom.xml
+++ b/services/sagemakerruntime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sagemakerruntime</artifactId>
     <name>AWS Java SDK :: Services :: SageMaker Runtime</name>
diff --git a/services/savingsplans/pom.xml b/services/savingsplans/pom.xml
index 26152e93fe43..8c77b19cd2d0 100644
--- a/services/savingsplans/pom.xml
+++ b/services/savingsplans/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>savingsplans</artifactId>
     <name>AWS Java SDK :: Services :: Savingsplans</name>
diff --git a/services/scheduler/pom.xml b/services/scheduler/pom.xml
index 8b2f5919bf33..3641b6cf15a6 100644
--- a/services/scheduler/pom.xml
+++ b/services/scheduler/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>scheduler</artifactId>
     <name>AWS Java SDK :: Services :: Scheduler</name>
diff --git a/services/schemas/pom.xml b/services/schemas/pom.xml
index 3ce237ae3c2e..ec47945c8656 100644
--- a/services/schemas/pom.xml
+++ b/services/schemas/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>schemas</artifactId>
     <name>AWS Java SDK :: Services :: Schemas</name>
diff --git a/services/secretsmanager/pom.xml b/services/secretsmanager/pom.xml
index 5365b7a27ea3..678d9ff9dbd9 100644
--- a/services/secretsmanager/pom.xml
+++ b/services/secretsmanager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>secretsmanager</artifactId>
     <name>AWS Java SDK :: Services :: AWS Secrets Manager</name>
diff --git a/services/securityhub/pom.xml b/services/securityhub/pom.xml
index d813399df0e6..803160aae8c9 100644
--- a/services/securityhub/pom.xml
+++ b/services/securityhub/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>securityhub</artifactId>
     <name>AWS Java SDK :: Services :: SecurityHub</name>
diff --git a/services/securityir/pom.xml b/services/securityir/pom.xml
index 02f5bf5ccabc..3b7f12fe24aa 100644
--- a/services/securityir/pom.xml
+++ b/services/securityir/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>securityir</artifactId>
     <name>AWS Java SDK :: Services :: Security IR</name>
diff --git a/services/securitylake/pom.xml b/services/securitylake/pom.xml
index e40d7a3c64a5..bd30efe742e6 100644
--- a/services/securitylake/pom.xml
+++ b/services/securitylake/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>securitylake</artifactId>
     <name>AWS Java SDK :: Services :: Security Lake</name>
diff --git a/services/serverlessapplicationrepository/pom.xml b/services/serverlessapplicationrepository/pom.xml
index 2acc96a604a6..c296d21499e6 100644
--- a/services/serverlessapplicationrepository/pom.xml
+++ b/services/serverlessapplicationrepository/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>serverlessapplicationrepository</artifactId>
diff --git a/services/servicecatalog/pom.xml b/services/servicecatalog/pom.xml
index 046cda20770f..9fe7955e41f2 100644
--- a/services/servicecatalog/pom.xml
+++ b/services/servicecatalog/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>servicecatalog</artifactId>
     <name>AWS Java SDK :: Services :: AWS Service Catalog</name>
diff --git a/services/servicecatalogappregistry/pom.xml b/services/servicecatalogappregistry/pom.xml
index 4220885451b2..032ccdde4874 100644
--- a/services/servicecatalogappregistry/pom.xml
+++ b/services/servicecatalogappregistry/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>servicecatalogappregistry</artifactId>
     <name>AWS Java SDK :: Services :: Service Catalog App Registry</name>
diff --git a/services/servicediscovery/pom.xml b/services/servicediscovery/pom.xml
index 3e40c8438e90..6936cc5ef4d2 100644
--- a/services/servicediscovery/pom.xml
+++ b/services/servicediscovery/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>servicediscovery</artifactId>
diff --git a/services/servicequotas/pom.xml b/services/servicequotas/pom.xml
index d0565c95f10d..67977aa1c589 100644
--- a/services/servicequotas/pom.xml
+++ b/services/servicequotas/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>servicequotas</artifactId>
     <name>AWS Java SDK :: Services :: Service Quotas</name>
diff --git a/services/ses/pom.xml b/services/ses/pom.xml
index 9535a66732b3..61c0d8b15025 100644
--- a/services/ses/pom.xml
+++ b/services/ses/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ses</artifactId>
     <name>AWS Java SDK :: Services :: Amazon SES</name>
diff --git a/services/sesv2/pom.xml b/services/sesv2/pom.xml
index 9b535dd2d208..edc7f1bbfbcd 100644
--- a/services/sesv2/pom.xml
+++ b/services/sesv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sesv2</artifactId>
     <name>AWS Java SDK :: Services :: SESv2</name>
diff --git a/services/sfn/pom.xml b/services/sfn/pom.xml
index b33b6956e528..be9114cf7fdf 100644
--- a/services/sfn/pom.xml
+++ b/services/sfn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sfn</artifactId>
     <name>AWS Java SDK :: Services :: AWS Step Functions</name>
diff --git a/services/shield/pom.xml b/services/shield/pom.xml
index d909982055e8..67e027fa9cfd 100644
--- a/services/shield/pom.xml
+++ b/services/shield/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>shield</artifactId>
     <name>AWS Java SDK :: Services :: AWS Shield</name>
diff --git a/services/signer/pom.xml b/services/signer/pom.xml
index df2f8a06ac32..662a4268b07a 100644
--- a/services/signer/pom.xml
+++ b/services/signer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>signer</artifactId>
     <name>AWS Java SDK :: Services :: Signer</name>
diff --git a/services/simspaceweaver/pom.xml b/services/simspaceweaver/pom.xml
index d36c6ed6a71b..62d9e66542dc 100644
--- a/services/simspaceweaver/pom.xml
+++ b/services/simspaceweaver/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>simspaceweaver</artifactId>
     <name>AWS Java SDK :: Services :: Sim Space Weaver</name>
diff --git a/services/sms/build.properties b/services/sms/build.properties
deleted file mode 100644
index 15ec2da1fc71..000000000000
--- a/services/sms/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-#
-#  http://aws.amazon.com/apache2.0
-#
-# or in the "license" file accompanying this file. This file 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.
-#
-
-source.. = src/main/java,\
-           src/main/resources
-output.. = bin/
-
-bin.includes = LICENSE.txt,\
-               NOTICE.txt,\
-               META-INF/,\
-               .
-
-jre.compilation.profile = JavaSE-1.6
diff --git a/services/sms/src/main/resources/codegen-resources/customization.config b/services/sms/src/main/resources/codegen-resources/customization.config
deleted file mode 100644
index 24fda7b429ef..000000000000
--- a/services/sms/src/main/resources/codegen-resources/customization.config
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "verifiedSimpleMethods": [
-        "deleteServerCatalog",
-        "importServerCatalog",
-        "getAppLaunchConfiguration",
-        "getAppReplicationConfiguration",
-        "getApp",
-        "getConnectors",
-        "getReplicationJobs",
-        "getServers",
-        "listApps"
-    ],
-    "enableGenerateCompiledEndpointRules": true
-}
diff --git a/services/sms/src/main/resources/codegen-resources/endpoint-rule-set.json b/services/sms/src/main/resources/codegen-resources/endpoint-rule-set.json
deleted file mode 100644
index 3083f09e0ace..000000000000
--- a/services/sms/src/main/resources/codegen-resources/endpoint-rule-set.json
+++ /dev/null
@@ -1,350 +0,0 @@
-{
-    "version": "1.0",
-    "parameters": {
-        "Region": {
-            "builtIn": "AWS::Region",
-            "required": false,
-            "documentation": "The AWS region used to dispatch the request.",
-            "type": "String"
-        },
-        "UseDualStack": {
-            "builtIn": "AWS::UseDualStack",
-            "required": true,
-            "default": false,
-            "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.",
-            "type": "Boolean"
-        },
-        "UseFIPS": {
-            "builtIn": "AWS::UseFIPS",
-            "required": true,
-            "default": false,
-            "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.",
-            "type": "Boolean"
-        },
-        "Endpoint": {
-            "builtIn": "SDK::Endpoint",
-            "required": false,
-            "documentation": "Override the endpoint used to send this request",
-            "type": "String"
-        }
-    },
-    "rules": [
-        {
-            "conditions": [
-                {
-                    "fn": "isSet",
-                    "argv": [
-                        {
-                            "ref": "Endpoint"
-                        }
-                    ]
-                }
-            ],
-            "type": "tree",
-            "rules": [
-                {
-                    "conditions": [
-                        {
-                            "fn": "booleanEquals",
-                            "argv": [
-                                {
-                                    "ref": "UseFIPS"
-                                },
-                                true
-                            ]
-                        }
-                    ],
-                    "error": "Invalid Configuration: FIPS and custom endpoint are not supported",
-                    "type": "error"
-                },
-                {
-                    "conditions": [],
-                    "type": "tree",
-                    "rules": [
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "booleanEquals",
-                                    "argv": [
-                                        {
-                                            "ref": "UseDualStack"
-                                        },
-                                        true
-                                    ]
-                                }
-                            ],
-                            "error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
-                            "type": "error"
-                        },
-                        {
-                            "conditions": [],
-                            "endpoint": {
-                                "url": {
-                                    "ref": "Endpoint"
-                                },
-                                "properties": {},
-                                "headers": {}
-                            },
-                            "type": "endpoint"
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "conditions": [],
-            "type": "tree",
-            "rules": [
-                {
-                    "conditions": [
-                        {
-                            "fn": "isSet",
-                            "argv": [
-                                {
-                                    "ref": "Region"
-                                }
-                            ]
-                        }
-                    ],
-                    "type": "tree",
-                    "rules": [
-                        {
-                            "conditions": [
-                                {
-                                    "fn": "aws.partition",
-                                    "argv": [
-                                        {
-                                            "ref": "Region"
-                                        }
-                                    ],
-                                    "assign": "PartitionResult"
-                                }
-                            ],
-                            "type": "tree",
-                            "rules": [
-                                {
-                                    "conditions": [
-                                        {
-                                            "fn": "booleanEquals",
-                                            "argv": [
-                                                {
-                                                    "ref": "UseFIPS"
-                                                },
-                                                true
-                                            ]
-                                        },
-                                        {
-                                            "fn": "booleanEquals",
-                                            "argv": [
-                                                {
-                                                    "ref": "UseDualStack"
-                                                },
-                                                true
-                                            ]
-                                        }
-                                    ],
-                                    "type": "tree",
-                                    "rules": [
-                                        {
-                                            "conditions": [
-                                                {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsFIPS"
-                                                            ]
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsDualStack"
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "type": "tree",
-                                            "rules": [
-                                                {
-                                                    "conditions": [],
-                                                    "type": "tree",
-                                                    "rules": [
-                                                        {
-                                                            "conditions": [],
-                                                            "endpoint": {
-                                                                "url": "https://sms-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "conditions": [],
-                                            "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
-                                            "type": "error"
-                                        }
-                                    ]
-                                },
-                                {
-                                    "conditions": [
-                                        {
-                                            "fn": "booleanEquals",
-                                            "argv": [
-                                                {
-                                                    "ref": "UseFIPS"
-                                                },
-                                                true
-                                            ]
-                                        }
-                                    ],
-                                    "type": "tree",
-                                    "rules": [
-                                        {
-                                            "conditions": [
-                                                {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsFIPS"
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "type": "tree",
-                                            "rules": [
-                                                {
-                                                    "conditions": [],
-                                                    "type": "tree",
-                                                    "rules": [
-                                                        {
-                                                            "conditions": [],
-                                                            "endpoint": {
-                                                                "url": "https://sms-fips.{Region}.{PartitionResult#dnsSuffix}",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "conditions": [],
-                                            "error": "FIPS is enabled but this partition does not support FIPS",
-                                            "type": "error"
-                                        }
-                                    ]
-                                },
-                                {
-                                    "conditions": [
-                                        {
-                                            "fn": "booleanEquals",
-                                            "argv": [
-                                                {
-                                                    "ref": "UseDualStack"
-                                                },
-                                                true
-                                            ]
-                                        }
-                                    ],
-                                    "type": "tree",
-                                    "rules": [
-                                        {
-                                            "conditions": [
-                                                {
-                                                    "fn": "booleanEquals",
-                                                    "argv": [
-                                                        true,
-                                                        {
-                                                            "fn": "getAttr",
-                                                            "argv": [
-                                                                {
-                                                                    "ref": "PartitionResult"
-                                                                },
-                                                                "supportsDualStack"
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            "type": "tree",
-                                            "rules": [
-                                                {
-                                                    "conditions": [],
-                                                    "type": "tree",
-                                                    "rules": [
-                                                        {
-                                                            "conditions": [],
-                                                            "endpoint": {
-                                                                "url": "https://sms.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                                                                "properties": {},
-                                                                "headers": {}
-                                                            },
-                                                            "type": "endpoint"
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "conditions": [],
-                                            "error": "DualStack is enabled but this partition does not support DualStack",
-                                            "type": "error"
-                                        }
-                                    ]
-                                },
-                                {
-                                    "conditions": [],
-                                    "type": "tree",
-                                    "rules": [
-                                        {
-                                            "conditions": [],
-                                            "endpoint": {
-                                                "url": "https://sms.{Region}.{PartitionResult#dnsSuffix}",
-                                                "properties": {},
-                                                "headers": {}
-                                            },
-                                            "type": "endpoint"
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "conditions": [],
-                    "error": "Invalid Configuration: Missing Region",
-                    "type": "error"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/services/sms/src/main/resources/codegen-resources/endpoint-tests.json b/services/sms/src/main/resources/codegen-resources/endpoint-tests.json
deleted file mode 100644
index df31573ec734..000000000000
--- a/services/sms/src/main/resources/codegen-resources/endpoint-tests.json
+++ /dev/null
@@ -1,639 +0,0 @@
-{
-    "testCases": [
-        {
-            "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.af-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "af-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.ap-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.ap-northeast-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.ap-northeast-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-northeast-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.ap-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.ap-southeast-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.ap-southeast-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ap-southeast-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.ca-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "ca-central-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.eu-central-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-central-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.eu-north-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-north-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.eu-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.eu-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-west-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.eu-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-west-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.eu-west-3.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "eu-west-3",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.me-south-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "me-south-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.sa-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "sa-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-east-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-east-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-2",
-                "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-west-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-west-1",
-                "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-west-2",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-west-2.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-west-2",
-                "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": true,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.cn-north-1.amazonaws.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.cn-northwest-1.amazonaws.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-northwest-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.cn-north-1.api.amazonwebservices.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseFIPS": true,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.cn-north-1.amazonaws.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.cn-north-1.api.amazonwebservices.com.cn"
-                }
-            },
-            "params": {
-                "Region": "cn-north-1",
-                "UseFIPS": false,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-gov-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-gov-east-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-gov-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-gov-west-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-gov-west-1.amazonaws.com"
-                }
-            },
-            "params": {
-                "Region": "us-gov-west-1",
-                "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseFIPS": true,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-gov-east-1.api.aws"
-                }
-            },
-            "params": {
-                "Region": "us-gov-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "error": "FIPS and DualStack are enabled, but this partition does not support one or both"
-            },
-            "params": {
-                "Region": "us-iso-east-1",
-                "UseFIPS": true,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-iso-east-1.c2s.ic.gov"
-                }
-            },
-            "params": {
-                "Region": "us-iso-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "error": "DualStack is enabled but this partition does not support DualStack"
-            },
-            "params": {
-                "Region": "us-iso-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-iso-east-1.c2s.ic.gov"
-                }
-            },
-            "params": {
-                "Region": "us-iso-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled",
-            "expect": {
-                "error": "FIPS and DualStack are enabled, but this partition does not support one or both"
-            },
-            "params": {
-                "Region": "us-isob-east-1",
-                "UseFIPS": true,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms-fips.us-isob-east-1.sc2s.sgov.gov"
-                }
-            },
-            "params": {
-                "Region": "us-isob-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled",
-            "expect": {
-                "error": "DualStack is enabled but this partition does not support DualStack"
-            },
-            "params": {
-                "Region": "us-isob-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true
-            }
-        },
-        {
-            "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://sms.us-isob-east-1.sc2s.sgov.gov"
-                }
-            },
-            "params": {
-                "Region": "us-isob-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false
-            }
-        },
-        {
-            "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://example.com"
-                }
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Endpoint": "https://example.com"
-            }
-        },
-        {
-            "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled",
-            "expect": {
-                "endpoint": {
-                    "url": "https://example.com"
-                }
-            },
-            "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Endpoint": "https://example.com"
-            }
-        },
-        {
-            "documentation": "For custom endpoint with fips enabled and dualstack disabled",
-            "expect": {
-                "error": "Invalid Configuration: FIPS and custom endpoint are not supported"
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": true,
-                "UseDualStack": false,
-                "Endpoint": "https://example.com"
-            }
-        },
-        {
-            "documentation": "For custom endpoint with fips disabled and dualstack enabled",
-            "expect": {
-                "error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
-            },
-            "params": {
-                "Region": "us-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Endpoint": "https://example.com"
-            }
-        },
-        {
-            "documentation": "Missing region",
-            "expect": {
-                "error": "Invalid Configuration: Missing Region"
-            }
-        }
-    ],
-    "version": "1.0"
-}
\ No newline at end of file
diff --git a/services/sms/src/main/resources/codegen-resources/examples-1.json b/services/sms/src/main/resources/codegen-resources/examples-1.json
deleted file mode 100644
index 0ea7e3b0bbe9..000000000000
--- a/services/sms/src/main/resources/codegen-resources/examples-1.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "1.0",
-  "examples": {
-  }
-}
diff --git a/services/sms/src/main/resources/codegen-resources/paginators-1.json b/services/sms/src/main/resources/codegen-resources/paginators-1.json
deleted file mode 100644
index 23528a0156c7..000000000000
--- a/services/sms/src/main/resources/codegen-resources/paginators-1.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "pagination": {
-    "GetConnectors": {
-      "input_token": "nextToken",
-      "limit_key": "maxResults",
-      "output_token": "nextToken",
-      "result_key": "connectorList"
-    },
-    "GetReplicationJobs": {
-      "input_token": "nextToken",
-      "limit_key": "maxResults",
-      "output_token": "nextToken",
-      "result_key": "replicationJobList"
-    },
-    "GetReplicationRuns": {
-      "input_token": "nextToken",
-      "limit_key": "maxResults",
-      "output_token": "nextToken",
-      "result_key": "replicationRunList"
-    },
-    "GetServers": {
-      "input_token": "nextToken",
-      "limit_key": "maxResults",
-      "output_token": "nextToken",
-      "result_key": "serverList"
-    }
-  }
-}
\ No newline at end of file
diff --git a/services/sms/src/main/resources/codegen-resources/service-2.json b/services/sms/src/main/resources/codegen-resources/service-2.json
deleted file mode 100644
index 32df9040fa06..000000000000
--- a/services/sms/src/main/resources/codegen-resources/service-2.json
+++ /dev/null
@@ -1,2613 +0,0 @@
-{
-  "version":"2.0",
-  "metadata":{
-    "apiVersion":"2016-10-24",
-    "endpointPrefix":"sms",
-    "jsonVersion":"1.1",
-    "protocol":"json",
-    "serviceAbbreviation":"SMS",
-    "serviceFullName":"AWS Server Migration Service",
-    "serviceId":"SMS",
-    "signatureVersion":"v4",
-    "targetPrefix":"AWSServerMigrationService_V2016_10_24",
-    "uid":"sms-2016-10-24"
-  },
-  "operations":{
-    "CreateApp":{
-      "name":"CreateApp",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"CreateAppRequest"},
-      "output":{"shape":"CreateAppResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Creates an application. An application consists of one or more server groups. Each server group contain one or more servers.</p>"
-    },
-    "CreateReplicationJob":{
-      "name":"CreateReplicationJob",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"CreateReplicationJobRequest"},
-      "output":{"shape":"CreateReplicationJobResponse"},
-      "errors":[
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"OperationNotPermittedException"},
-        {"shape":"ServerCannotBeReplicatedException"},
-        {"shape":"ReplicationJobAlreadyExistsException"},
-        {"shape":"NoConnectorsAvailableException"},
-        {"shape":"InternalError"},
-        {"shape":"TemporarilyUnavailableException"}
-      ],
-      "documentation":"<p>Creates a replication job. The replication job schedules periodic replication runs to replicate your server to Amazon Web Services. Each replication run creates an Amazon Machine Image (AMI).</p>"
-    },
-    "DeleteApp":{
-      "name":"DeleteApp",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeleteAppRequest"},
-      "output":{"shape":"DeleteAppResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Deletes the specified application. Optionally deletes the launched stack associated with the application and all Server Migration Service replication jobs for servers in the application.</p>"
-    },
-    "DeleteAppLaunchConfiguration":{
-      "name":"DeleteAppLaunchConfiguration",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeleteAppLaunchConfigurationRequest"},
-      "output":{"shape":"DeleteAppLaunchConfigurationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Deletes the launch configuration for the specified application.</p>"
-    },
-    "DeleteAppReplicationConfiguration":{
-      "name":"DeleteAppReplicationConfiguration",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeleteAppReplicationConfigurationRequest"},
-      "output":{"shape":"DeleteAppReplicationConfigurationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Deletes the replication configuration for the specified application.</p>"
-    },
-    "DeleteAppValidationConfiguration":{
-      "name":"DeleteAppValidationConfiguration",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeleteAppValidationConfigurationRequest"},
-      "output":{"shape":"DeleteAppValidationConfigurationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Deletes the validation configuration for the specified application.</p>"
-    },
-    "DeleteReplicationJob":{
-      "name":"DeleteReplicationJob",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeleteReplicationJobRequest"},
-      "output":{"shape":"DeleteReplicationJobResponse"},
-      "errors":[
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"OperationNotPermittedException"},
-        {"shape":"ReplicationJobNotFoundException"}
-      ],
-      "documentation":"<p>Deletes the specified replication job.</p> <p>After you delete a replication job, there are no further replication runs. Amazon Web Services deletes the contents of the Amazon S3 bucket used to store Server Migration Service artifacts. The AMIs created by the replication runs are not deleted.</p>"
-    },
-    "DeleteServerCatalog":{
-      "name":"DeleteServerCatalog",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DeleteServerCatalogRequest"},
-      "output":{"shape":"DeleteServerCatalogResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"OperationNotPermittedException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"}
-      ],
-      "documentation":"<p>Deletes all servers from your server catalog.</p>"
-    },
-    "DisassociateConnector":{
-      "name":"DisassociateConnector",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"DisassociateConnectorRequest"},
-      "output":{"shape":"DisassociateConnectorResponse"},
-      "errors":[
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"OperationNotPermittedException"},
-        {"shape":"InvalidParameterException"}
-      ],
-      "documentation":"<p>Disassociates the specified connector from Server Migration Service.</p> <p>After you disassociate a connector, it is no longer available to support replication jobs.</p>"
-    },
-    "GenerateChangeSet":{
-      "name":"GenerateChangeSet",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GenerateChangeSetRequest"},
-      "output":{"shape":"GenerateChangeSetResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Generates a target change set for a currently launched stack and writes it to an Amazon S3 object in the customer’s Amazon S3 bucket.</p>"
-    },
-    "GenerateTemplate":{
-      "name":"GenerateTemplate",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GenerateTemplateRequest"},
-      "output":{"shape":"GenerateTemplateResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Generates an CloudFormation template based on the current launch configuration and writes it to an Amazon S3 object in the customer’s Amazon S3 bucket.</p>"
-    },
-    "GetApp":{
-      "name":"GetApp",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetAppRequest"},
-      "output":{"shape":"GetAppResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Retrieve information about the specified application.</p>"
-    },
-    "GetAppLaunchConfiguration":{
-      "name":"GetAppLaunchConfiguration",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetAppLaunchConfigurationRequest"},
-      "output":{"shape":"GetAppLaunchConfigurationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Retrieves the application launch configuration associated with the specified application.</p>"
-    },
-    "GetAppReplicationConfiguration":{
-      "name":"GetAppReplicationConfiguration",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetAppReplicationConfigurationRequest"},
-      "output":{"shape":"GetAppReplicationConfigurationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Retrieves the application replication configuration associated with the specified application.</p>"
-    },
-    "GetAppValidationConfiguration":{
-      "name":"GetAppValidationConfiguration",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetAppValidationConfigurationRequest"},
-      "output":{"shape":"GetAppValidationConfigurationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Retrieves information about a configuration for validating an application.</p>"
-    },
-    "GetAppValidationOutput":{
-      "name":"GetAppValidationOutput",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetAppValidationOutputRequest"},
-      "output":{"shape":"GetAppValidationOutputResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Retrieves output from validating an application.</p>"
-    },
-    "GetConnectors":{
-      "name":"GetConnectors",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetConnectorsRequest"},
-      "output":{"shape":"GetConnectorsResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"}
-      ],
-      "documentation":"<p>Describes the connectors registered with the Server Migration Service.</p>"
-    },
-    "GetReplicationJobs":{
-      "name":"GetReplicationJobs",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetReplicationJobsRequest"},
-      "output":{"shape":"GetReplicationJobsResponse"},
-      "errors":[
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"UnauthorizedOperationException"}
-      ],
-      "documentation":"<p>Describes the specified replication job or all of your replication jobs.</p>"
-    },
-    "GetReplicationRuns":{
-      "name":"GetReplicationRuns",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetReplicationRunsRequest"},
-      "output":{"shape":"GetReplicationRunsResponse"},
-      "errors":[
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"UnauthorizedOperationException"}
-      ],
-      "documentation":"<p>Describes the replication runs for the specified replication job.</p>"
-    },
-    "GetServers":{
-      "name":"GetServers",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"GetServersRequest"},
-      "output":{"shape":"GetServersResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"}
-      ],
-      "documentation":"<p>Describes the servers in your server catalog.</p> <p>Before you can describe your servers, you must import them using <a>ImportServerCatalog</a>.</p>"
-    },
-    "ImportAppCatalog":{
-      "name":"ImportAppCatalog",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ImportAppCatalogRequest"},
-      "output":{"shape":"ImportAppCatalogResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Allows application import from Migration Hub.</p>"
-    },
-    "ImportServerCatalog":{
-      "name":"ImportServerCatalog",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ImportServerCatalogRequest"},
-      "output":{"shape":"ImportServerCatalogResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"OperationNotPermittedException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"NoConnectorsAvailableException"}
-      ],
-      "documentation":"<p>Gathers a complete list of on-premises servers. Connectors must be installed and monitoring all servers to import.</p> <p>This call returns immediately, but might take additional time to retrieve all the servers.</p>"
-    },
-    "LaunchApp":{
-      "name":"LaunchApp",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"LaunchAppRequest"},
-      "output":{"shape":"LaunchAppResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Launches the specified application as a stack in CloudFormation.</p>"
-    },
-    "ListApps":{
-      "name":"ListApps",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"ListAppsRequest"},
-      "output":{"shape":"ListAppsResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Retrieves summaries for all applications.</p>"
-    },
-    "NotifyAppValidationOutput":{
-      "name":"NotifyAppValidationOutput",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"NotifyAppValidationOutputRequest"},
-      "output":{"shape":"NotifyAppValidationOutputResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Provides information to Server Migration Service about whether application validation is successful.</p>"
-    },
-    "PutAppLaunchConfiguration":{
-      "name":"PutAppLaunchConfiguration",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"PutAppLaunchConfigurationRequest"},
-      "output":{"shape":"PutAppLaunchConfigurationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Creates or updates the launch configuration for the specified application.</p>"
-    },
-    "PutAppReplicationConfiguration":{
-      "name":"PutAppReplicationConfiguration",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"PutAppReplicationConfigurationRequest"},
-      "output":{"shape":"PutAppReplicationConfigurationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Creates or updates the replication configuration for the specified application.</p>"
-    },
-    "PutAppValidationConfiguration":{
-      "name":"PutAppValidationConfiguration",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"PutAppValidationConfigurationRequest"},
-      "output":{"shape":"PutAppValidationConfigurationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Creates or updates a validation configuration for the specified application.</p>"
-    },
-    "StartAppReplication":{
-      "name":"StartAppReplication",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"StartAppReplicationRequest"},
-      "output":{"shape":"StartAppReplicationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Starts replicating the specified application by creating replication jobs for each server in the application.</p>"
-    },
-    "StartOnDemandAppReplication":{
-      "name":"StartOnDemandAppReplication",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"StartOnDemandAppReplicationRequest"},
-      "output":{"shape":"StartOnDemandAppReplicationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Starts an on-demand replication run for the specified application.</p>"
-    },
-    "StartOnDemandReplicationRun":{
-      "name":"StartOnDemandReplicationRun",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"StartOnDemandReplicationRunRequest"},
-      "output":{"shape":"StartOnDemandReplicationRunResponse"},
-      "errors":[
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"OperationNotPermittedException"},
-        {"shape":"ReplicationRunLimitExceededException"},
-        {"shape":"DryRunOperationException"}
-      ],
-      "documentation":"<p>Starts an on-demand replication run for the specified replication job. This replication run starts immediately. This replication run is in addition to the ones already scheduled.</p> <p>There is a limit on the number of on-demand replications runs that you can request in a 24-hour period.</p>"
-    },
-    "StopAppReplication":{
-      "name":"StopAppReplication",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"StopAppReplicationRequest"},
-      "output":{"shape":"StopAppReplicationResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Stops replicating the specified application by deleting the replication job for each server in the application.</p>"
-    },
-    "TerminateApp":{
-      "name":"TerminateApp",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"TerminateAppRequest"},
-      "output":{"shape":"TerminateAppResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Terminates the stack for the specified application.</p>"
-    },
-    "UpdateApp":{
-      "name":"UpdateApp",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"UpdateAppRequest"},
-      "output":{"shape":"UpdateAppResponse"},
-      "errors":[
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"InternalError"},
-        {"shape":"OperationNotPermittedException"}
-      ],
-      "documentation":"<p>Updates the specified application.</p>"
-    },
-    "UpdateReplicationJob":{
-      "name":"UpdateReplicationJob",
-      "http":{
-        "method":"POST",
-        "requestUri":"/"
-      },
-      "input":{"shape":"UpdateReplicationJobRequest"},
-      "output":{"shape":"UpdateReplicationJobResponse"},
-      "errors":[
-        {"shape":"InvalidParameterException"},
-        {"shape":"MissingRequiredParameterException"},
-        {"shape":"OperationNotPermittedException"},
-        {"shape":"UnauthorizedOperationException"},
-        {"shape":"ServerCannotBeReplicatedException"},
-        {"shape":"ReplicationJobNotFoundException"},
-        {"shape":"InternalError"},
-        {"shape":"TemporarilyUnavailableException"}
-      ],
-      "documentation":"<p>Updates the specified settings for the specified replication job.</p>"
-    }
-  },
-  "shapes":{
-    "AmiId":{"type":"string"},
-    "AppDescription":{"type":"string"},
-    "AppId":{"type":"string"},
-    "AppIdWithValidation":{
-      "type":"string",
-      "pattern":"^app-[0-9a-f]{17}$"
-    },
-    "AppIds":{
-      "type":"list",
-      "member":{"shape":"AppId"}
-    },
-    "AppLaunchConfigurationStatus":{
-      "type":"string",
-      "enum":[
-        "NOT_CONFIGURED",
-        "CONFIGURED"
-      ]
-    },
-    "AppLaunchStatus":{
-      "type":"string",
-      "enum":[
-        "READY_FOR_CONFIGURATION",
-        "CONFIGURATION_IN_PROGRESS",
-        "CONFIGURATION_INVALID",
-        "READY_FOR_LAUNCH",
-        "VALIDATION_IN_PROGRESS",
-        "LAUNCH_PENDING",
-        "LAUNCH_IN_PROGRESS",
-        "LAUNCHED",
-        "PARTIALLY_LAUNCHED",
-        "DELTA_LAUNCH_IN_PROGRESS",
-        "DELTA_LAUNCH_FAILED",
-        "LAUNCH_FAILED",
-        "TERMINATE_IN_PROGRESS",
-        "TERMINATE_FAILED",
-        "TERMINATED"
-      ]
-    },
-    "AppLaunchStatusMessage":{"type":"string"},
-    "AppName":{"type":"string"},
-    "AppReplicationConfigurationStatus":{
-      "type":"string",
-      "enum":[
-        "NOT_CONFIGURED",
-        "CONFIGURED"
-      ]
-    },
-    "AppReplicationStatus":{
-      "type":"string",
-      "enum":[
-        "READY_FOR_CONFIGURATION",
-        "CONFIGURATION_IN_PROGRESS",
-        "CONFIGURATION_INVALID",
-        "READY_FOR_REPLICATION",
-        "VALIDATION_IN_PROGRESS",
-        "REPLICATION_PENDING",
-        "REPLICATION_IN_PROGRESS",
-        "REPLICATED",
-        "PARTIALLY_REPLICATED",
-        "DELTA_REPLICATION_IN_PROGRESS",
-        "DELTA_REPLICATED",
-        "DELTA_REPLICATION_FAILED",
-        "REPLICATION_FAILED",
-        "REPLICATION_STOPPING",
-        "REPLICATION_STOP_FAILED",
-        "REPLICATION_STOPPED"
-      ]
-    },
-    "AppReplicationStatusMessage":{"type":"string"},
-    "AppStatus":{
-      "type":"string",
-      "enum":[
-        "CREATING",
-        "ACTIVE",
-        "UPDATING",
-        "DELETING",
-        "DELETED",
-        "DELETE_FAILED"
-      ]
-    },
-    "AppStatusMessage":{"type":"string"},
-    "AppSummary":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The unique ID of the application.</p>"
-        },
-        "importedAppId":{
-          "shape":"ImportedAppId",
-          "documentation":"<p>The ID of the application.</p>"
-        },
-        "name":{
-          "shape":"AppName",
-          "documentation":"<p>The name of the application.</p>"
-        },
-        "description":{
-          "shape":"AppDescription",
-          "documentation":"<p>The description of the application.</p>"
-        },
-        "status":{
-          "shape":"AppStatus",
-          "documentation":"<p>Status of the application.</p>"
-        },
-        "statusMessage":{
-          "shape":"AppStatusMessage",
-          "documentation":"<p>A message related to the status of the application</p>"
-        },
-        "replicationConfigurationStatus":{
-          "shape":"AppReplicationConfigurationStatus",
-          "documentation":"<p>Status of the replication configuration.</p>"
-        },
-        "replicationStatus":{
-          "shape":"AppReplicationStatus",
-          "documentation":"<p>The replication status of the application.</p>"
-        },
-        "replicationStatusMessage":{
-          "shape":"AppReplicationStatusMessage",
-          "documentation":"<p>A message related to the replication status of the application.</p>"
-        },
-        "latestReplicationTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The timestamp of the application's most recent successful replication.</p>"
-        },
-        "launchConfigurationStatus":{
-          "shape":"AppLaunchConfigurationStatus",
-          "documentation":"<p>Status of the launch configuration.</p>"
-        },
-        "launchStatus":{
-          "shape":"AppLaunchStatus",
-          "documentation":"<p>The launch status of the application.</p>"
-        },
-        "launchStatusMessage":{
-          "shape":"AppLaunchStatusMessage",
-          "documentation":"<p>A message related to the launch status of the application.</p>"
-        },
-        "launchDetails":{
-          "shape":"LaunchDetails",
-          "documentation":"<p>Details about the latest launch of the application.</p>"
-        },
-        "creationTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The creation time of the application.</p>"
-        },
-        "lastModified":{
-          "shape":"Timestamp",
-          "documentation":"<p>The last modified time of the application.</p>"
-        },
-        "roleName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of the service role in the customer's account used by Server Migration Service.</p>"
-        },
-        "totalServerGroups":{
-          "shape":"TotalServerGroups",
-          "documentation":"<p>The number of server groups present in the application.</p>"
-        },
-        "totalServers":{
-          "shape":"TotalServers",
-          "documentation":"<p>The number of servers present in the application.</p>"
-        }
-      },
-      "documentation":"<p>Information about the application.</p>"
-    },
-    "AppValidationConfiguration":{
-      "type":"structure",
-      "members":{
-        "validationId":{
-          "shape":"ValidationId",
-          "documentation":"<p>The ID of the validation.</p>"
-        },
-        "name":{
-          "shape":"NonEmptyStringWithMaxLen255",
-          "documentation":"<p>The name of the configuration.</p>"
-        },
-        "appValidationStrategy":{
-          "shape":"AppValidationStrategy",
-          "documentation":"<p>The validation strategy.</p>"
-        },
-        "ssmValidationParameters":{
-          "shape":"SSMValidationParameters",
-          "documentation":"<p>The validation parameters.</p>"
-        }
-      },
-      "documentation":"<p>Configuration for validating an application.</p>"
-    },
-    "AppValidationConfigurations":{
-      "type":"list",
-      "member":{"shape":"AppValidationConfiguration"}
-    },
-    "AppValidationOutput":{
-      "type":"structure",
-      "members":{
-        "ssmOutput":{
-          "shape":"SSMOutput",
-          "documentation":"<p>Output from using SSM to validate the application.</p>"
-        }
-      },
-      "documentation":"<p>Output from validating an application.</p>"
-    },
-    "AppValidationStrategy":{
-      "type":"string",
-      "enum":["SSM"]
-    },
-    "Apps":{
-      "type":"list",
-      "member":{"shape":"AppSummary"}
-    },
-    "AssociatePublicIpAddress":{"type":"boolean"},
-    "AutoLaunch":{"type":"boolean"},
-    "BucketName":{"type":"string"},
-    "ClientToken":{"type":"string"},
-    "Command":{
-      "type":"string",
-      "max":64000,
-      "min":1
-    },
-    "Connector":{
-      "type":"structure",
-      "members":{
-        "connectorId":{
-          "shape":"ConnectorId",
-          "documentation":"<p>The ID of the connector.</p>"
-        },
-        "version":{
-          "shape":"ConnectorVersion",
-          "documentation":"<p>The connector version.</p>"
-        },
-        "status":{
-          "shape":"ConnectorStatus",
-          "documentation":"<p>The status of the connector.</p>"
-        },
-        "capabilityList":{
-          "shape":"ConnectorCapabilityList",
-          "documentation":"<p>The capabilities of the connector.</p>"
-        },
-        "vmManagerName":{
-          "shape":"VmManagerName",
-          "documentation":"<p>The name of the VM manager.</p>"
-        },
-        "vmManagerType":{
-          "shape":"VmManagerType",
-          "documentation":"<p>The VM management product.</p>"
-        },
-        "vmManagerId":{
-          "shape":"VmManagerId",
-          "documentation":"<p>The ID of the VM manager.</p>"
-        },
-        "ipAddress":{
-          "shape":"IpAddress",
-          "documentation":"<p>The IP address of the connector.</p>"
-        },
-        "macAddress":{
-          "shape":"MacAddress",
-          "documentation":"<p>The MAC address of the connector.</p>"
-        },
-        "associatedOn":{
-          "shape":"Timestamp",
-          "documentation":"<p>The time the connector was associated.</p>"
-        }
-      },
-      "documentation":"<p>Represents a connector.</p>"
-    },
-    "ConnectorCapability":{
-      "type":"string",
-      "enum":[
-        "VSPHERE",
-        "SCVMM",
-        "HYPERV-MANAGER",
-        "SNAPSHOT_BATCHING",
-        "SMS_OPTIMIZED"
-      ]
-    },
-    "ConnectorCapabilityList":{
-      "type":"list",
-      "member":{"shape":"ConnectorCapability"}
-    },
-    "ConnectorId":{"type":"string"},
-    "ConnectorList":{
-      "type":"list",
-      "member":{"shape":"Connector"}
-    },
-    "ConnectorStatus":{
-      "type":"string",
-      "enum":[
-        "HEALTHY",
-        "UNHEALTHY"
-      ]
-    },
-    "ConnectorVersion":{"type":"string"},
-    "CreateAppRequest":{
-      "type":"structure",
-      "members":{
-        "name":{
-          "shape":"AppName",
-          "documentation":"<p>The name of the new application.</p>"
-        },
-        "description":{
-          "shape":"AppDescription",
-          "documentation":"<p>The description of the new application</p>"
-        },
-        "roleName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of the service role in the customer's account to be used by Server Migration Service.</p>"
-        },
-        "clientToken":{
-          "shape":"ClientToken",
-          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of application creation.</p>"
-        },
-        "serverGroups":{
-          "shape":"ServerGroups",
-          "documentation":"<p>The server groups to include in the application.</p>"
-        },
-        "tags":{
-          "shape":"Tags",
-          "documentation":"<p>The tags to be associated with the application.</p>"
-        }
-      }
-    },
-    "CreateAppResponse":{
-      "type":"structure",
-      "members":{
-        "appSummary":{
-          "shape":"AppSummary",
-          "documentation":"<p>A summary description of the application.</p>"
-        },
-        "serverGroups":{
-          "shape":"ServerGroups",
-          "documentation":"<p>The server groups included in the application.</p>"
-        },
-        "tags":{
-          "shape":"Tags",
-          "documentation":"<p>The tags associated with the application.</p>"
-        }
-      }
-    },
-    "CreateReplicationJobRequest":{
-      "type":"structure",
-      "required":[
-        "serverId",
-        "seedReplicationTime"
-      ],
-      "members":{
-        "serverId":{
-          "shape":"ServerId",
-          "documentation":"<p>The ID of the server.</p>"
-        },
-        "seedReplicationTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The seed replication time.</p>"
-        },
-        "frequency":{
-          "shape":"Frequency",
-          "documentation":"<p>The time between consecutive replication runs, in hours.</p>"
-        },
-        "runOnce":{
-          "shape":"RunOnce",
-          "documentation":"<p>Indicates whether to run the replication job one time.</p>"
-        },
-        "licenseType":{
-          "shape":"LicenseType",
-          "documentation":"<p>The license type to be used for the AMI created by a successful replication run.</p>"
-        },
-        "roleName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of the IAM role to be used by the Server Migration Service.</p>"
-        },
-        "description":{
-          "shape":"Description",
-          "documentation":"<p>The description of the replication job.</p>"
-        },
-        "numberOfRecentAmisToKeep":{
-          "shape":"NumberOfRecentAmisToKeep",
-          "documentation":"<p>The maximum number of SMS-created AMIs to retain. The oldest is deleted after the maximum number is reached and a new AMI is created.</p>"
-        },
-        "encrypted":{
-          "shape":"Encrypted",
-          "documentation":"<p>Indicates whether the replication job produces encrypted AMIs.</p>"
-        },
-        "kmsKeyId":{
-          "shape":"KmsKeyId",
-          "documentation":"<p>The ID of the KMS key for replication jobs that produce encrypted AMIs. This value can be any of the following:</p> <ul> <li> <p>KMS key ID</p> </li> <li> <p>KMS key alias</p> </li> <li> <p>ARN referring to the KMS key ID</p> </li> <li> <p>ARN referring to the KMS key alias</p> </li> </ul> <p> If encrypted is <i>true</i> but a KMS key ID is not specified, the customer's default KMS key for Amazon EBS is used. </p>"
-        }
-      }
-    },
-    "CreateReplicationJobResponse":{
-      "type":"structure",
-      "members":{
-        "replicationJobId":{
-          "shape":"ReplicationJobId",
-          "documentation":"<p>The unique identifier of the replication job.</p>"
-        }
-      }
-    },
-    "DeleteAppLaunchConfigurationRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "DeleteAppLaunchConfigurationResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "DeleteAppReplicationConfigurationRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "DeleteAppReplicationConfigurationResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "DeleteAppRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        },
-        "forceStopAppReplication":{
-          "shape":"ForceStopAppReplication",
-          "documentation":"<p>Indicates whether to stop all replication jobs corresponding to the servers in the application while deleting the application.</p>"
-        },
-        "forceTerminateApp":{
-          "shape":"ForceTerminateApp",
-          "documentation":"<p>Indicates whether to terminate the stack corresponding to the application while deleting the application.</p>"
-        }
-      }
-    },
-    "DeleteAppResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "DeleteAppValidationConfigurationRequest":{
-      "type":"structure",
-      "required":["appId"],
-      "members":{
-        "appId":{
-          "shape":"AppIdWithValidation",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "DeleteAppValidationConfigurationResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "DeleteReplicationJobRequest":{
-      "type":"structure",
-      "required":["replicationJobId"],
-      "members":{
-        "replicationJobId":{
-          "shape":"ReplicationJobId",
-          "documentation":"<p>The ID of the replication job.</p>"
-        }
-      }
-    },
-    "DeleteReplicationJobResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "DeleteServerCatalogRequest":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "DeleteServerCatalogResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "Description":{"type":"string"},
-    "DisassociateConnectorRequest":{
-      "type":"structure",
-      "required":["connectorId"],
-      "members":{
-        "connectorId":{
-          "shape":"ConnectorId",
-          "documentation":"<p>The ID of the connector.</p>"
-        }
-      }
-    },
-    "DisassociateConnectorResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "DryRunOperationException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>The user has the required permissions, so the request would have succeeded, but a dry run was performed.</p>",
-      "exception":true
-    },
-    "EC2KeyName":{"type":"string"},
-    "Encrypted":{"type":"boolean"},
-    "ErrorMessage":{"type":"string"},
-    "ExecutionTimeoutSeconds":{
-      "type":"integer",
-      "max":28800,
-      "min":60
-    },
-    "ForceStopAppReplication":{"type":"boolean"},
-    "ForceTerminateApp":{"type":"boolean"},
-    "Frequency":{"type":"integer"},
-    "GenerateChangeSetRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application associated with the change set.</p>"
-        },
-        "changesetFormat":{
-          "shape":"OutputFormat",
-          "documentation":"<p>The format for the change set.</p>"
-        }
-      }
-    },
-    "GenerateChangeSetResponse":{
-      "type":"structure",
-      "members":{
-        "s3Location":{
-          "shape":"S3Location",
-          "documentation":"<p>The location of the Amazon S3 object.</p>"
-        }
-      }
-    },
-    "GenerateTemplateRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application associated with the CloudFormation template.</p>"
-        },
-        "templateFormat":{
-          "shape":"OutputFormat",
-          "documentation":"<p>The format for generating the CloudFormation template.</p>"
-        }
-      }
-    },
-    "GenerateTemplateResponse":{
-      "type":"structure",
-      "members":{
-        "s3Location":{
-          "shape":"S3Location",
-          "documentation":"<p>The location of the Amazon S3 object.</p>"
-        }
-      }
-    },
-    "GetAppLaunchConfigurationRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "GetAppLaunchConfigurationResponse":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        },
-        "roleName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of the service role in the customer's account that CloudFormation uses to launch the application.</p>"
-        },
-        "autoLaunch":{
-          "shape":"AutoLaunch",
-          "documentation":"<p>Indicates whether the application is configured to launch automatically after replication is complete.</p>"
-        },
-        "serverGroupLaunchConfigurations":{
-          "shape":"ServerGroupLaunchConfigurations",
-          "documentation":"<p>The launch configurations for server groups in this application.</p>"
-        }
-      }
-    },
-    "GetAppReplicationConfigurationRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "GetAppReplicationConfigurationResponse":{
-      "type":"structure",
-      "members":{
-        "serverGroupReplicationConfigurations":{
-          "shape":"ServerGroupReplicationConfigurations",
-          "documentation":"<p>The replication configurations associated with server groups in this application.</p>"
-        }
-      }
-    },
-    "GetAppRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "GetAppResponse":{
-      "type":"structure",
-      "members":{
-        "appSummary":{
-          "shape":"AppSummary",
-          "documentation":"<p>Information about the application.</p>"
-        },
-        "serverGroups":{
-          "shape":"ServerGroups",
-          "documentation":"<p>The server groups that belong to the application.</p>"
-        },
-        "tags":{
-          "shape":"Tags",
-          "documentation":"<p>The tags associated with the application.</p>"
-        }
-      }
-    },
-    "GetAppValidationConfigurationRequest":{
-      "type":"structure",
-      "required":["appId"],
-      "members":{
-        "appId":{
-          "shape":"AppIdWithValidation",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "GetAppValidationConfigurationResponse":{
-      "type":"structure",
-      "members":{
-        "appValidationConfigurations":{
-          "shape":"AppValidationConfigurations",
-          "documentation":"<p>The configuration for application validation.</p>"
-        },
-        "serverGroupValidationConfigurations":{
-          "shape":"ServerGroupValidationConfigurations",
-          "documentation":"<p>The configuration for instance validation.</p>"
-        }
-      }
-    },
-    "GetAppValidationOutputRequest":{
-      "type":"structure",
-      "required":["appId"],
-      "members":{
-        "appId":{
-          "shape":"AppIdWithValidation",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "GetAppValidationOutputResponse":{
-      "type":"structure",
-      "members":{
-        "validationOutputList":{
-          "shape":"ValidationOutputList",
-          "documentation":"<p>The validation output.</p>"
-        }
-      }
-    },
-    "GetConnectorsRequest":{
-      "type":"structure",
-      "members":{
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token for the next set of results.</p>"
-        },
-        "maxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return in a single call. The default value is 50. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
-        }
-      }
-    },
-    "GetConnectorsResponse":{
-      "type":"structure",
-      "members":{
-        "connectorList":{
-          "shape":"ConnectorList",
-          "documentation":"<p>Information about the registered connectors.</p>"
-        },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token required to retrieve the next set of results. This value is null when there are no more results to return.</p>"
-        }
-      }
-    },
-    "GetReplicationJobsRequest":{
-      "type":"structure",
-      "members":{
-        "replicationJobId":{
-          "shape":"ReplicationJobId",
-          "documentation":"<p>The ID of the replication job.</p>"
-        },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token for the next set of results.</p>"
-        },
-        "maxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return in a single call. The default value is 50. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
-        }
-      }
-    },
-    "GetReplicationJobsResponse":{
-      "type":"structure",
-      "members":{
-        "replicationJobList":{
-          "shape":"ReplicationJobList",
-          "documentation":"<p>Information about the replication jobs.</p>"
-        },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token required to retrieve the next set of results. This value is null when there are no more results to return.</p>"
-        }
-      }
-    },
-    "GetReplicationRunsRequest":{
-      "type":"structure",
-      "required":["replicationJobId"],
-      "members":{
-        "replicationJobId":{
-          "shape":"ReplicationJobId",
-          "documentation":"<p>The ID of the replication job.</p>"
-        },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token for the next set of results.</p>"
-        },
-        "maxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return in a single call. The default value is 50. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
-        }
-      }
-    },
-    "GetReplicationRunsResponse":{
-      "type":"structure",
-      "members":{
-        "replicationJob":{
-          "shape":"ReplicationJob",
-          "documentation":"<p>Information about the replication job.</p>"
-        },
-        "replicationRunList":{
-          "shape":"ReplicationRunList",
-          "documentation":"<p>Information about the replication runs.</p>"
-        },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token required to retrieve the next set of results. This value is null when there are no more results to return.</p>"
-        }
-      }
-    },
-    "GetServersRequest":{
-      "type":"structure",
-      "members":{
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token for the next set of results.</p>"
-        },
-        "maxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return in a single call. The default value is 50. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
-        },
-        "vmServerAddressList":{
-          "shape":"VmServerAddressList",
-          "documentation":"<p>The server addresses.</p>"
-        }
-      }
-    },
-    "GetServersResponse":{
-      "type":"structure",
-      "members":{
-        "lastModifiedOn":{
-          "shape":"Timestamp",
-          "documentation":"<p>The time when the server was last modified.</p>"
-        },
-        "serverCatalogStatus":{
-          "shape":"ServerCatalogStatus",
-          "documentation":"<p>The status of the server catalog.</p>"
-        },
-        "serverList":{
-          "shape":"ServerList",
-          "documentation":"<p>Information about the servers.</p>"
-        },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token required to retrieve the next set of results. This value is null when there are no more results to return.</p>"
-        }
-      }
-    },
-    "ImportAppCatalogRequest":{
-      "type":"structure",
-      "members":{
-        "roleName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of the service role. If you omit this parameter, we create a service-linked role for Migration Hub in your account. Otherwise, the role that you provide must have the <a href=\"https://docs.aws.amazon.com/migrationhub/latest/ug/new-customer-setup.html#sms-managed\">policy and trust policy</a> described in the <i>Migration Hub User Guide</i>.</p>"
-        }
-      }
-    },
-    "ImportAppCatalogResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "ImportServerCatalogRequest":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "ImportServerCatalogResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "ImportedAppId":{"type":"string"},
-    "InstanceId":{
-      "type":"string",
-      "pattern":"(^i-(\\w{8}|\\w{17})$)|(^mi-\\w{17}$)"
-    },
-    "InstanceType":{"type":"string"},
-    "InternalError":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>An internal error occurred.</p>",
-      "exception":true,
-      "fault":true
-    },
-    "InvalidParameterException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>A specified parameter is not valid.</p>",
-      "exception":true
-    },
-    "IpAddress":{"type":"string"},
-    "KmsKeyId":{"type":"string"},
-    "LaunchAppRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "LaunchAppResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "LaunchDetails":{
-      "type":"structure",
-      "members":{
-        "latestLaunchTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The latest time that this application was launched successfully.</p>"
-        },
-        "stackName":{
-          "shape":"StackName",
-          "documentation":"<p>The name of the latest stack launched for this application.</p>"
-        },
-        "stackId":{
-          "shape":"StackId",
-          "documentation":"<p>The ID of the latest stack launched for this application.</p>"
-        }
-      },
-      "documentation":"<p>Details about the latest launch of an application.</p>"
-    },
-    "LaunchOrder":{"type":"integer"},
-    "LicenseType":{
-      "type":"string",
-      "enum":[
-        "AWS",
-        "BYOL"
-      ]
-    },
-    "ListAppsRequest":{
-      "type":"structure",
-      "members":{
-        "appIds":{
-          "shape":"AppIds",
-          "documentation":"<p>The unique application IDs.</p>"
-        },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token for the next set of results.</p>"
-        },
-        "maxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return in a single call. The default value is 100. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value. </p>"
-        }
-      }
-    },
-    "ListAppsResponse":{
-      "type":"structure",
-      "members":{
-        "apps":{
-          "shape":"Apps",
-          "documentation":"<p>The application summaries.</p>"
-        },
-        "nextToken":{
-          "shape":"NextToken",
-          "documentation":"<p>The token required to retrieve the next set of results. This value is null when there are no more results to return.</p>"
-        }
-      }
-    },
-    "LogicalId":{"type":"string"},
-    "MacAddress":{"type":"string"},
-    "MaxResults":{"type":"integer"},
-    "MissingRequiredParameterException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>A required parameter is missing.</p>",
-      "exception":true
-    },
-    "NextToken":{"type":"string"},
-    "NoConnectorsAvailableException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>There are no connectors available.</p>",
-      "exception":true
-    },
-    "NonEmptyStringWithMaxLen255":{
-      "type":"string",
-      "max":255,
-      "min":1,
-      "pattern":"^[\\S]+$"
-    },
-    "NotificationContext":{
-      "type":"structure",
-      "members":{
-        "validationId":{
-          "shape":"ValidationId",
-          "documentation":"<p>The ID of the validation.</p>"
-        },
-        "status":{
-          "shape":"ValidationStatus",
-          "documentation":"<p>The status of the validation.</p>"
-        },
-        "statusMessage":{
-          "shape":"ValidationStatusMessage",
-          "documentation":"<p>The status message.</p>"
-        }
-      },
-      "documentation":"<p>Contains the status of validating an application.</p>"
-    },
-    "NotifyAppValidationOutputRequest":{
-      "type":"structure",
-      "required":["appId"],
-      "members":{
-        "appId":{
-          "shape":"AppIdWithValidation",
-          "documentation":"<p>The ID of the application.</p>"
-        },
-        "notificationContext":{
-          "shape":"NotificationContext",
-          "documentation":"<p>The notification information.</p>"
-        }
-      }
-    },
-    "NotifyAppValidationOutputResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "NumberOfRecentAmisToKeep":{"type":"integer"},
-    "OperationNotPermittedException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>This operation is not allowed.</p>",
-      "exception":true
-    },
-    "OutputFormat":{
-      "type":"string",
-      "enum":[
-        "JSON",
-        "YAML"
-      ]
-    },
-    "PutAppLaunchConfigurationRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        },
-        "roleName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of service role in the customer's account that CloudFormation uses to launch the application.</p>"
-        },
-        "autoLaunch":{
-          "shape":"AutoLaunch",
-          "documentation":"<p>Indicates whether the application is configured to launch automatically after replication is complete.</p>"
-        },
-        "serverGroupLaunchConfigurations":{
-          "shape":"ServerGroupLaunchConfigurations",
-          "documentation":"<p>Information about the launch configurations for server groups in the application.</p>"
-        }
-      }
-    },
-    "PutAppLaunchConfigurationResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "PutAppReplicationConfigurationRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        },
-        "serverGroupReplicationConfigurations":{
-          "shape":"ServerGroupReplicationConfigurations",
-          "documentation":"<p>Information about the replication configurations for server groups in the application.</p>"
-        }
-      }
-    },
-    "PutAppReplicationConfigurationResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "PutAppValidationConfigurationRequest":{
-      "type":"structure",
-      "required":["appId"],
-      "members":{
-        "appId":{
-          "shape":"AppIdWithValidation",
-          "documentation":"<p>The ID of the application.</p>"
-        },
-        "appValidationConfigurations":{
-          "shape":"AppValidationConfigurations",
-          "documentation":"<p>The configuration for application validation.</p>"
-        },
-        "serverGroupValidationConfigurations":{
-          "shape":"ServerGroupValidationConfigurations",
-          "documentation":"<p>The configuration for instance validation.</p>"
-        }
-      }
-    },
-    "PutAppValidationConfigurationResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "ReplicationJob":{
-      "type":"structure",
-      "members":{
-        "replicationJobId":{
-          "shape":"ReplicationJobId",
-          "documentation":"<p>The ID of the replication job.</p>"
-        },
-        "serverId":{
-          "shape":"ServerId",
-          "documentation":"<p>The ID of the server.</p>"
-        },
-        "serverType":{
-          "shape":"ServerType",
-          "documentation":"<p>The type of server.</p>"
-        },
-        "vmServer":{
-          "shape":"VmServer",
-          "documentation":"<p>Information about the VM server.</p>"
-        },
-        "seedReplicationTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The seed replication time.</p>"
-        },
-        "frequency":{
-          "shape":"Frequency",
-          "documentation":"<p>The time between consecutive replication runs, in hours.</p>"
-        },
-        "runOnce":{
-          "shape":"RunOnce",
-          "documentation":"<p>Indicates whether to run the replication job one time.</p>"
-        },
-        "nextReplicationRunStartTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The start time of the next replication run.</p>"
-        },
-        "licenseType":{
-          "shape":"LicenseType",
-          "documentation":"<p>The license type to be used for the AMI created by a successful replication run.</p>"
-        },
-        "roleName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of the IAM role to be used by Server Migration Service.</p>"
-        },
-        "latestAmiId":{
-          "shape":"AmiId",
-          "documentation":"<p>The ID of the latest Amazon Machine Image (AMI).</p>"
-        },
-        "state":{
-          "shape":"ReplicationJobState",
-          "documentation":"<p>The state of the replication job.</p>"
-        },
-        "statusMessage":{
-          "shape":"ReplicationJobStatusMessage",
-          "documentation":"<p>The description of the current status of the replication job.</p>"
-        },
-        "description":{
-          "shape":"Description",
-          "documentation":"<p>The description of the replication job.</p>"
-        },
-        "numberOfRecentAmisToKeep":{
-          "shape":"NumberOfRecentAmisToKeep",
-          "documentation":"<p>The number of recent AMIs to keep in the customer's account for a replication job. By default, the value is set to zero, meaning that all AMIs are kept.</p>"
-        },
-        "encrypted":{
-          "shape":"Encrypted",
-          "documentation":"<p>Indicates whether the replication job should produce encrypted AMIs.</p>"
-        },
-        "kmsKeyId":{
-          "shape":"KmsKeyId",
-          "documentation":"<p>The ID of the KMS key for replication jobs that produce encrypted AMIs. This value can be any of the following: </p> <ul> <li> <p>KMS key ID</p> </li> <li> <p>KMS key alias</p> </li> <li> <p>ARN referring to the KMS key ID</p> </li> <li> <p>ARN referring to the KMS key alias</p> </li> </ul> <p>If encrypted is enabled but a KMS key ID is not specified, the customer's default KMS key for Amazon EBS is used.</p>"
-        },
-        "replicationRunList":{
-          "shape":"ReplicationRunList",
-          "documentation":"<p>Information about the replication runs.</p>"
-        }
-      },
-      "documentation":"<p>Represents a replication job.</p>"
-    },
-    "ReplicationJobAlreadyExistsException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>The specified replication job already exists.</p>",
-      "exception":true
-    },
-    "ReplicationJobId":{"type":"string"},
-    "ReplicationJobList":{
-      "type":"list",
-      "member":{"shape":"ReplicationJob"}
-    },
-    "ReplicationJobNotFoundException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>The specified replication job does not exist.</p>",
-      "exception":true
-    },
-    "ReplicationJobState":{
-      "type":"string",
-      "enum":[
-        "PENDING",
-        "ACTIVE",
-        "FAILED",
-        "DELETING",
-        "DELETED",
-        "COMPLETED",
-        "PAUSED_ON_FAILURE",
-        "FAILING"
-      ]
-    },
-    "ReplicationJobStatusMessage":{"type":"string"},
-    "ReplicationJobTerminated":{"type":"boolean"},
-    "ReplicationRun":{
-      "type":"structure",
-      "members":{
-        "replicationRunId":{
-          "shape":"ReplicationRunId",
-          "documentation":"<p>The ID of the replication run.</p>"
-        },
-        "state":{
-          "shape":"ReplicationRunState",
-          "documentation":"<p>The state of the replication run.</p>"
-        },
-        "type":{
-          "shape":"ReplicationRunType",
-          "documentation":"<p>The type of replication run.</p>"
-        },
-        "stageDetails":{
-          "shape":"ReplicationRunStageDetails",
-          "documentation":"<p>Details about the current stage of the replication run.</p>"
-        },
-        "statusMessage":{
-          "shape":"ReplicationRunStatusMessage",
-          "documentation":"<p>The description of the current status of the replication job.</p>"
-        },
-        "amiId":{
-          "shape":"AmiId",
-          "documentation":"<p>The ID of the Amazon Machine Image (AMI) from the replication run.</p>"
-        },
-        "scheduledStartTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The start time of the next replication run.</p>"
-        },
-        "completedTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The completion time of the last replication run.</p>"
-        },
-        "description":{
-          "shape":"Description",
-          "documentation":"<p>The description of the replication run.</p>"
-        },
-        "encrypted":{
-          "shape":"Encrypted",
-          "documentation":"<p>Indicates whether the replication run should produce an encrypted AMI.</p>"
-        },
-        "kmsKeyId":{
-          "shape":"KmsKeyId",
-          "documentation":"<p>The ID of the KMS key for replication jobs that produce encrypted AMIs. This value can be any of the following:</p> <ul> <li> <p>KMS key ID</p> </li> <li> <p>KMS key alias</p> </li> <li> <p>ARN referring to the KMS key ID</p> </li> <li> <p>ARN referring to the KMS key alias</p> </li> </ul> <p> If encrypted is <i>true</i> but a KMS key ID is not specified, the customer's default KMS key for Amazon EBS is used. </p>"
-        }
-      },
-      "documentation":"<p>Represents a replication run.</p>"
-    },
-    "ReplicationRunId":{"type":"string"},
-    "ReplicationRunLimitExceededException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>You have exceeded the number of on-demand replication runs you can request in a 24-hour period.</p>",
-      "exception":true
-    },
-    "ReplicationRunList":{
-      "type":"list",
-      "member":{"shape":"ReplicationRun"}
-    },
-    "ReplicationRunStage":{"type":"string"},
-    "ReplicationRunStageDetails":{
-      "type":"structure",
-      "members":{
-        "stage":{
-          "shape":"ReplicationRunStage",
-          "documentation":"<p>The current stage of a replication run.</p>"
-        },
-        "stageProgress":{
-          "shape":"ReplicationRunStageProgress",
-          "documentation":"<p>The progress of the current stage of a replication run.</p>"
-        }
-      },
-      "documentation":"<p>Details of the current stage of a replication run.</p>"
-    },
-    "ReplicationRunStageProgress":{"type":"string"},
-    "ReplicationRunState":{
-      "type":"string",
-      "enum":[
-        "PENDING",
-        "MISSED",
-        "ACTIVE",
-        "FAILED",
-        "COMPLETED",
-        "DELETING",
-        "DELETED"
-      ]
-    },
-    "ReplicationRunStatusMessage":{"type":"string"},
-    "ReplicationRunType":{
-      "type":"string",
-      "enum":[
-        "ON_DEMAND",
-        "AUTOMATIC"
-      ]
-    },
-    "RoleName":{"type":"string"},
-    "RunOnce":{"type":"boolean"},
-    "S3BucketName":{
-      "type":"string",
-      "max":63,
-      "min":3
-    },
-    "S3KeyName":{
-      "type":"string",
-      "max":1024
-    },
-    "S3Location":{
-      "type":"structure",
-      "members":{
-        "bucket":{
-          "shape":"S3BucketName",
-          "documentation":"<p>The Amazon S3 bucket name.</p>"
-        },
-        "key":{
-          "shape":"S3KeyName",
-          "documentation":"<p>The Amazon S3 bucket key.</p>"
-        }
-      },
-      "documentation":"<p>Location of an Amazon S3 object.</p>"
-    },
-    "SSMOutput":{
-      "type":"structure",
-      "members":{
-        "s3Location":{"shape":"S3Location"}
-      },
-      "documentation":"<p>Contains the location of validation output.</p>"
-    },
-    "SSMValidationParameters":{
-      "type":"structure",
-      "members":{
-        "source":{
-          "shape":"Source",
-          "documentation":"<p>The location of the validation script.</p>"
-        },
-        "instanceId":{
-          "shape":"InstanceId",
-          "documentation":"<p>The ID of the instance. The instance must have the following tag: UserForSMSApplicationValidation=true.</p>"
-        },
-        "scriptType":{
-          "shape":"ScriptType",
-          "documentation":"<p>The type of validation script.</p>"
-        },
-        "command":{
-          "shape":"Command",
-          "documentation":"<p>The command to run the validation script.</p>"
-        },
-        "executionTimeoutSeconds":{
-          "shape":"ExecutionTimeoutSeconds",
-          "documentation":"<p>The timeout interval, in seconds.</p>"
-        },
-        "outputS3BucketName":{
-          "shape":"BucketName",
-          "documentation":"<p>The name of the S3 bucket for output.</p>"
-        }
-      },
-      "documentation":"<p>Contains validation parameters.</p>"
-    },
-    "ScriptType":{
-      "type":"string",
-      "enum":[
-        "SHELL_SCRIPT",
-        "POWERSHELL_SCRIPT"
-      ]
-    },
-    "SecurityGroup":{"type":"string"},
-    "Server":{
-      "type":"structure",
-      "members":{
-        "serverId":{
-          "shape":"ServerId",
-          "documentation":"<p>The ID of the server.</p>"
-        },
-        "serverType":{
-          "shape":"ServerType",
-          "documentation":"<p>The type of server.</p>"
-        },
-        "vmServer":{
-          "shape":"VmServer",
-          "documentation":"<p>Information about the VM server.</p>"
-        },
-        "replicationJobId":{
-          "shape":"ReplicationJobId",
-          "documentation":"<p>The ID of the replication job.</p>"
-        },
-        "replicationJobTerminated":{
-          "shape":"ReplicationJobTerminated",
-          "documentation":"<p>Indicates whether the replication job is deleted or failed.</p>"
-        }
-      },
-      "documentation":"<p>Represents a server.</p>"
-    },
-    "ServerCannotBeReplicatedException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>The specified server cannot be replicated.</p>",
-      "exception":true
-    },
-    "ServerCatalogStatus":{
-      "type":"string",
-      "enum":[
-        "NOT_IMPORTED",
-        "IMPORTING",
-        "AVAILABLE",
-        "DELETED",
-        "EXPIRED"
-      ]
-    },
-    "ServerGroup":{
-      "type":"structure",
-      "members":{
-        "serverGroupId":{
-          "shape":"ServerGroupId",
-          "documentation":"<p>The ID of a server group.</p>"
-        },
-        "name":{
-          "shape":"ServerGroupName",
-          "documentation":"<p>The name of a server group.</p>"
-        },
-        "serverList":{
-          "shape":"ServerList",
-          "documentation":"<p>The servers that belong to a server group.</p>"
-        }
-      },
-      "documentation":"<p>Logical grouping of servers.</p>"
-    },
-    "ServerGroupId":{"type":"string"},
-    "ServerGroupLaunchConfiguration":{
-      "type":"structure",
-      "members":{
-        "serverGroupId":{
-          "shape":"ServerGroupId",
-          "documentation":"<p>The ID of the server group with which the launch configuration is associated.</p>"
-        },
-        "launchOrder":{
-          "shape":"LaunchOrder",
-          "documentation":"<p>The launch order of servers in the server group.</p>"
-        },
-        "serverLaunchConfigurations":{
-          "shape":"ServerLaunchConfigurations",
-          "documentation":"<p>The launch configuration for servers in the server group.</p>"
-        }
-      },
-      "documentation":"<p>Launch configuration for a server group.</p>"
-    },
-    "ServerGroupLaunchConfigurations":{
-      "type":"list",
-      "member":{"shape":"ServerGroupLaunchConfiguration"}
-    },
-    "ServerGroupName":{"type":"string"},
-    "ServerGroupReplicationConfiguration":{
-      "type":"structure",
-      "members":{
-        "serverGroupId":{
-          "shape":"ServerGroupId",
-          "documentation":"<p>The ID of the server group with which this replication configuration is associated.</p>"
-        },
-        "serverReplicationConfigurations":{
-          "shape":"ServerReplicationConfigurations",
-          "documentation":"<p>The replication configuration for servers in the server group.</p>"
-        }
-      },
-      "documentation":"<p>Replication configuration for a server group.</p>"
-    },
-    "ServerGroupReplicationConfigurations":{
-      "type":"list",
-      "member":{"shape":"ServerGroupReplicationConfiguration"}
-    },
-    "ServerGroupValidationConfiguration":{
-      "type":"structure",
-      "members":{
-        "serverGroupId":{
-          "shape":"ServerGroupId",
-          "documentation":"<p>The ID of the server group.</p>"
-        },
-        "serverValidationConfigurations":{
-          "shape":"ServerValidationConfigurations",
-          "documentation":"<p>The validation configuration.</p>"
-        }
-      },
-      "documentation":"<p>Configuration for validating an instance.</p>"
-    },
-    "ServerGroupValidationConfigurations":{
-      "type":"list",
-      "member":{"shape":"ServerGroupValidationConfiguration"}
-    },
-    "ServerGroups":{
-      "type":"list",
-      "member":{"shape":"ServerGroup"}
-    },
-    "ServerId":{"type":"string"},
-    "ServerLaunchConfiguration":{
-      "type":"structure",
-      "members":{
-        "server":{
-          "shape":"Server",
-          "documentation":"<p>The ID of the server with which the launch configuration is associated.</p>"
-        },
-        "logicalId":{
-          "shape":"LogicalId",
-          "documentation":"<p>The logical ID of the server in the CloudFormation template.</p>"
-        },
-        "vpc":{
-          "shape":"VPC",
-          "documentation":"<p>The ID of the VPC into which the server should be launched.</p>"
-        },
-        "subnet":{
-          "shape":"Subnet",
-          "documentation":"<p>The ID of the subnet the server should be launched into.</p>"
-        },
-        "securityGroup":{
-          "shape":"SecurityGroup",
-          "documentation":"<p>The ID of the security group that applies to the launched server.</p>"
-        },
-        "ec2KeyName":{
-          "shape":"EC2KeyName",
-          "documentation":"<p>The name of the Amazon EC2 SSH key to be used for connecting to the launched server.</p>"
-        },
-        "userData":{
-          "shape":"UserData",
-          "documentation":"<p>Location of the user-data script to be executed when launching the server.</p>"
-        },
-        "instanceType":{
-          "shape":"InstanceType",
-          "documentation":"<p>The instance type to use when launching the server.</p>"
-        },
-        "associatePublicIpAddress":{
-          "shape":"AssociatePublicIpAddress",
-          "documentation":"<p>Indicates whether a publicly accessible IP address is created when launching the server.</p>"
-        },
-        "iamInstanceProfileName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of the IAM instance profile.</p>"
-        },
-        "configureScript":{"shape":"S3Location"},
-        "configureScriptType":{
-          "shape":"ScriptType",
-          "documentation":"<p>The type of configuration script.</p>"
-        }
-      },
-      "documentation":"<p>Launch configuration for a server.</p>"
-    },
-    "ServerLaunchConfigurations":{
-      "type":"list",
-      "member":{"shape":"ServerLaunchConfiguration"}
-    },
-    "ServerList":{
-      "type":"list",
-      "member":{"shape":"Server"}
-    },
-    "ServerReplicationConfiguration":{
-      "type":"structure",
-      "members":{
-        "server":{
-          "shape":"Server",
-          "documentation":"<p>The ID of the server with which this replication configuration is associated.</p>"
-        },
-        "serverReplicationParameters":{
-          "shape":"ServerReplicationParameters",
-          "documentation":"<p>The parameters for replicating the server.</p>"
-        }
-      },
-      "documentation":"<p>Replication configuration of a server.</p>"
-    },
-    "ServerReplicationConfigurations":{
-      "type":"list",
-      "member":{"shape":"ServerReplicationConfiguration"}
-    },
-    "ServerReplicationParameters":{
-      "type":"structure",
-      "members":{
-        "seedTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The seed time for creating a replication job for the server.</p>"
-        },
-        "frequency":{
-          "shape":"Frequency",
-          "documentation":"<p>The frequency of creating replication jobs for the server.</p>"
-        },
-        "runOnce":{
-          "shape":"RunOnce",
-          "documentation":"<p>Indicates whether to run the replication job one time.</p>"
-        },
-        "licenseType":{
-          "shape":"LicenseType",
-          "documentation":"<p>The license type for creating a replication job for the server.</p>"
-        },
-        "numberOfRecentAmisToKeep":{
-          "shape":"NumberOfRecentAmisToKeep",
-          "documentation":"<p>The number of recent AMIs to keep when creating a replication job for this server.</p>"
-        },
-        "encrypted":{
-          "shape":"Encrypted",
-          "documentation":"<p>Indicates whether the replication job produces encrypted AMIs.</p>"
-        },
-        "kmsKeyId":{
-          "shape":"KmsKeyId",
-          "documentation":"<p>The ID of the KMS key for replication jobs that produce encrypted AMIs. This value can be any of the following:</p> <ul> <li> <p>KMS key ID</p> </li> <li> <p>KMS key alias</p> </li> <li> <p>ARN referring to the KMS key ID</p> </li> <li> <p>ARN referring to the KMS key alias</p> </li> </ul> <p>If encrypted is enabled but a KMS key ID is not specified, the customer's default KMS key for Amazon EBS is used.</p>"
-        }
-      },
-      "documentation":"<p>The replication parameters for replicating a server.</p>"
-    },
-    "ServerType":{
-      "type":"string",
-      "enum":["VIRTUAL_MACHINE"]
-    },
-    "ServerValidationConfiguration":{
-      "type":"structure",
-      "members":{
-        "server":{"shape":"Server"},
-        "validationId":{
-          "shape":"ValidationId",
-          "documentation":"<p>The ID of the validation.</p>"
-        },
-        "name":{
-          "shape":"NonEmptyStringWithMaxLen255",
-          "documentation":"<p>The name of the configuration.</p>"
-        },
-        "serverValidationStrategy":{
-          "shape":"ServerValidationStrategy",
-          "documentation":"<p>The validation strategy.</p>"
-        },
-        "userDataValidationParameters":{
-          "shape":"UserDataValidationParameters",
-          "documentation":"<p>The validation parameters.</p>"
-        }
-      },
-      "documentation":"<p>Configuration for validating an instance.</p>"
-    },
-    "ServerValidationConfigurations":{
-      "type":"list",
-      "member":{"shape":"ServerValidationConfiguration"}
-    },
-    "ServerValidationOutput":{
-      "type":"structure",
-      "members":{
-        "server":{"shape":"Server"}
-      },
-      "documentation":"<p>Contains output from validating an instance.</p>"
-    },
-    "ServerValidationStrategy":{
-      "type":"string",
-      "enum":["USERDATA"]
-    },
-    "Source":{
-      "type":"structure",
-      "members":{
-        "s3Location":{"shape":"S3Location"}
-      },
-      "documentation":"<p>Contains the location of a validation script.</p>"
-    },
-    "StackId":{"type":"string"},
-    "StackName":{"type":"string"},
-    "StartAppReplicationRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "StartAppReplicationResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "StartOnDemandAppReplicationRequest":{
-      "type":"structure",
-      "required":["appId"],
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        },
-        "description":{
-          "shape":"Description",
-          "documentation":"<p>The description of the replication run.</p>"
-        }
-      }
-    },
-    "StartOnDemandAppReplicationResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "StartOnDemandReplicationRunRequest":{
-      "type":"structure",
-      "required":["replicationJobId"],
-      "members":{
-        "replicationJobId":{
-          "shape":"ReplicationJobId",
-          "documentation":"<p>The ID of the replication job.</p>"
-        },
-        "description":{
-          "shape":"Description",
-          "documentation":"<p>The description of the replication run.</p>"
-        }
-      }
-    },
-    "StartOnDemandReplicationRunResponse":{
-      "type":"structure",
-      "members":{
-        "replicationRunId":{
-          "shape":"ReplicationRunId",
-          "documentation":"<p>The ID of the replication run.</p>"
-        }
-      }
-    },
-    "StopAppReplicationRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "StopAppReplicationResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "Subnet":{"type":"string"},
-    "Tag":{
-      "type":"structure",
-      "members":{
-        "key":{
-          "shape":"TagKey",
-          "documentation":"<p>The tag key.</p>"
-        },
-        "value":{
-          "shape":"TagValue",
-          "documentation":"<p>The tag value.</p>"
-        }
-      },
-      "documentation":"<p>Key/value pair that can be assigned to an application.</p>"
-    },
-    "TagKey":{"type":"string"},
-    "TagValue":{"type":"string"},
-    "Tags":{
-      "type":"list",
-      "member":{"shape":"Tag"}
-    },
-    "TemporarilyUnavailableException":{
-      "type":"structure",
-      "members":{
-      },
-      "documentation":"<p>The service is temporarily unavailable.</p>",
-      "exception":true,
-      "fault":true
-    },
-    "TerminateAppRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        }
-      }
-    },
-    "TerminateAppResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "Timestamp":{"type":"timestamp"},
-    "TotalServerGroups":{"type":"integer"},
-    "TotalServers":{"type":"integer"},
-    "UnauthorizedOperationException":{
-      "type":"structure",
-      "members":{
-        "message":{"shape":"ErrorMessage"}
-      },
-      "documentation":"<p>You lack permissions needed to perform this operation. Check your IAM policies, and ensure that you are using the correct access keys.</p>",
-      "exception":true
-    },
-    "UpdateAppRequest":{
-      "type":"structure",
-      "members":{
-        "appId":{
-          "shape":"AppId",
-          "documentation":"<p>The ID of the application.</p>"
-        },
-        "name":{
-          "shape":"AppName",
-          "documentation":"<p>The new name of the application.</p>"
-        },
-        "description":{
-          "shape":"AppDescription",
-          "documentation":"<p>The new description of the application.</p>"
-        },
-        "roleName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of the service role in the customer's account used by Server Migration Service.</p>"
-        },
-        "serverGroups":{
-          "shape":"ServerGroups",
-          "documentation":"<p>The server groups in the application to update.</p>"
-        },
-        "tags":{
-          "shape":"Tags",
-          "documentation":"<p>The tags to associate with the application.</p>"
-        }
-      }
-    },
-    "UpdateAppResponse":{
-      "type":"structure",
-      "members":{
-        "appSummary":{
-          "shape":"AppSummary",
-          "documentation":"<p>A summary description of the application.</p>"
-        },
-        "serverGroups":{
-          "shape":"ServerGroups",
-          "documentation":"<p>The updated server groups in the application.</p>"
-        },
-        "tags":{
-          "shape":"Tags",
-          "documentation":"<p>The tags associated with the application.</p>"
-        }
-      }
-    },
-    "UpdateReplicationJobRequest":{
-      "type":"structure",
-      "required":["replicationJobId"],
-      "members":{
-        "replicationJobId":{
-          "shape":"ReplicationJobId",
-          "documentation":"<p>The ID of the replication job.</p>"
-        },
-        "frequency":{
-          "shape":"Frequency",
-          "documentation":"<p>The time between consecutive replication runs, in hours.</p>"
-        },
-        "nextReplicationRunStartTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The start time of the next replication run.</p>"
-        },
-        "licenseType":{
-          "shape":"LicenseType",
-          "documentation":"<p>The license type to be used for the AMI created by a successful replication run.</p>"
-        },
-        "roleName":{
-          "shape":"RoleName",
-          "documentation":"<p>The name of the IAM role to be used by Server Migration Service.</p>"
-        },
-        "description":{
-          "shape":"Description",
-          "documentation":"<p>The description of the replication job.</p>"
-        },
-        "numberOfRecentAmisToKeep":{
-          "shape":"NumberOfRecentAmisToKeep",
-          "documentation":"<p>The maximum number of SMS-created AMIs to retain. The oldest is deleted after the maximum number is reached and a new AMI is created.</p>"
-        },
-        "encrypted":{
-          "shape":"Encrypted",
-          "documentation":"<p>When true, the replication job produces encrypted AMIs. For more information, <code>KmsKeyId</code>.</p>"
-        },
-        "kmsKeyId":{
-          "shape":"KmsKeyId",
-          "documentation":"<p>The ID of the KMS key for replication jobs that produce encrypted AMIs. This value can be any of the following:</p> <ul> <li> <p>KMS key ID</p> </li> <li> <p>KMS key alias</p> </li> <li> <p>ARN referring to the KMS key ID</p> </li> <li> <p>ARN referring to the KMS key alias</p> </li> </ul> <p>If encrypted is enabled but a KMS key ID is not specified, the customer's default KMS key for Amazon EBS is used.</p>"
-        }
-      }
-    },
-    "UpdateReplicationJobResponse":{
-      "type":"structure",
-      "members":{
-      }
-    },
-    "UserData":{
-      "type":"structure",
-      "members":{
-        "s3Location":{
-          "shape":"S3Location",
-          "documentation":"<p>Amazon S3 location of the user-data script.</p>"
-        }
-      },
-      "documentation":"<p>A script that runs on first launch of an Amazon EC2 instance. Used for configuring the server during launch.</p>"
-    },
-    "UserDataValidationParameters":{
-      "type":"structure",
-      "members":{
-        "source":{
-          "shape":"Source",
-          "documentation":"<p>The location of the validation script.</p>"
-        },
-        "scriptType":{
-          "shape":"ScriptType",
-          "documentation":"<p>The type of validation script.</p>"
-        }
-      },
-      "documentation":"<p>Contains validation parameters.</p>"
-    },
-    "VPC":{"type":"string"},
-    "ValidationId":{
-      "type":"string",
-      "pattern":"^val-[0-9a-f]{17}$"
-    },
-    "ValidationOutput":{
-      "type":"structure",
-      "members":{
-        "validationId":{
-          "shape":"ValidationId",
-          "documentation":"<p>The ID of the validation.</p>"
-        },
-        "name":{
-          "shape":"NonEmptyStringWithMaxLen255",
-          "documentation":"<p>The name of the validation.</p>"
-        },
-        "status":{
-          "shape":"ValidationStatus",
-          "documentation":"<p>The status of the validation.</p>"
-        },
-        "statusMessage":{
-          "shape":"ValidationStatusMessage",
-          "documentation":"<p>The status message.</p>"
-        },
-        "latestValidationTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>The latest time that the validation was performed.</p>"
-        },
-        "appValidationOutput":{
-          "shape":"AppValidationOutput",
-          "documentation":"<p>The output from validating an application.</p>"
-        },
-        "serverValidationOutput":{
-          "shape":"ServerValidationOutput",
-          "documentation":"<p>The output from validation an instance.</p>"
-        }
-      },
-      "documentation":"<p>Contains validation output.</p>"
-    },
-    "ValidationOutputList":{
-      "type":"list",
-      "member":{"shape":"ValidationOutput"}
-    },
-    "ValidationStatus":{
-      "type":"string",
-      "enum":[
-        "READY_FOR_VALIDATION",
-        "PENDING",
-        "IN_PROGRESS",
-        "SUCCEEDED",
-        "FAILED"
-      ]
-    },
-    "ValidationStatusMessage":{
-      "type":"string",
-      "max":2500
-    },
-    "VmId":{"type":"string"},
-    "VmManagerId":{"type":"string"},
-    "VmManagerName":{"type":"string"},
-    "VmManagerType":{
-      "type":"string",
-      "enum":[
-        "VSPHERE",
-        "SCVMM",
-        "HYPERV-MANAGER"
-      ]
-    },
-    "VmName":{"type":"string"},
-    "VmPath":{"type":"string"},
-    "VmServer":{
-      "type":"structure",
-      "members":{
-        "vmServerAddress":{
-          "shape":"VmServerAddress",
-          "documentation":"<p>The VM server location.</p>"
-        },
-        "vmName":{
-          "shape":"VmName",
-          "documentation":"<p>The name of the VM.</p>"
-        },
-        "vmManagerName":{
-          "shape":"VmManagerName",
-          "documentation":"<p>The name of the VM manager.</p>"
-        },
-        "vmManagerType":{
-          "shape":"VmManagerType",
-          "documentation":"<p>The type of VM management product.</p>"
-        },
-        "vmPath":{
-          "shape":"VmPath",
-          "documentation":"<p>The VM folder path in the vCenter Server virtual machine inventory tree.</p>"
-        }
-      },
-      "documentation":"<p>Represents a VM server.</p>"
-    },
-    "VmServerAddress":{
-      "type":"structure",
-      "members":{
-        "vmManagerId":{
-          "shape":"VmManagerId",
-          "documentation":"<p>The ID of the VM manager.</p>"
-        },
-        "vmId":{
-          "shape":"VmId",
-          "documentation":"<p>The ID of the VM.</p>"
-        }
-      },
-      "documentation":"<p>Represents a VM server location.</p>"
-    },
-    "VmServerAddressList":{
-      "type":"list",
-      "member":{"shape":"VmServerAddress"}
-    }
-  },
-  "documentation":"<important> <p> <b>Product update</b> </p> <p>We recommend <a href=\"http://aws.amazon.com/application-migration-service\">Amazon Web Services Application Migration Service</a> (Amazon Web Services MGN) as the primary migration service for lift-and-shift migrations. If Amazon Web Services MGN is unavailable in a specific Amazon Web Services Region, you can use the Server Migration Service APIs through March 2023.</p> </important> <p>Server Migration Service (Server Migration Service) makes it easier and faster for you to migrate your on-premises workloads to Amazon Web Services. To learn more about Server Migration Service, see the following resources:</p> <ul> <li> <p> <a href=\"http://aws.amazon.com/server-migration-service/\">Server Migration Service product page</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/server-migration-service/latest/userguide/\">Server Migration Service User Guide</a> </p> </li> </ul>",
-  "deprecated":true,
-  "deprecatedMessage":"AWS Server Migration Service is Deprecated."
-}
diff --git a/services/sms/src/test/resources/cucumber.properties b/services/sms/src/test/resources/cucumber.properties
deleted file mode 100644
index 557475c220b1..000000000000
--- a/services/sms/src/test/resources/cucumber.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-#
-#  http://aws.amazon.com/apache2.0
-#
-# or in the "license" file accompanying this file. This file 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.
-#
-
-guice.injector-source = software.amazon.awssdk.services.servermigration.smoketests.AWSServerMigrationModuleInjector
diff --git a/services/sms/src/test/resources/software/amazon/awssdk/services/servermigration/smoketests/sms.feature b/services/sms/src/test/resources/software/amazon/awssdk/services/servermigration/smoketests/sms.feature
deleted file mode 100644
index 5039d6408c64..000000000000
--- a/services/sms/src/test/resources/software/amazon/awssdk/services/servermigration/smoketests/sms.feature
+++ /dev/null
@@ -1,12 +0,0 @@
-# language: en
-@smoke @sms
-Feature: AWS Server Migration Service
-
-  Scenario: Making a request
-    When I call the "GetConnectors" API
-    Then the request should be successful
-
-  Scenario: Handling errors
-    When I attempt to call the "DeleteReplicationJob" API with:
-      | ReplicationJobId | invalidId |
-    Then I expect the response error code to be "InvalidParameterException"
\ No newline at end of file
diff --git a/services/snowball/pom.xml b/services/snowball/pom.xml
index f55b813b1d61..580655457621 100644
--- a/services/snowball/pom.xml
+++ b/services/snowball/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>snowball</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Snowball</name>
diff --git a/services/snowdevicemanagement/pom.xml b/services/snowdevicemanagement/pom.xml
index a37082b25450..f2516a546253 100644
--- a/services/snowdevicemanagement/pom.xml
+++ b/services/snowdevicemanagement/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>snowdevicemanagement</artifactId>
     <name>AWS Java SDK :: Services :: Snow Device Management</name>
diff --git a/services/sns/pom.xml b/services/sns/pom.xml
index 43afcc3dc3d6..314f8cead6de 100644
--- a/services/sns/pom.xml
+++ b/services/sns/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sns</artifactId>
     <name>AWS Java SDK :: Services :: Amazon SNS</name>
diff --git a/services/socialmessaging/pom.xml b/services/socialmessaging/pom.xml
index 05c8289c354d..f5e3d055d06d 100644
--- a/services/socialmessaging/pom.xml
+++ b/services/socialmessaging/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>socialmessaging</artifactId>
     <name>AWS Java SDK :: Services :: Social Messaging</name>
diff --git a/services/sqs/pom.xml b/services/sqs/pom.xml
index bd93463ff7eb..aafa0fa34538 100644
--- a/services/sqs/pom.xml
+++ b/services/sqs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sqs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon SQS</name>
@@ -111,6 +111,11 @@
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 </project>
diff --git a/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/BatchingMap.java b/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/BatchingMap.java
index 171b76aa4bff..3b6dd25ba6f5 100644
--- a/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/BatchingMap.java
+++ b/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/BatchingMap.java
@@ -59,8 +59,8 @@ public boolean contains(String batchKey) {
         return batchContextMap.containsKey(batchKey);
     }
 
-    public void putScheduledFlush(String batchKey, ScheduledFuture<?> scheduledFlush) {
-        batchContextMap.get(batchKey).putScheduledFlush(scheduledFlush);
+    public void cancelAndReplaceScheduledFlush(String batchKey, ScheduledFuture<?> scheduledFlush) {
+        batchContextMap.get(batchKey).cancelAndReplaceScheduledFlush(scheduledFlush);
     }
 
     public void forEach(BiConsumer<String, RequestBatchBuffer<RequestT, ResponseT>> action) {
diff --git a/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/RequestBatchBuffer.java b/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/RequestBatchBuffer.java
index d13b32c29e1e..80a55763c077 100644
--- a/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/RequestBatchBuffer.java
+++ b/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/RequestBatchBuffer.java
@@ -29,6 +29,7 @@
 @SdkInternalApi
 public final class RequestBatchBuffer<RequestT, ResponseT> {
     private final Object flushLock = new Object();
+    private final Object scheduledFlushLock = new Object();
 
     private final Map<String, BatchingExecutionContext<RequestT, ResponseT>> idToBatchContext;
     private final int maxBatchItems;
@@ -144,12 +145,20 @@ private String nextBatchEntry() {
         return Integer.toString(nextBatchEntry++);
     }
 
-    public void putScheduledFlush(ScheduledFuture<?> scheduledFlush) {
-        this.scheduledFlush = scheduledFlush;
+    public void cancelAndReplaceScheduledFlush(ScheduledFuture<?> scheduledFlush) {
+        // Locking the cancellation and replacement of the scheduledFlush ensures that there is only one active.
+        synchronized (scheduledFlushLock) {
+            if (this.scheduledFlush != null) {
+                cancelScheduledFlush();
+            }
+            this.scheduledFlush = scheduledFlush;
+        }
     }
 
     public void cancelScheduledFlush() {
-        scheduledFlush.cancel(false);
+        synchronized (scheduledFlushLock) {
+            scheduledFlush.cancel(false);
+        }
     }
 
     public Collection<CompletableFuture<ResponseT>> responses() {
diff --git a/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/RequestBatchManager.java b/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/RequestBatchManager.java
index bb8c8a5ba8c3..af7ed4149f09 100644
--- a/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/RequestBatchManager.java
+++ b/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/batchmanager/RequestBatchManager.java
@@ -107,10 +107,9 @@ protected abstract CompletableFuture<BatchResponseT> batchAndSend(List<Identifia
 
     private void manualFlushBuffer(String batchKey,
                                    Map<String, BatchingExecutionContext<RequestT, ResponseT>> flushableRequests) {
-        requestsAndResponsesMaps.cancelScheduledFlush(batchKey);
         flushBuffer(batchKey, flushableRequests);
-        requestsAndResponsesMaps.putScheduledFlush(batchKey,
-                                                   scheduleBufferFlush(batchKey,
+        requestsAndResponsesMaps.cancelAndReplaceScheduledFlush(batchKey,
+                                                                scheduleBufferFlush(batchKey,
                                                                        sendRequestFrequency.toMillis(),
                                                                        scheduledExecutor));
     }
diff --git a/services/sqs/src/main/resources/codegen-resources/service-2.json b/services/sqs/src/main/resources/codegen-resources/service-2.json
index dd8a5b2327e8..4228fa97eb94 100644
--- a/services/sqs/src/main/resources/codegen-resources/service-2.json
+++ b/services/sqs/src/main/resources/codegen-resources/service-2.json
@@ -347,7 +347,7 @@
         {"shape":"KmsInvalidKeyUsage"},
         {"shape":"InvalidAddress"}
       ],
-      "documentation":"<p>Delivers a message to the specified queue.</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>Amazon SQS does not throw an exception or completely reject the message if it contains invalid characters. Instead, it replaces those invalid characters with U+FFFD before storing the message in the queue, as long as the message body contains at least one valid character.</p> </important>"
+      "documentation":"<p>Delivers a message to the specified queue.</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>If a message contains characters outside the allowed set, Amazon SQS rejects the message and returns an InvalidMessageContents error. Ensure that your message body includes only valid characters to avoid this exception.</p> </important>"
     },
     "SendMessageBatch":{
       "name":"SendMessageBatch",
@@ -376,7 +376,7 @@
         {"shape":"KmsInvalidKeyUsage"},
         {"shape":"InvalidAddress"}
       ],
-      "documentation":"<p>You can use <code>SendMessageBatch</code> to send up to 10 messages to the specified queue by assigning either identical or different values to each message (or by not assigning values at all). This is a batch version of <code> <a>SendMessage</a>.</code> For a FIFO queue, multiple messages within a single batch are enqueued in the order they are sent.</p> <p>The result of sending each message is reported individually in the response. Because the batch request can result in a combination of successful and unsuccessful actions, you should check for batch errors even when the call returns an HTTP status code of <code>200</code>.</p> <p>The maximum allowed individual message size and the maximum total payload size (the sum of the individual lengths of all of the batched messages) are both 1 MiB 1,048,576 bytes.</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>Amazon SQS does not throw an exception or completely reject the message if it contains invalid characters. Instead, it replaces those invalid characters with U+FFFD before storing the message in the queue, as long as the message body contains at least one valid character.</p> </important> <p>If you don't specify the <code>DelaySeconds</code> parameter for an entry, Amazon SQS uses the default value for the queue.</p>"
+      "documentation":"<p>You can use <code>SendMessageBatch</code> to send up to 10 messages to the specified queue by assigning either identical or different values to each message (or by not assigning values at all). This is a batch version of <code> <a>SendMessage</a>.</code> For a FIFO queue, multiple messages within a single batch are enqueued in the order they are sent.</p> <p>The result of sending each message is reported individually in the response. Because the batch request can result in a combination of successful and unsuccessful actions, you should check for batch errors even when the call returns an HTTP status code of <code>200</code>.</p> <p>The maximum allowed individual message size and the maximum total payload size (the sum of the individual lengths of all of the batched messages) are both 1 MiB 1,048,576 bytes.</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>If a message contains characters outside the allowed set, Amazon SQS rejects the message and returns an InvalidMessageContents error. Ensure that your message body includes only valid characters to avoid this exception.</p> </important> <p>If you don't specify the <code>DelaySeconds</code> parameter for an entry, Amazon SQS uses the default value for the queue.</p>"
     },
     "SetQueueAttributes":{
       "name":"SetQueueAttributes",
@@ -1597,7 +1597,7 @@
         },
         "MessageBody":{
           "shape":"String",
-          "documentation":"<p>The message to send. The minimum size is one character. The maximum size is 1 MiB or 1,048,576 bytes</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>Amazon SQS does not throw an exception or completely reject the message if it contains invalid characters. Instead, it replaces those invalid characters with U+FFFD before storing the message in the queue, as long as the message body contains at least one valid character.</p> </important>"
+          "documentation":"<p>The message to send. The minimum size is one character. The maximum size is 1 MiB or 1,048,576 bytes</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>If a message contains characters outside the allowed set, Amazon SQS rejects the message and returns an InvalidMessageContents error. Ensure that your message body includes only valid characters to avoid this exception.</p> </important>"
         },
         "DelaySeconds":{
           "shape":"NullableInteger",
diff --git a/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/BatchingEfficiencyUnderLoadTest.java b/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/BatchingEfficiencyUnderLoadTest.java
new file mode 100644
index 000000000000..7fb555e363d8
--- /dev/null
+++ b/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/BatchingEfficiencyUnderLoadTest.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.services.sqs.batchmanager;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import com.google.common.util.concurrent.RateLimiter;
+import java.net.URI;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.services.sqs.SqsAsyncClient;
+
+
+/**
+ * Tests the batching efficiency of {@link SqsAsyncBatchManager} under various load scenarios.
+ */
+public class BatchingEfficiencyUnderLoadTest {
+
+    private static final String QUEUE_URL = "https://sqs.us-east-1.amazonaws.com/123456789012/MyQueue";
+    private static final int CONCURRENT_THREADS = 50;
+    private static final int MAX_BATCH_SIZE = 10;
+    private static final int SEND_FREQUENCY_MILLIS = 5;
+
+    @RegisterExtension
+    static WireMockExtension wireMock = WireMockExtension.newInstance()
+                                                         .options(wireMockConfig().dynamicPort())
+                                                         .configureStaticDsl(true)
+                                                         .build();
+
+    private SqsAsyncClient client;
+    private SqsAsyncBatchManager batchManager;
+
+    @BeforeEach
+    void setUp() {
+        client = SqsAsyncClient.builder()
+                               .endpointOverride(URI.create("http://localhost:" + wireMock.getPort()))
+                               .checksumValidationEnabled(false)
+                               .credentialsProvider(StaticCredentialsProvider.create(
+                                   AwsBasicCredentials.create("key", "secret")))
+                               .build();
+
+        batchManager = SqsAsyncBatchManager.builder()
+                                           .client(client)
+                                           .scheduledExecutor(Executors.newScheduledThreadPool(10))
+                                           .overrideConfiguration(config -> config
+                                               .sendRequestFrequency(Duration.ofMillis(SEND_FREQUENCY_MILLIS))
+                                               .maxBatchSize(MAX_BATCH_SIZE))
+                                           .build();
+    }
+
+    @AfterEach
+    void tearDown() {
+        batchManager.close();
+        client.close();
+    }
+
+    /**
+     * Test runs heavy load and expects average batch sizes to be close to max.
+     */
+    @Test
+    void sendMessage_whenHighLoadScenario_shouldEfficientlyBatchMessages() throws Exception {
+        int expectedBatchSize = 25; // more than double the actual max of 10
+        int rateLimit = 1000 / SEND_FREQUENCY_MILLIS * expectedBatchSize;
+        int messageCount = rateLimit * 2; // run it for 2 seconds
+        runThroughputTest(messageCount, rateLimit);
+
+        // Then: Verify messages were efficiently batched
+        List<LoggedRequest> batchRequests = findAll(postRequestedFor(anyUrl()));
+
+        // Calculate batching metrics
+        List<Integer> batchSizes = batchRequests.stream()
+                                                .map(req -> req.getBodyAsString().split("\"Id\"").length - 1)
+                                                .collect(Collectors.toList());
+
+        double avgBatchSize = batchSizes.stream()
+                                        .mapToInt(Integer::intValue)
+                                        .average()
+                                        .orElse(0);
+
+        double fullBatchRatio = batchSizes.stream()
+                                          .filter(size -> size >= 9)
+                                          .count() / (double) batchSizes.size();
+        
+        // Assert efficient batching
+        assertThat(avgBatchSize)
+            .as("Average batch size")
+            .isGreaterThan(8.0);
+
+
+        assertThat(fullBatchRatio)
+            .as("Ratio of nearly full batches (9-10 messages)")
+            .isGreaterThan(0.8);
+
+        assertThat((double)batchRequests.size())
+            .as("Total batch requests for %d messages", messageCount)
+            .isLessThan(messageCount / 5d);
+    }
+
+    /**
+     * Test runs a load that should cause an average batch size of 5.
+     */
+    @Test
+    void sendMessage_whenMediumLoadScenario_shouldCreateHalfSizeBatches() throws Exception {
+        int expectedBatchSize = 5;
+        int rateLimit = 1000 / SEND_FREQUENCY_MILLIS * expectedBatchSize;
+        int messageCount = rateLimit * 2; // run it for 2 seconds
+        runThroughputTest(messageCount, rateLimit);
+
+        // Then: Verify batches were roughly half max size
+        List<LoggedRequest> batchRequests = findAll(postRequestedFor(anyUrl()));
+
+        // Calculate batching metrics
+        List<Integer> batchSizes = batchRequests.stream()
+                                                .map(req -> req.getBodyAsString().split("\"Id\"").length - 1)
+                                                .collect(Collectors.toList());
+
+        double avgBatchSize = batchSizes.stream()
+                                        .mapToInt(Integer::intValue)
+                                        .average()
+                                        .orElse(0);
+        
+        // Assert batch expected range
+        assertThat(avgBatchSize)
+            .as("Average batch size")
+            .isLessThan(7.0)
+            .isGreaterThan(3.0);
+
+        assertThat((double)batchRequests.size())
+            .as("Total batch requests for %d messages", messageCount)
+            .isLessThan(messageCount / 3d);
+    }
+
+    @Test
+    void sendMessage_whenLowLoadScenario_shouldCreateSmallBatches() throws Exception {
+        int expectedBatchSize = 1;
+        int rateLimit = 1000 / SEND_FREQUENCY_MILLIS * expectedBatchSize;
+        int messageCount = rateLimit * 2; // run it for 2 seconds
+        runThroughputTest(messageCount, rateLimit);
+
+        // Then: Verify batches were roughly half max size
+        List<LoggedRequest> batchRequests = findAll(postRequestedFor(anyUrl()));
+
+        // Calculate batching metrics
+        List<Integer> batchSizes = batchRequests.stream()
+                                                .map(req -> req.getBodyAsString().split("\"Id\"").length - 1)
+                                                .collect(Collectors.toList());
+
+        double avgBatchSize = batchSizes.stream()
+                                        .mapToInt(Integer::intValue)
+                                        .average()
+                                        .orElse(0);
+
+        // Assert batch expected range
+        assertThat(avgBatchSize)
+            .as("Average batch size")
+            .isLessThan(2.0);
+
+        assertThat((double)batchRequests.size())
+            .as("Total batch requests for %d messages", messageCount)
+            .isGreaterThan(messageCount * .5);
+    }
+
+    private void runThroughputTest(int messageCount, int rateLimit) throws InterruptedException {
+        // Given: SQS returns success for batch requests
+        stubFor(post(anyUrl())
+                    .willReturn(aResponse()
+                                    .withStatus(200)
+                                    .withBody("{\"Successful\": []}")));
+
+        // When: Send rateLimit messages per second concurrently (using 50 threads)
+        ExecutorService executor = Executors.newFixedThreadPool(CONCURRENT_THREADS);
+
+        // Rate limit to spread it out over a couple seconds; enough time to make
+        // any orphaned scheduled flushes obvious.
+        RateLimiter rateLimiter = RateLimiter.create(rateLimit);
+
+        for (int i = 0; i < messageCount; i++) {
+            String messageBody = String.valueOf(i);
+            rateLimiter.acquire();
+            executor.execute(() -> {
+                try {
+                    batchManager.sendMessage(builder ->
+                                                 builder.queueUrl(QUEUE_URL)
+                                                        .messageBody(messageBody));
+                } catch (Exception ignored) {
+                    // Test will fail on assertions if messages aren't sent
+                }
+            });
+        }
+
+        executor.shutdown();
+        executor.awaitTermination(10, TimeUnit.SECONDS);
+    }
+}
\ No newline at end of file
diff --git a/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/RequestBatchBufferTest.java b/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/RequestBatchBufferTest.java
index 0829d8cd5693..df9402e85b11 100644
--- a/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/RequestBatchBufferTest.java
+++ b/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/RequestBatchBufferTest.java
@@ -81,11 +81,12 @@ void whenMaxBufferSizeReachedThenThrowException() {
     }
 
     @Test
-    void whenPutScheduledFlushThenFlushIsSet() {
+    void whenCancelAndReplaceScheduledFlushThenFlushIsSetAndOldFlushIsCanceled() {
         batchBuffer = new RequestBatchBuffer<>(scheduledFlush, 10, MAX_SEND_MESSAGE_PAYLOAD_SIZE_BYTES, maxBufferSize);
         ScheduledFuture<?> newScheduledFlush = mock(ScheduledFuture.class);
-        batchBuffer.putScheduledFlush(newScheduledFlush);
+        batchBuffer.cancelAndReplaceScheduledFlush(newScheduledFlush);
         assertNotNull(newScheduledFlush);
+        verify(scheduledFlush).cancel(false);
     }
 
     @Test
@@ -188,6 +189,46 @@ void testFlushWhenCumulativePayloadExceedsMaxSize() {
     }
 
 
+    @Test
+    void whenSequentialCancelAndReplaceScheduledFlushThenEachPreviousFlushIsCanceled() {
+        batchBuffer = new RequestBatchBuffer<>(scheduledFlush, 10, MAX_SEND_MESSAGE_PAYLOAD_SIZE_BYTES, maxBufferSize);
+        
+        // Create a sequence of mock scheduled futures
+        ScheduledFuture<?> flush1 = mock(ScheduledFuture.class);
+        ScheduledFuture<?> flush2 = mock(ScheduledFuture.class);
+        ScheduledFuture<?> flush3 = mock(ScheduledFuture.class);
+        
+        // First replacement - should cancel the initial scheduledFlush
+        batchBuffer.cancelAndReplaceScheduledFlush(flush1);
+        verify(scheduledFlush, times(1)).cancel(false);
+        
+        // Second replacement - should cancel flush1
+        batchBuffer.cancelAndReplaceScheduledFlush(flush2);
+        verify(flush1, times(1)).cancel(false);
+        
+        // Verify flush2 has not been canceled (it's the current one)
+        verify(flush2, never()).cancel(false);
+        
+        // Verify buffer is still functional
+        CompletableFuture<String> response = new CompletableFuture<>();
+        batchBuffer.put("test-request", response);
+        assertEquals(1, batchBuffer.responses().size());
+    }
+
+    @Test
+    void whenCancelAndReplaceScheduledFlushWithNullInitialFlushThenNoExceptionThrown() {
+        // Create buffer with null initial flush
+        batchBuffer = new RequestBatchBuffer<>(null, 10, MAX_SEND_MESSAGE_PAYLOAD_SIZE_BYTES, maxBufferSize);
+        
+        ScheduledFuture<?> newFlush = mock(ScheduledFuture.class);
+        
+        // Should not throw exception when initial flush is null
+        assertDoesNotThrow(() -> batchBuffer.cancelAndReplaceScheduledFlush(newFlush));
+        
+        // Verify newFlush is not canceled (it's the current one)
+        verify(newFlush, never()).cancel(false);
+    }
+
     private String createLargeString(char ch, int length) {
         StringBuilder sb = new StringBuilder(length);
         for (int i = 0; i < length; i++) {
@@ -198,4 +239,4 @@ private String createLargeString(char ch, int length) {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/services/ssm/pom.xml b/services/ssm/pom.xml
index 772079293c87..c3f141801043 100644
--- a/services/ssm/pom.xml
+++ b/services/ssm/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ssm</artifactId>
     <name>AWS Java SDK :: Services :: AWS Simple Systems Management (SSM)</name>
diff --git a/services/ssm/src/main/resources/codegen-resources/service-2.json b/services/ssm/src/main/resources/codegen-resources/service-2.json
index 8c89e2f45dd1..801cf565c3fe 100644
--- a/services/ssm/src/main/resources/codegen-resources/service-2.json
+++ b/services/ssm/src/main/resources/codegen-resources/service-2.json
@@ -4910,7 +4910,7 @@
         },
         "TargetLocations":{
           "shape":"TargetLocations",
-          "documentation":"<p>A location is a combination of Amazon Web Services Regions and Amazon Web Services accounts where you want to run the association. Use this action to create an association in multiple Regions and multiple accounts.</p>"
+          "documentation":"<p>A location is a combination of Amazon Web Services Regions and Amazon Web Services accounts where you want to run the association. Use this action to create an association in multiple Regions and multiple accounts.</p> <note> <p>The <code>IncludeChildOrganizationUnits</code> parameter is not supported by State Manager.</p> </note>"
         },
         "ScheduleOffset":{
           "shape":"ScheduleOffset",
@@ -5226,7 +5226,7 @@
         },
         "RejectedPatchesAction":{
           "shape":"PatchAction",
-          "documentation":"<p>The action for Patch Manager to take on patches included in the <code>RejectedPackages</code> list.</p> <dl> <dt>ALLOW_AS_DEPENDENCY</dt> <dd> <p> <b>Linux and macOS</b>: A package in the rejected patches list is installed only if it is a dependency of another package. It is considered compliant with the patch baseline, and its status is reported as <code>INSTALLED_OTHER</code>. This is the default action if no option is specified.</p> <p> <b>Windows Server</b>: Windows Server doesn't support the concept of package dependencies. If a package in the rejected patches list and already installed on the node, its status is reported as <code>INSTALLED_OTHER</code>. Any package not already installed on the node is skipped. This is the default action if no option is specified.</p> </dd> <dt>BLOCK</dt> <dd> <p> <b>All OSs</b>: Packages in the rejected patches list, and packages that include them as dependencies, aren't installed by Patch Manager under any circumstances. If a package was installed before it was added to the rejected patches list, or is installed outside of Patch Manager afterward, it's considered noncompliant with the patch baseline and its status is reported as <code>INSTALLED_REJECTED</code>.</p> </dd> </dl>"
+          "documentation":"<p>The action for Patch Manager to take on patches included in the <code>RejectedPackages</code> list.</p> <dl> <dt>ALLOW_AS_DEPENDENCY</dt> <dd> <p> <b>Linux and macOS</b>: A package in the rejected patches list is installed only if it is a dependency of another package. It is considered compliant with the patch baseline, and its status is reported as <code>INSTALLED_OTHER</code>. This is the default action if no option is specified.</p> <p> <b>Windows Server</b>: Windows Server doesn't support the concept of package dependencies. If a package in the rejected patches list and already installed on the node, its status is reported as <code>INSTALLED_OTHER</code>. Any package not already installed on the node is skipped. This is the default action if no option is specified.</p> </dd> <dt>BLOCK</dt> <dd> <p> <b>All OSs</b>: Packages in the rejected patches list, and packages that include them as dependencies, aren't installed by Patch Manager under any circumstances. </p> <p>State value assignment for patch compliance:</p> <ul> <li> <p>If a package was installed before it was added to the rejected patches list, or is installed outside of Patch Manager afterward, it's considered noncompliant with the patch baseline and its status is reported as <code>INSTALLED_REJECTED</code>.</p> </li> <li> <p>If an update attempts to install a dependency package that is now rejected by the baseline, when previous versions of the package were not rejected, the package being updated is reported as <code>MISSING</code> for <code>SCAN</code> operations and as <code>FAILED</code> for <code>INSTALL</code> operations.</p> </li> </ul> </dd> </dl>"
         },
         "Description":{
           "shape":"BaselineDescription",
@@ -7986,6 +7986,10 @@
         "BaselineOverride":{
           "shape":"BaselineOverride",
           "documentation":"<p>Defines the basic information about a patch baseline override.</p>"
+        },
+        "UseS3DualStackEndpoint":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether to use S3 dualstack endpoints for the patch snapshot download URL. Set to <code>true</code> to receive a presigned URL that supports both IPv4 and IPv6 connectivity. Set to <code>false</code> to use standard IPv4-only endpoints. Default is <code>false</code>. This parameter is required for managed nodes in IPv6-only environments. </p>"
         }
       }
     },
@@ -16798,12 +16802,12 @@
         },
         "TargetLocationMaxConcurrency":{
           "shape":"MaxConcurrency",
-          "documentation":"<p>The maximum number of Amazon Web Services Regions and Amazon Web Services accounts allowed to run the Automation concurrently.</p>",
+          "documentation":"<p>The maximum number of Amazon Web Services Regions and Amazon Web Services accounts allowed to run the Automation concurrently. <code>TargetLocationMaxConcurrency</code> has a default value of 1.</p>",
           "box":true
         },
         "TargetLocationMaxErrors":{
           "shape":"MaxErrors",
-          "documentation":"<p>The maximum number of errors allowed before the system stops queueing additional Automation executions for the currently running Automation.</p>",
+          "documentation":"<p>The maximum number of errors allowed before the system stops queueing additional Automation executions for the currently running Automation. <code>TargetLocationMaxErrors</code> has a default value of 0.</p>",
           "box":true
         },
         "ExecutionRoleName":{
@@ -16817,7 +16821,7 @@
         },
         "IncludeChildOrganizationUnits":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates whether to include child organizational units (OUs) that are children of the targeted OUs. The default is <code>false</code>.</p>"
+          "documentation":"<p>Indicates whether to include child organizational units (OUs) that are children of the targeted OUs. The default is <code>false</code>.</p> <note> <p>This parameter is not supported by State Manager.</p> </note>"
         },
         "ExcludeAccounts":{
           "shape":"ExcludeAccounts",
@@ -17171,7 +17175,7 @@
         },
         "TargetLocations":{
           "shape":"TargetLocations",
-          "documentation":"<p>A location is a combination of Amazon Web Services Regions and Amazon Web Services accounts where you want to run the association. Use this action to update an association in multiple Regions and multiple accounts.</p>"
+          "documentation":"<p>A location is a combination of Amazon Web Services Regions and Amazon Web Services accounts where you want to run the association. Use this action to update an association in multiple Regions and multiple accounts.</p> <note> <p>The <code>IncludeChildOrganizationUnits</code> parameter is not supported by State Manager.</p> </note>"
         },
         "ScheduleOffset":{
           "shape":"ScheduleOffset",
@@ -17820,7 +17824,7 @@
         },
         "RejectedPatchesAction":{
           "shape":"PatchAction",
-          "documentation":"<p>The action for Patch Manager to take on patches included in the <code>RejectedPackages</code> list.</p> <dl> <dt>ALLOW_AS_DEPENDENCY</dt> <dd> <p> <b>Linux and macOS</b>: A package in the rejected patches list is installed only if it is a dependency of another package. It is considered compliant with the patch baseline, and its status is reported as <code>INSTALLED_OTHER</code>. This is the default action if no option is specified.</p> <p> <b>Windows Server</b>: Windows Server doesn't support the concept of package dependencies. If a package in the rejected patches list and already installed on the node, its status is reported as <code>INSTALLED_OTHER</code>. Any package not already installed on the node is skipped. This is the default action if no option is specified.</p> </dd> <dt>BLOCK</dt> <dd> <p> <b>All OSs</b>: Packages in the rejected patches list, and packages that include them as dependencies, aren't installed by Patch Manager under any circumstances. If a package was installed before it was added to the rejected patches list, or is installed outside of Patch Manager afterward, it's considered noncompliant with the patch baseline and its status is reported as <code>INSTALLED_REJECTED</code>.</p> </dd> </dl>"
+          "documentation":"<p>The action for Patch Manager to take on patches included in the <code>RejectedPackages</code> list.</p> <dl> <dt>ALLOW_AS_DEPENDENCY</dt> <dd> <p> <b>Linux and macOS</b>: A package in the rejected patches list is installed only if it is a dependency of another package. It is considered compliant with the patch baseline, and its status is reported as <code>INSTALLED_OTHER</code>. This is the default action if no option is specified.</p> <p> <b>Windows Server</b>: Windows Server doesn't support the concept of package dependencies. If a package in the rejected patches list and already installed on the node, its status is reported as <code>INSTALLED_OTHER</code>. Any package not already installed on the node is skipped. This is the default action if no option is specified.</p> </dd> <dt>BLOCK</dt> <dd> <p> <b>All OSs</b>: Packages in the rejected patches list, and packages that include them as dependencies, aren't installed by Patch Manager under any circumstances. </p> <p>State value assignment for patch compliance:</p> <ul> <li> <p>If a package was installed before it was added to the rejected patches list, or is installed outside of Patch Manager afterward, it's considered noncompliant with the patch baseline and its status is reported as <code>INSTALLED_REJECTED</code>.</p> </li> <li> <p>If an update attempts to install a dependency package that is now rejected by the baseline, when previous versions of the package were not rejected, the package being updated is reported as <code>MISSING</code> for <code>SCAN</code> operations and as <code>FAILED</code> for <code>INSTALL</code> operations.</p> </li> </ul> </dd> </dl>"
         },
         "Description":{
           "shape":"BaselineDescription",
diff --git a/services/ssmcontacts/pom.xml b/services/ssmcontacts/pom.xml
index 83f34180330d..24ad53cd5c4b 100644
--- a/services/ssmcontacts/pom.xml
+++ b/services/ssmcontacts/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ssmcontacts</artifactId>
     <name>AWS Java SDK :: Services :: SSM Contacts</name>
diff --git a/services/ssmguiconnect/pom.xml b/services/ssmguiconnect/pom.xml
index c9617e99af6d..6d76968314c4 100644
--- a/services/ssmguiconnect/pom.xml
+++ b/services/ssmguiconnect/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ssmguiconnect</artifactId>
     <name>AWS Java SDK :: Services :: SSM Gui Connect</name>
diff --git a/services/ssmincidents/pom.xml b/services/ssmincidents/pom.xml
index c26671fcfba9..4fb30d989c7d 100644
--- a/services/ssmincidents/pom.xml
+++ b/services/ssmincidents/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ssmincidents</artifactId>
     <name>AWS Java SDK :: Services :: SSM Incidents</name>
diff --git a/services/ssmquicksetup/pom.xml b/services/ssmquicksetup/pom.xml
index b85d61106343..28b6dc4abd86 100644
--- a/services/ssmquicksetup/pom.xml
+++ b/services/ssmquicksetup/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ssmquicksetup</artifactId>
     <name>AWS Java SDK :: Services :: SSM Quick Setup</name>
diff --git a/services/ssmsap/pom.xml b/services/ssmsap/pom.xml
index 9f0710fc194f..acb69090b295 100644
--- a/services/ssmsap/pom.xml
+++ b/services/ssmsap/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ssmsap</artifactId>
     <name>AWS Java SDK :: Services :: Ssm Sap</name>
diff --git a/services/sso/pom.xml b/services/sso/pom.xml
index 776df53f57f3..1b9c643ba46a 100644
--- a/services/sso/pom.xml
+++ b/services/sso/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sso</artifactId>
     <name>AWS Java SDK :: Services :: SSO</name>
diff --git a/services/ssoadmin/pom.xml b/services/ssoadmin/pom.xml
index 091ed5a6fcff..29ec5f67c075 100644
--- a/services/ssoadmin/pom.xml
+++ b/services/ssoadmin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ssoadmin</artifactId>
     <name>AWS Java SDK :: Services :: SSO Admin</name>
diff --git a/services/ssoadmin/src/main/resources/codegen-resources/service-2.json b/services/ssoadmin/src/main/resources/codegen-resources/service-2.json
index 39e1fd7efb56..f4bb62d476b0 100644
--- a/services/ssoadmin/src/main/resources/codegen-resources/service-2.json
+++ b/services/ssoadmin/src/main/resources/codegen-resources/service-2.json
@@ -1273,6 +1273,7 @@
       "errors":[
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
         {"shape":"AccessDeniedException"},
         {"shape":"ValidationException"},
         {"shape":"ConflictException"}
@@ -1391,12 +1392,20 @@
     "AccessDeniedException":{
       "type":"structure",
       "members":{
-        "Message":{"shape":"AccessDeniedExceptionMessage"}
+        "Message":{"shape":"AccessDeniedExceptionMessage"},
+        "Reason":{
+          "shape":"AccessDeniedExceptionReason",
+          "documentation":"<p>The reason for the access denied exception.</p>"
+        }
       },
       "documentation":"<p>You do not have sufficient access to perform this action.</p>",
       "exception":true
     },
     "AccessDeniedExceptionMessage":{"type":"string"},
+    "AccessDeniedExceptionReason":{
+      "type":"string",
+      "enum":["KMS_AccessDeniedException"]
+    },
     "AccountAssignment":{
       "type":"structure",
       "members":{
@@ -2606,6 +2615,14 @@
         "Status":{
           "shape":"InstanceStatus",
           "documentation":"<p>The status of the instance. </p>"
+        },
+        "StatusReason":{
+          "shape":"Reason",
+          "documentation":"<p>Provides additional context about the current status of the IAM Identity Center instance. This field is particularly useful when an instance is in a non-ACTIVE state, such as CREATE_FAILED. When an instance fails to create or update, this field contains information about the cause, which may include issues with KMS key configuration, permission problems with the specified KMS key, or service-related errors. </p>"
+        },
+        "EncryptionConfigurationDetails":{
+          "shape":"EncryptionConfigurationDetails",
+          "documentation":"<p>Contains the encryption configuration for your IAM Identity Center instance, including the encryption status, KMS key type, and KMS key ARN.</p>"
         }
       }
     },
@@ -2773,6 +2790,43 @@
       "min":1,
       "pattern":"(-?)P(?=\\d|T\\d)(?:(\\d+)Y)?(?:(\\d+)M)?(?:(\\d+)([DW]))?(?:T(?:(\\d+)H)?(?:(\\d+)M)?(?:(\\d+(?:\\.\\d+)?)S)?)?"
     },
+    "EncryptionConfiguration":{
+      "type":"structure",
+      "required":["KeyType"],
+      "members":{
+        "KeyType":{
+          "shape":"KmsKeyType",
+          "documentation":"<p>The type of KMS key used for encryption.</p>"
+        },
+        "KmsKeyArn":{
+          "shape":"KmsKeyArn",
+          "documentation":"<p>The ARN of the KMS key used to encrypt data. Required when KeyType is CUSTOMER_MANAGED_KEY. Cannot be specified when KeyType is AWS_OWNED_KMS_KEY.</p>"
+        }
+      },
+      "documentation":"<p> A structure that specifies the KMS key type and KMS key ARN used to encrypt data in your IAM Identity Center instance.</p>"
+    },
+    "EncryptionConfigurationDetails":{
+      "type":"structure",
+      "members":{
+        "KeyType":{
+          "shape":"KmsKeyType",
+          "documentation":"<p>The type of KMS key used for encryption.</p>"
+        },
+        "KmsKeyArn":{
+          "shape":"KmsKeyArn",
+          "documentation":"<p>The ARN of the KMS key currently used to encrypt data in your IAM Identity Center instance. </p>"
+        },
+        "EncryptionStatus":{
+          "shape":"KmsKeyStatus",
+          "documentation":"<p>The current status of encryption configuration.</p>"
+        },
+        "EncryptionStatusReason":{
+          "shape":"Reason",
+          "documentation":"<p>Provides additional context about the current encryption status. This field is particularly useful when the encryption status is UPDATE_FAILED. When encryption configuration update fails, this field contains information about the cause, which may include KMS key access issues, key not found errors, invalid key configuration, key in an invalid state, or a disabled key. </p>"
+        }
+      },
+      "documentation":"<p>The encryption configuration of your IAM Identity Center instance, including the key type, KMS key ARN, and current encryption status. </p>"
+    },
     "FederationProtocol":{
       "type":"string",
       "enum":[
@@ -3090,6 +3144,10 @@
         "Status":{
           "shape":"InstanceStatus",
           "documentation":"<p>The current status of this Identity Center instance.</p>"
+        },
+        "StatusReason":{
+          "shape":"Reason",
+          "documentation":"<p>Provides additional context about the current status of the IAM Identity Center instance. This field is particularly useful when an instance is in a non-ACTIVE state, such as CREATE_FAILED. When an instance creation fails, this field contains information about the cause, which may include issues with KMS key configuration or insufficient permissions. </p>"
         }
       },
       "documentation":"<p>Provides information about the IAM Identity Center instance.</p>"
@@ -3098,6 +3156,7 @@
       "type":"string",
       "enum":[
         "CREATE_IN_PROGRESS",
+        "CREATE_FAILED",
         "DELETE_IN_PROGRESS",
         "ACTIVE"
       ]
@@ -3132,6 +3191,27 @@
       },
       "documentation":"<p>A structure that defines configuration settings for an application that supports the JWT Bearer Token Authorization Grant. The <code>AuthorizedAudience</code> field is the aud claim. For more information, see <a href=\"https://datatracker.ietf.org/doc/html/rfc7523\">RFC 7523</a>.</p>"
     },
+    "KmsKeyArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-[bcd]):kms:([a-z]{2,}(-[a-z0-9]+)+){1}:[0-9]{12}:key/(mrk-[a-f0-9]{32}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})"
+    },
+    "KmsKeyStatus":{
+      "type":"string",
+      "enum":[
+        "UPDATING",
+        "ENABLED",
+        "UPDATE_FAILED"
+      ]
+    },
+    "KmsKeyType":{
+      "type":"string",
+      "enum":[
+        "AWS_OWNED_KMS_KEY",
+        "CUSTOMER_MANAGED_KEY"
+      ]
+    },
     "ListAccountAssignmentCreationStatusRequest":{
       "type":"structure",
       "required":["InstanceArn"],
@@ -4343,11 +4423,19 @@
     "ResourceNotFoundException":{
       "type":"structure",
       "members":{
-        "Message":{"shape":"ResourceNotFoundMessage"}
+        "Message":{"shape":"ResourceNotFoundMessage"},
+        "Reason":{
+          "shape":"ResourceNotFoundExceptionReason",
+          "documentation":"<p>The reason for the resource not found exception.</p>"
+        }
       },
       "documentation":"<p>Indicates that a requested resource is not found.</p>",
       "exception":true
     },
+    "ResourceNotFoundExceptionReason":{
+      "type":"string",
+      "enum":["KMS_NotFoundException"]
+    },
     "ResourceNotFoundMessage":{"type":"string"},
     "ResourceServerConfig":{
       "type":"structure",
@@ -4546,12 +4634,20 @@
     "ThrottlingException":{
       "type":"structure",
       "members":{
-        "Message":{"shape":"ThrottlingExceptionMessage"}
+        "Message":{"shape":"ThrottlingExceptionMessage"},
+        "Reason":{
+          "shape":"ThrottlingExceptionReason",
+          "documentation":"<p>The reason for the throttling exception.</p>"
+        }
       },
       "documentation":"<p>Indicates that the principal has crossed the throttling limits of the API operations.</p>",
       "exception":true
     },
     "ThrottlingExceptionMessage":{"type":"string"},
+    "ThrottlingExceptionReason":{
+      "type":"string",
+      "enum":["KMS_ThrottlingException"]
+    },
     "Token":{
       "type":"string",
       "max":2048,
@@ -4732,10 +4828,7 @@
     },
     "UpdateInstanceRequest":{
       "type":"structure",
-      "required":[
-        "Name",
-        "InstanceArn"
-      ],
+      "required":["InstanceArn"],
       "members":{
         "Name":{
           "shape":"NameType",
@@ -4744,6 +4837,10 @@
         "InstanceArn":{
           "shape":"InstanceArn",
           "documentation":"<p>The ARN of the instance of IAM Identity Center under which the operation will run. For more information about ARNs, see <a href=\"/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and Amazon Web Services Service Namespaces</a> in the <i>Amazon Web Services General Reference</i>.</p>"
+        },
+        "EncryptionConfiguration":{
+          "shape":"EncryptionConfiguration",
+          "documentation":"<p>Specifies the encryption configuration for your IAM Identity Center instance. You can use this to configure customer managed KMS keys (CMK) or Amazon Web Services owned KMS keys for encrypting your instance data.</p>"
         }
       }
     },
@@ -4816,12 +4913,24 @@
     "ValidationException":{
       "type":"structure",
       "members":{
-        "Message":{"shape":"ValidationExceptionMessage"}
+        "Message":{"shape":"ValidationExceptionMessage"},
+        "Reason":{
+          "shape":"ValidationExceptionReason",
+          "documentation":"<p>The reason for the validation exception.</p>"
+        }
       },
       "documentation":"<p>The request failed because it contains a syntax error.</p>",
       "exception":true
     },
-    "ValidationExceptionMessage":{"type":"string"}
+    "ValidationExceptionMessage":{"type":"string"},
+    "ValidationExceptionReason":{
+      "type":"string",
+      "enum":[
+        "KMS_InvalidKeyUsageException",
+        "KMS_InvalidStateException",
+        "KMS_DisabledException"
+      ]
+    }
   },
   "documentation":"<p>IAM Identity Center is the Amazon Web Services solution for connecting your workforce users to Amazon Web Services managed applications and other Amazon Web Services resources. You can connect your existing identity provider and synchronize users and groups from your directory, or create and manage your users directly in IAM Identity Center. You can then use IAM Identity Center for either or both of the following:</p> <ul> <li> <p>User access to applications</p> </li> <li> <p>User access to Amazon Web Services accounts</p> </li> </ul> <p>This guide provides information about single sign-on operations that you can use for access to applications and Amazon Web Services accounts. For information about IAM Identity Center features, see the <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/what-is.html\">IAM Identity Center User Guide</a>.</p> <note> <p>IAM Identity Center uses the <code>sso</code> and <code>identitystore</code> API namespaces.</p> </note> <p>Many API operations for IAM Identity Center rely on identifiers for users and groups, known as principals. For more information about how to work with principals and principal IDs in IAM Identity Center, see the <a href=\"https://docs.aws.amazon.com/singlesignon/latest/IdentityStoreAPIReference/welcome.html\">Identity Store API Reference</a>.</p> <note> <p>Amazon Web Services provides SDKs that consist of libraries and sample code for various programming languages and platforms (Java, Ruby, .Net, iOS, Android, and more). The SDKs provide a convenient way to create programmatic access to IAM Identity Center and other Amazon Web Services services. For more information about the Amazon Web Services SDKs, including how to download and install them, see <a href=\"http://aws.amazon.com/tools/\">Tools for Amazon Web Services</a>.</p> </note>"
 }
diff --git a/services/ssooidc/pom.xml b/services/ssooidc/pom.xml
index dc2f25149a89..f6e1039e23a3 100644
--- a/services/ssooidc/pom.xml
+++ b/services/ssooidc/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>ssooidc</artifactId>
     <name>AWS Java SDK :: Services :: SSO OIDC</name>
diff --git a/services/ssooidc/src/main/resources/codegen-resources/service-2.json b/services/ssooidc/src/main/resources/codegen-resources/service-2.json
index cd4d7feaffe9..7aaaea9d21f4 100644
--- a/services/ssooidc/src/main/resources/codegen-resources/service-2.json
+++ b/services/ssooidc/src/main/resources/codegen-resources/service-2.json
@@ -62,7 +62,7 @@
         {"shape":"InternalServerException"},
         {"shape":"InvalidRequestRegionException"}
       ],
-      "documentation":"<p>Creates and returns access and refresh tokens for clients and applications that are authenticated using IAM entities. The access token can be used to fetch short-lived credentials for the assigned Amazon Web Services accounts or to access application APIs using <code>bearer</code> authentication.</p>"
+      "documentation":"<p>Creates and returns access and refresh tokens for authorized client applications that are authenticated using any IAM entity, such as a service role or user. These tokens might contain defined scopes that specify permissions such as <code>read:profile</code> or <code>write:data</code>. Through downscoping, you can use the scopes parameter to request tokens with reduced permissions compared to the original client application's permissions or, if applicable, the refresh token's scopes. The access token can be used to fetch short-lived credentials for the assigned Amazon Web Services accounts or to access application APIs using <code>bearer</code> authentication.</p> <note> <p>This API is used with Signature Version 4. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv.html\">Amazon Web Services Signature Version 4 for API Requests</a>.</p> </note>"
     },
     "RegisterClient":{
       "name":"RegisterClient",
@@ -78,7 +78,8 @@
         {"shape":"InvalidClientMetadataException"},
         {"shape":"InternalServerException"},
         {"shape":"InvalidRedirectUriException"},
-        {"shape":"UnsupportedGrantTypeException"}
+        {"shape":"UnsupportedGrantTypeException"},
+        {"shape":"SlowDownException"}
       ],
       "documentation":"<p>Registers a public client with IAM Identity Center. This allows clients to perform authorization using the authorization code grant with Proof Key for Code Exchange (PKCE) or the device code grant.</p>",
       "authtype":"none",
@@ -112,6 +113,10 @@
           "shape":"Error",
           "documentation":"<p>Single error code. For this exception the value will be <code>access_denied</code>.</p>"
         },
+        "reason":{
+          "shape":"AccessDeniedExceptionReason",
+          "documentation":"<p>A string that uniquely identifies a reason for the error.</p>"
+        },
         "error_description":{
           "shape":"ErrorDescription",
           "documentation":"<p>Human-readable text providing additional information, used to assist the client developer in understanding the error that occurred.</p>"
@@ -121,6 +126,10 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "AccessDeniedExceptionReason":{
+      "type":"string",
+      "enum":["KMS_AccessDeniedException"]
+    },
     "AccessToken":{
       "type":"string",
       "sensitive":true
@@ -152,10 +161,10 @@
       "members":{
         "identityContext":{
           "shape":"IdentityContext",
-          "documentation":"<p>STS context assertion that carries a user identifier to the Amazon Web Services service that it calls and can be used to obtain an identity-enhanced IAM role session. This value corresponds to the <code>sts:identity_context</code> claim in the ID token.</p>"
+          "documentation":"<p>The trusted context assertion is signed and encrypted by STS. It provides access to <code>sts:identity_context</code> claim in the <code>idToken</code> without JWT parsing</p> <p>Identity context comprises information that Amazon Web Services services use to make authorization decisions when they receive requests.</p>"
         }
       },
-      "documentation":"<p>This structure contains Amazon Web Services-specific parameter extensions for the token endpoint responses and includes the identity context.</p>"
+      "documentation":"<p>This structure contains Amazon Web Services-specific parameter extensions and the <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/trustedidentitypropagation-overview.html\">identity context</a>.</p>"
     },
     "ClientId":{"type":"string"},
     "ClientName":{"type":"string"},
@@ -202,7 +211,7 @@
         },
         "scope":{
           "shape":"Scopes",
-          "documentation":"<p>The list of scopes for which authorization is requested. The access token that is issued is limited to the scopes that are granted. If this value is not specified, IAM Identity Center authorizes all scopes that are configured for the client during the call to <a>RegisterClient</a>.</p>"
+          "documentation":"<p>The list of scopes for which authorization is requested. This parameter has no effect; the access token will always include all scopes configured during client registration.</p>"
         },
         "redirectUri":{
           "shape":"URI",
@@ -325,7 +334,7 @@
         },
         "awsAdditionalDetails":{
           "shape":"AwsAdditionalDetails",
-          "documentation":"<p>A structure containing information from the <code>idToken</code>. Only the <code>identityContext</code> is in it, which is a value extracted from the <code>idToken</code>. This provides direct access to identity information without requiring JWT parsing.</p>"
+          "documentation":"<p>A structure containing information from IAM Identity Center managed user and group information.</p>"
         }
       }
     },
@@ -448,6 +457,10 @@
           "shape":"Error",
           "documentation":"<p>Single error code. For this exception the value will be <code>invalid_request</code>.</p>"
         },
+        "reason":{
+          "shape":"InvalidRequestExceptionReason",
+          "documentation":"<p>A string that uniquely identifies a reason for the error.</p>"
+        },
         "error_description":{
           "shape":"ErrorDescription",
           "documentation":"<p>Human-readable text providing additional information, used to assist the client developer in understanding the error that occurred.</p>"
@@ -457,6 +470,15 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "InvalidRequestExceptionReason":{
+      "type":"string",
+      "enum":[
+        "KMS_NotFoundException",
+        "KMS_InvalidKeyUsageException",
+        "KMS_InvalidStateException",
+        "KMS_DisabledException"
+      ]
+    },
     "InvalidRequestRegionException":{
       "type":"structure",
       "members":{
@@ -687,5 +709,5 @@
     },
     "UserCode":{"type":"string"}
   },
-  "documentation":"<p>IAM Identity Center OpenID Connect (OIDC) is a web service that enables a client (such as CLI or a native application) to register with IAM Identity Center. The service also enables the client to fetch the user’s access token upon successful authentication and authorization with IAM Identity Center.</p> <p> <b>API namespaces</b> </p> <p>IAM Identity Center uses the <code>sso</code> and <code>identitystore</code> API namespaces. IAM Identity Center OpenID Connect uses the <code>sso-oidc</code> namespace.</p> <p> <b>Considerations for using this guide</b> </p> <p>Before you begin using this guide, we recommend that you first review the following important information about how the IAM Identity Center OIDC service works.</p> <ul> <li> <p>The IAM Identity Center OIDC service currently implements only the portions of the OAuth 2.0 Device Authorization Grant standard (<a href=\"https://tools.ietf.org/html/rfc8628\">https://tools.ietf.org/html/rfc8628</a>) that are necessary to enable single sign-on authentication with the CLI. </p> </li> <li> <p>With older versions of the CLI, the service only emits OIDC access tokens, so to obtain a new token, users must explicitly re-authenticate. To access the OIDC flow that supports token refresh and doesn’t require re-authentication, update to the latest CLI version (1.27.10 for CLI V1 and 2.9.0 for CLI V2) with support for OIDC token refresh and configurable IAM Identity Center session durations. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/configure-user-session.html\">Configure Amazon Web Services access portal session duration </a>. </p> </li> <li> <p>The access tokens provided by this service grant access to all Amazon Web Services account entitlements assigned to an IAM Identity Center user, not just a particular application.</p> </li> <li> <p>The documentation in this guide does not describe the mechanism to convert the access token into Amazon Web Services Auth (“sigv4”) credentials for use with IAM-protected Amazon Web Services service endpoints. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/PortalAPIReference/API_GetRoleCredentials.html\">GetRoleCredentials</a> in the <i>IAM Identity Center Portal API Reference Guide</i>.</p> </li> </ul> <p>For general information about IAM Identity Center, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/what-is.html\">What is IAM Identity Center?</a> in the <i>IAM Identity Center User Guide</i>.</p>"
+  "documentation":"<p>IAM Identity Center OpenID Connect (OIDC) is a web service that enables a client (such as CLI or a native application) to register with IAM Identity Center. The service also enables the client to fetch the user’s access token upon successful authentication and authorization with IAM Identity Center.</p> <p> <b>API namespaces</b> </p> <p>IAM Identity Center uses the <code>sso</code> and <code>identitystore</code> API namespaces. IAM Identity Center OpenID Connect uses the <code>sso-oauth</code> namespace.</p> <p> <b>Considerations for using this guide</b> </p> <p>Before you begin using this guide, we recommend that you first review the following important information about how the IAM Identity Center OIDC service works.</p> <ul> <li> <p>The IAM Identity Center OIDC service currently implements only the portions of the OAuth 2.0 Device Authorization Grant standard (<a href=\"https://tools.ietf.org/html/rfc8628\">https://tools.ietf.org/html/rfc8628</a>) that are necessary to enable single sign-on authentication with the CLI. </p> </li> <li> <p>With older versions of the CLI, the service only emits OIDC access tokens, so to obtain a new token, users must explicitly re-authenticate. To access the OIDC flow that supports token refresh and doesn’t require re-authentication, update to the latest CLI version (1.27.10 for CLI V1 and 2.9.0 for CLI V2) with support for OIDC token refresh and configurable IAM Identity Center session durations. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/configure-user-session.html\">Configure Amazon Web Services access portal session duration </a>. </p> </li> <li> <p>The access tokens provided by this service grant access to all Amazon Web Services account entitlements assigned to an IAM Identity Center user, not just a particular application.</p> </li> <li> <p>The documentation in this guide does not describe the mechanism to convert the access token into Amazon Web Services Auth (“sigv4”) credentials for use with IAM-protected Amazon Web Services service endpoints. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/PortalAPIReference/API_GetRoleCredentials.html\">GetRoleCredentials</a> in the <i>IAM Identity Center Portal API Reference Guide</i>.</p> </li> </ul> <p>For general information about IAM Identity Center, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/what-is.html\">What is IAM Identity Center?</a> in the <i>IAM Identity Center User Guide</i>.</p>"
 }
diff --git a/services/storagegateway/pom.xml b/services/storagegateway/pom.xml
index 54cad8d6a51d..22e8552bbf15 100644
--- a/services/storagegateway/pom.xml
+++ b/services/storagegateway/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>storagegateway</artifactId>
     <name>AWS Java SDK :: Services :: AWS Storage Gateway</name>
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index df421a5228f9..ff14aff3b5f0 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>sts</artifactId>
     <name>AWS Java SDK :: Services :: AWS STS</name>
diff --git a/services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java b/services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java
index 204cb9c1a308..5c1c05fb35e3 100644
--- a/services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java
+++ b/services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java
@@ -156,24 +156,6 @@ public static void cleanup() {
         iam.deleteRole(req -> req.roleName(ROLE_NAME));
     }
 
-
-    /** Tests that we can call assumeRole successfully. */
-    @Test
-    public void testAssumeRole() throws InterruptedException {
-        AssumeRoleRequest assumeRoleRequest = AssumeRoleRequest.builder()
-                                                               .durationSeconds(SESSION_DURATION)
-                                                               .roleArn(ROLE_ARN)
-                                                               .roleSessionName("Name")
-                                                               .build();
-
-        StsClient sts = StsClient.builder().credentialsProvider(StaticCredentialsProvider.create(userCredentials)).build();
-        AssumeRoleResponse assumeRoleResult = sts.assumeRole(assumeRoleRequest);
-        assertNotNull(assumeRoleResult.assumedRoleUser());
-        assertNotNull(assumeRoleResult.assumedRoleUser().arn());
-        assertNotNull(assumeRoleResult.assumedRoleUser().assumedRoleId());
-        assertNotNull(assumeRoleResult.credentials());
-    }
-
     @Test
     public void profileCredentialsProviderCanAssumeRoles() throws InterruptedException {
         String ASSUME_ROLE_PROFILE =
diff --git a/services/supplychain/pom.xml b/services/supplychain/pom.xml
index fec70cbf6ca0..959ba82ca780 100644
--- a/services/supplychain/pom.xml
+++ b/services/supplychain/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>supplychain</artifactId>
     <name>AWS Java SDK :: Services :: Supply Chain</name>
diff --git a/services/support/pom.xml b/services/support/pom.xml
index 10143468c291..d5e737baf462 100644
--- a/services/support/pom.xml
+++ b/services/support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>support</artifactId>
     <name>AWS Java SDK :: Services :: AWS Support</name>
diff --git a/services/supportapp/pom.xml b/services/supportapp/pom.xml
index 2ba90b9e81db..e2c2d32d0aef 100644
--- a/services/supportapp/pom.xml
+++ b/services/supportapp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>supportapp</artifactId>
     <name>AWS Java SDK :: Services :: Support App</name>
diff --git a/services/swf/pom.xml b/services/swf/pom.xml
index 16d023a68f1c..569e362cb307 100644
--- a/services/swf/pom.xml
+++ b/services/swf/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>swf</artifactId>
     <name>AWS Java SDK :: Services :: Amazon SWF</name>
diff --git a/services/synthetics/pom.xml b/services/synthetics/pom.xml
index 96bd9068d393..881ecb7408b5 100644
--- a/services/synthetics/pom.xml
+++ b/services/synthetics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>synthetics</artifactId>
     <name>AWS Java SDK :: Services :: Synthetics</name>
diff --git a/services/taxsettings/pom.xml b/services/taxsettings/pom.xml
index 42d5ec5710e0..008d551f99ab 100644
--- a/services/taxsettings/pom.xml
+++ b/services/taxsettings/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>taxsettings</artifactId>
     <name>AWS Java SDK :: Services :: Tax Settings</name>
diff --git a/services/textract/pom.xml b/services/textract/pom.xml
index ed4b57717a91..ad89a6226fc1 100644
--- a/services/textract/pom.xml
+++ b/services/textract/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>textract</artifactId>
     <name>AWS Java SDK :: Services :: Textract</name>
diff --git a/services/timestreaminfluxdb/pom.xml b/services/timestreaminfluxdb/pom.xml
index dd20ce8fb6f6..7aa0706db776 100644
--- a/services/timestreaminfluxdb/pom.xml
+++ b/services/timestreaminfluxdb/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>timestreaminfluxdb</artifactId>
     <name>AWS Java SDK :: Services :: Timestream Influx DB</name>
diff --git a/services/timestreamquery/pom.xml b/services/timestreamquery/pom.xml
index a6974670a453..a1d9906d2282 100644
--- a/services/timestreamquery/pom.xml
+++ b/services/timestreamquery/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>timestreamquery</artifactId>
     <name>AWS Java SDK :: Services :: Timestream Query</name>
diff --git a/services/timestreamwrite/pom.xml b/services/timestreamwrite/pom.xml
index 38fa5cfb35a1..1480abe8a98e 100644
--- a/services/timestreamwrite/pom.xml
+++ b/services/timestreamwrite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>timestreamwrite</artifactId>
     <name>AWS Java SDK :: Services :: Timestream Write</name>
diff --git a/services/tnb/pom.xml b/services/tnb/pom.xml
index 1fea3c7bb03d..20e36d209bad 100644
--- a/services/tnb/pom.xml
+++ b/services/tnb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>tnb</artifactId>
     <name>AWS Java SDK :: Services :: Tnb</name>
diff --git a/services/transcribe/pom.xml b/services/transcribe/pom.xml
index 74230d9e9c98..29ea00e56023 100644
--- a/services/transcribe/pom.xml
+++ b/services/transcribe/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>transcribe</artifactId>
     <name>AWS Java SDK :: Services :: Transcribe</name>
diff --git a/services/transcribestreaming/pom.xml b/services/transcribestreaming/pom.xml
index c8ab64a24d62..a84a34e5a64f 100644
--- a/services/transcribestreaming/pom.xml
+++ b/services/transcribestreaming/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>transcribestreaming</artifactId>
     <name>AWS Java SDK :: Services :: AWS Transcribe Streaming</name>
diff --git a/services/transfer/pom.xml b/services/transfer/pom.xml
index 55377f94e30b..199a754f2103 100644
--- a/services/transfer/pom.xml
+++ b/services/transfer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>transfer</artifactId>
     <name>AWS Java SDK :: Services :: Transfer</name>
diff --git a/services/translate/pom.xml b/services/translate/pom.xml
index 3e85104b1af0..c8a7926241ca 100644
--- a/services/translate/pom.xml
+++ b/services/translate/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>translate</artifactId>
diff --git a/services/trustedadvisor/pom.xml b/services/trustedadvisor/pom.xml
index abee81cfdb3a..e12a01dfb8cd 100644
--- a/services/trustedadvisor/pom.xml
+++ b/services/trustedadvisor/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>trustedadvisor</artifactId>
     <name>AWS Java SDK :: Services :: Trusted Advisor</name>
diff --git a/services/verifiedpermissions/pom.xml b/services/verifiedpermissions/pom.xml
index e0ede610b60b..d82844889b90 100644
--- a/services/verifiedpermissions/pom.xml
+++ b/services/verifiedpermissions/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>verifiedpermissions</artifactId>
     <name>AWS Java SDK :: Services :: Verified Permissions</name>
diff --git a/services/voiceid/pom.xml b/services/voiceid/pom.xml
index e54feaf3ee29..8485e964c3aa 100644
--- a/services/voiceid/pom.xml
+++ b/services/voiceid/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>voiceid</artifactId>
     <name>AWS Java SDK :: Services :: Voice ID</name>
diff --git a/services/vpclattice/pom.xml b/services/vpclattice/pom.xml
index aaa5cca5c26c..90ee2ce50afe 100644
--- a/services/vpclattice/pom.xml
+++ b/services/vpclattice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>vpclattice</artifactId>
     <name>AWS Java SDK :: Services :: VPC Lattice</name>
diff --git a/services/waf/pom.xml b/services/waf/pom.xml
index 5f226fc7aa97..2cebbb487665 100644
--- a/services/waf/pom.xml
+++ b/services/waf/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>waf</artifactId>
     <name>AWS Java SDK :: Services :: AWS WAF</name>
diff --git a/services/wafv2/pom.xml b/services/wafv2/pom.xml
index 81accd62896c..bc904c9d4d7e 100644
--- a/services/wafv2/pom.xml
+++ b/services/wafv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>wafv2</artifactId>
     <name>AWS Java SDK :: Services :: WAFV2</name>
diff --git a/services/wellarchitected/pom.xml b/services/wellarchitected/pom.xml
index feede7022565..917bd83d7ae8 100644
--- a/services/wellarchitected/pom.xml
+++ b/services/wellarchitected/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>wellarchitected</artifactId>
     <name>AWS Java SDK :: Services :: Well Architected</name>
diff --git a/services/wisdom/pom.xml b/services/wisdom/pom.xml
index ba18644b96d8..de98a26cd7a0 100644
--- a/services/wisdom/pom.xml
+++ b/services/wisdom/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>wisdom</artifactId>
     <name>AWS Java SDK :: Services :: Wisdom</name>
diff --git a/services/workdocs/pom.xml b/services/workdocs/pom.xml
index 03d810e57ac3..9e26cd319ae9 100644
--- a/services/workdocs/pom.xml
+++ b/services/workdocs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>workdocs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon WorkDocs</name>
diff --git a/services/workmail/pom.xml b/services/workmail/pom.xml
index c8862d7b650b..694ae6d7c541 100644
--- a/services/workmail/pom.xml
+++ b/services/workmail/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>workmail</artifactId>
diff --git a/services/workmailmessageflow/pom.xml b/services/workmailmessageflow/pom.xml
index a11750f50af4..27669cb885e4 100644
--- a/services/workmailmessageflow/pom.xml
+++ b/services/workmailmessageflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>workmailmessageflow</artifactId>
     <name>AWS Java SDK :: Services :: WorkMailMessageFlow</name>
diff --git a/services/workspaces/pom.xml b/services/workspaces/pom.xml
index 80af9fd3b259..ca75a096a9d9 100644
--- a/services/workspaces/pom.xml
+++ b/services/workspaces/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>workspaces</artifactId>
     <name>AWS Java SDK :: Services :: Amazon WorkSpaces</name>
diff --git a/services/workspacesinstances/pom.xml b/services/workspacesinstances/pom.xml
index 0bbb94e17198..6269a9760def 100644
--- a/services/workspacesinstances/pom.xml
+++ b/services/workspacesinstances/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>workspacesinstances</artifactId>
     <name>AWS Java SDK :: Services :: Workspaces Instances</name>
diff --git a/services/workspacesthinclient/pom.xml b/services/workspacesthinclient/pom.xml
index 3cec554e1a61..1a94e2fdcd42 100644
--- a/services/workspacesthinclient/pom.xml
+++ b/services/workspacesthinclient/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>workspacesthinclient</artifactId>
     <name>AWS Java SDK :: Services :: Work Spaces Thin Client</name>
diff --git a/services/workspacesweb/pom.xml b/services/workspacesweb/pom.xml
index 30e0cbe5d419..41fc8fa5ad5e 100644
--- a/services/workspacesweb/pom.xml
+++ b/services/workspacesweb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>workspacesweb</artifactId>
     <name>AWS Java SDK :: Services :: Work Spaces Web</name>
diff --git a/services/xray/pom.xml b/services/xray/pom.xml
index 13599519132a..fe2d957eccf8 100644
--- a/services/xray/pom.xml
+++ b/services/xray/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <artifactId>xray</artifactId>
     <name>AWS Java SDK :: Services :: AWS X-Ray</name>
diff --git a/test/architecture-tests/pom.xml b/test/architecture-tests/pom.xml
index ba7c0c446d97..ba7527e7d41c 100644
--- a/test/architecture-tests/pom.xml
+++ b/test/architecture-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -61,6 +61,11 @@
             <groupId>software.amazon.awssdk</groupId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <artifactId>utils-lite</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <artifactId>s3</artifactId>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/test/architecture-tests/src/test/java/software/amazon/awssdk/archtests/UtilsLitePackageTest.java b/test/architecture-tests/src/test/java/software/amazon/awssdk/archtests/UtilsLitePackageTest.java
new file mode 100644
index 000000000000..437094a4c58f
--- /dev/null
+++ b/test/architecture-tests/src/test/java/software/amazon/awssdk/archtests/UtilsLitePackageTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.archtests;
+
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+
+import com.tngtech.archunit.core.domain.JavaClasses;
+import com.tngtech.archunit.core.importer.ClassFileImporter;
+import com.tngtech.archunit.lang.ArchRule;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Architecture tests for the utils-lite package to ensure it only contains allowed classes.
+ */
+public class UtilsLitePackageTest {
+
+    private static final JavaClasses CLASSES = new ClassFileImporter()
+        .importPackages("software.amazon.awssdk.utilslite");
+
+    @Test
+    public void utilsLitePackage_shouldOnlyContainAllowedClasses() {
+        ArchRule rule = classes()
+            .that().resideInAPackage("software.amazon.awssdk.utilslite")
+            .should().haveNameMatching(".*\\.(SdkInternalThreadLocal|SdkInternalThreadLocalTest)")
+            .allowEmptyShould(true)
+            .because("utils-lite package should only contain SdkInternalThreadLocal and its test");
+
+        rule.check(CLASSES);
+    }
+}
\ No newline at end of file
diff --git a/test/auth-tests/pom.xml b/test/auth-tests/pom.xml
index f6c77323c33a..d65c94e0516c 100644
--- a/test/auth-tests/pom.xml
+++ b/test/auth-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/bundle-logging-bridge-binding-test/pom.xml b/test/bundle-logging-bridge-binding-test/pom.xml
index 5b46b11c6165..4d4a078ae143 100644
--- a/test/bundle-logging-bridge-binding-test/pom.xml
+++ b/test/bundle-logging-bridge-binding-test/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/bundle-shading-tests/pom.xml b/test/bundle-shading-tests/pom.xml
index 05d954c761f8..f92fc1fe390f 100644
--- a/test/bundle-shading-tests/pom.xml
+++ b/test/bundle-shading-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/codegen-generated-classes-test/pom.xml b/test/codegen-generated-classes-test/pom.xml
index c1ded953b9a1..b88d42cf167e 100644
--- a/test/codegen-generated-classes-test/pom.xml
+++ b/test/codegen-generated-classes-test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/TraceIdTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/TraceIdTest.java
index 3299e26ef876..87de50ec03ae 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/TraceIdTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/TraceIdTest.java
@@ -17,17 +17,28 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
 import software.amazon.awssdk.awscore.interceptor.TraceIdExecutionInterceptor;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.http.AbortableInputStream;
 import software.amazon.awssdk.http.HttpExecuteResponse;
+import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient;
 import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClient;
 import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
+import software.amazon.awssdk.testutils.service.http.MockAsyncHttpClient;
 import software.amazon.awssdk.testutils.service.http.MockSyncHttpClient;
 import software.amazon.awssdk.utils.StringInputStream;
+import software.amazon.awssdk.utilslite.SdkInternalThreadLocal;
 
 /**
  * Verifies that the {@link TraceIdExecutionInterceptor} is actually wired up for AWS services.
@@ -56,4 +67,247 @@ public void traceIdInterceptorIsEnabled() {
             }
         });
     }
-}
+
+    @Test
+    public void traceIdInterceptorPreservesTraceIdAcrossRetries() {
+        EnvironmentVariableHelper.run(env -> {
+            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
+
+            try (MockAsyncHttpClient mockHttpClient = new MockAsyncHttpClient();
+                 ProtocolRestJsonAsyncClient client = ProtocolRestJsonAsyncClient.builder()
+                                                                                 .region(Region.US_WEST_2)
+                                                                                 .credentialsProvider(AnonymousCredentialsProvider.create())
+                                                                                 .httpClient(mockHttpClient)
+                                                                                 .build()) {
+
+                mockHttpClient.stubResponses(
+                    HttpExecuteResponse.builder()
+                                       .response(SdkHttpResponse.builder().statusCode(500).build())
+                                       .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                       .build(),
+                    HttpExecuteResponse.builder()
+                                       .response(SdkHttpResponse.builder().statusCode(500).build())
+                                       .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                       .build(),
+                    HttpExecuteResponse.builder().response(SdkHttpResponse.builder().statusCode(200).build())
+                                       .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                       .build());
+
+                client.allTypes().join();
+
+                List<SdkHttpRequest> requests = mockHttpClient.getRequests();
+                assertThat(requests).hasSize(3);
+
+                assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+                assertThat(requests.get(1).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+                assertThat(requests.get(2).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+
+            } finally {
+                SdkInternalThreadLocal.clear();
+            }
+        });
+    }
+
+    @Test
+    public void traceIdInterceptorPreservesTraceIdAcrossChainedFutures() {
+        EnvironmentVariableHelper.run(env -> {
+            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
+
+            try (MockAsyncHttpClient mockHttpClient = new MockAsyncHttpClient();
+                 ProtocolRestJsonAsyncClient client = ProtocolRestJsonAsyncClient.builder()
+                                                                                 .region(Region.US_WEST_2)
+                                                                                 .credentialsProvider(AnonymousCredentialsProvider.create())
+                                                                                 .httpClient(mockHttpClient)
+                                                                                 .build()) {
+
+                mockHttpClient.stubResponses(
+                    HttpExecuteResponse.builder()
+                                       .response(SdkHttpResponse.builder().statusCode(200).build())
+                                       .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                       .build(),
+                    HttpExecuteResponse.builder()
+                                       .response(SdkHttpResponse.builder().statusCode(200).build())
+                                       .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                       .build()
+                );
+
+                client.allTypes()
+                      .thenRun(() -> {
+                          client.allTypes().join();
+                      })
+                      .join();
+
+                List<SdkHttpRequest> requests = mockHttpClient.getRequests();
+
+                assertThat(requests).hasSize(2);
+
+                assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+                assertThat(requests.get(1).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+
+            } finally {
+                SdkInternalThreadLocal.clear();
+            }
+        });
+    }
+
+    @Test
+    public void traceIdInterceptorPreservesTraceIdAcrossExceptionallyCompletedFutures() {
+        EnvironmentVariableHelper.run(env -> {
+            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
+
+            try (MockAsyncHttpClient mockHttpClient = new MockAsyncHttpClient();
+                 ProtocolRestJsonAsyncClient client = ProtocolRestJsonAsyncClient.builder()
+                                                                                 .region(Region.US_WEST_2)
+                                                                                 .credentialsProvider(AnonymousCredentialsProvider.create())
+                                                                                 .httpClient(mockHttpClient)
+                                                                                 .build()) {
+
+                mockHttpClient.stubResponses(
+                    HttpExecuteResponse.builder()
+                                       .response(SdkHttpResponse.builder().statusCode(400).build())
+                                       .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                       .build(),
+                    HttpExecuteResponse.builder()
+                                       .response(SdkHttpResponse.builder().statusCode(200).build())
+                                       .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                       .build()
+                );
+
+                client.allTypes()
+                      .exceptionally(throwable -> {
+                          client.allTypes().join();
+                          return null;
+                      }).join();
+
+                List<SdkHttpRequest> requests = mockHttpClient.getRequests();
+
+                assertThat(requests).hasSize(2);
+
+                assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+                assertThat(requests.get(1).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+
+            } finally {
+                SdkInternalThreadLocal.clear();
+            }
+        });
+    }
+
+    @Test
+    public void traceIdInterceptorPreservesTraceIdAcrossExceptionallyCompletedFuturesThrownInPreExecution() {
+        EnvironmentVariableHelper.run(env -> {
+            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
+
+            ExecutionInterceptor throwingInterceptor = new ExecutionInterceptor() {
+                private boolean hasThrown = false;
+
+                @Override
+                public void beforeMarshalling(Context.BeforeMarshalling context, ExecutionAttributes executionAttributes) {
+                    if (!hasThrown) {
+                        hasThrown = true;
+                        throw new RuntimeException("failing in pre execution");
+                    }
+                }
+            };
+
+            try (MockAsyncHttpClient mockHttpClient = new MockAsyncHttpClient();
+                 ProtocolRestJsonAsyncClient client = ProtocolRestJsonAsyncClient.builder()
+                                                                                 .region(Region.US_WEST_2)
+                                                                                 .credentialsProvider(AnonymousCredentialsProvider.create())
+                                                                                 .overrideConfiguration(o -> o.addExecutionInterceptor(throwingInterceptor))
+                                                                                 .httpClient(mockHttpClient)
+                                                                                 .build()) {
+
+                mockHttpClient.stubResponses(
+                    HttpExecuteResponse.builder()
+                                       .response(SdkHttpResponse.builder().statusCode(200).build())
+                                       .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                       .build()
+                );
+
+                client.allTypes()
+                      .exceptionally(throwable -> {
+                          client.allTypes().join();
+                          return null;
+                      }).join();
+
+                List<SdkHttpRequest> requests = mockHttpClient.getRequests();
+
+                assertThat(requests).hasSize(1);
+                assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+
+            } finally {
+                SdkInternalThreadLocal.clear();
+            }
+        });
+    }
+
+    @Test
+    public void traceIdInterceptorWithNewThreadInheritsTraceId() {
+        EnvironmentVariableHelper.run(env -> {
+            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
+
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
+
+            try (MockSyncHttpClient mockHttpClient = new MockSyncHttpClient();
+                 ProtocolRestJsonClient client = ProtocolRestJsonClient.builder()
+                                                                       .region(Region.US_WEST_2)
+                                                                       .credentialsProvider(AnonymousCredentialsProvider.create())
+                                                                       .httpClient(mockHttpClient)
+                                                                       .build()) {
+
+                mockHttpClient.stubNextResponse(HttpExecuteResponse.builder()
+                                                                   .response(SdkHttpResponse.builder().statusCode(200).build())
+                                                                   .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                                                   .build());
+
+                Thread childThread = new Thread(client::allTypes);
+                childThread.start();
+                childThread.join();
+
+                List<SdkHttpRequest> requests = mockHttpClient.getRequests();
+                assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            } finally {
+                SdkInternalThreadLocal.clear();
+            }
+        });
+    }
+
+    @Test
+    public void traceIdInterceptorWithExecutiveServicePreservesTraceId() {
+        EnvironmentVariableHelper.run(env -> {
+            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
+
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
+            ExecutorService executor = Executors.newFixedThreadPool(2);
+            try (MockSyncHttpClient mockHttpClient = new MockSyncHttpClient();
+                 ProtocolRestJsonClient client = ProtocolRestJsonClient.builder()
+                                                                       .region(Region.US_WEST_2)
+                                                                       .credentialsProvider(AnonymousCredentialsProvider.create())
+                                                                       .httpClient(mockHttpClient)
+                                                                       .build()) {
+
+                mockHttpClient.stubNextResponse(HttpExecuteResponse.builder()
+                                                                   .response(SdkHttpResponse.builder().statusCode(200).build())
+                                                                   .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                                                   .build());
+
+                executor.submit(() -> client.allTypes()).get();
+
+                List<SdkHttpRequest> requests = mockHttpClient.getRequests();
+                assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            } finally {
+                SdkInternalThreadLocal.clear();
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/test/crt-unavailable-tests/pom.xml b/test/crt-unavailable-tests/pom.xml
index 589ff5fc3180..1297ec852a7a 100644
--- a/test/crt-unavailable-tests/pom.xml
+++ b/test/crt-unavailable-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/http-client-benchmarks/pom.xml b/test/http-client-benchmarks/pom.xml
index 3de40d79e561..d8f7473df3fb 100644
--- a/test/http-client-benchmarks/pom.xml
+++ b/test/http-client-benchmarks/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/test/http-client-tests/pom.xml b/test/http-client-tests/pom.xml
index bfff3cbda9f0..a65f2f2b0ede 100644
--- a/test/http-client-tests/pom.xml
+++ b/test/http-client-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>http-client-tests</artifactId>
diff --git a/test/module-path-tests/pom.xml b/test/module-path-tests/pom.xml
index 48ad8a0aa270..5951b6e25a16 100644
--- a/test/module-path-tests/pom.xml
+++ b/test/module-path-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/old-client-version-compatibility-test/pom.xml b/test/old-client-version-compatibility-test/pom.xml
index 59a92b940db9..e597900fd29f 100644
--- a/test/old-client-version-compatibility-test/pom.xml
+++ b/test/old-client-version-compatibility-test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/test/protocol-tests-core/pom.xml b/test/protocol-tests-core/pom.xml
index 66f021e1f725..4834910679a9 100644
--- a/test/protocol-tests-core/pom.xml
+++ b/test/protocol-tests-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml
index 2d6aadb33450..21d33d923be0 100644
--- a/test/protocol-tests/pom.xml
+++ b/test/protocol-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/region-testing/pom.xml b/test/region-testing/pom.xml
index fd6e74011f58..bdd3a9a1f822 100644
--- a/test/region-testing/pom.xml
+++ b/test/region-testing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/ruleset-testing-core/pom.xml b/test/ruleset-testing-core/pom.xml
index 793a2d51504b..91315d2bcc3d 100644
--- a/test/ruleset-testing-core/pom.xml
+++ b/test/ruleset-testing-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/s3-benchmarks/pom.xml b/test/s3-benchmarks/pom.xml
index 4462996b5a0e..329ae215e367 100644
--- a/test/s3-benchmarks/pom.xml
+++ b/test/s3-benchmarks/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/s3-tests/pom.xml b/test/s3-tests/pom.xml
index b0934970c8f2..c1d86ba7a07a 100644
--- a/test/s3-tests/pom.xml
+++ b/test/s3-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/sdk-benchmarks/pom.xml b/test/sdk-benchmarks/pom.xml
index 406502524c28..c320859c387c 100644
--- a/test/sdk-benchmarks/pom.xml
+++ b/test/sdk-benchmarks/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/test/sdk-native-image-test/pom.xml b/test/sdk-native-image-test/pom.xml
index 3191e6b8d021..e242f8f2c5d1 100644
--- a/test/sdk-native-image-test/pom.xml
+++ b/test/sdk-native-image-test/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/service-test-utils/pom.xml b/test/service-test-utils/pom.xml
index 23ad9119f93e..dc252be93732 100644
--- a/test/service-test-utils/pom.xml
+++ b/test/service-test-utils/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>service-test-utils</artifactId>
diff --git a/test/stability-tests/pom.xml b/test/stability-tests/pom.xml
index 2a361a2ccb8d..6247376e54f2 100644
--- a/test/stability-tests/pom.xml
+++ b/test/stability-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/test-utils/pom.xml b/test/test-utils/pom.xml
index a74ca49c3e19..8406b624e450 100644
--- a/test/test-utils/pom.xml
+++ b/test/test-utils/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>test-utils</artifactId>
diff --git a/test/tests-coverage-reporting/pom.xml b/test/tests-coverage-reporting/pom.xml
index adb6d98240f2..b2c32e88c837 100644
--- a/test/tests-coverage-reporting/pom.xml
+++ b/test/tests-coverage-reporting/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -326,6 +326,11 @@
             <artifactId>http-client-spi</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>utils-lite</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/test/v2-migration-tests/pom.xml b/test/v2-migration-tests/pom.xml
index 72a83d16251a..65816969d87d 100644
--- a/test/v2-migration-tests/pom.xml
+++ b/test/v2-migration-tests/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>v2-migration</artifactId>
-            <version>${project.version}-PREVIEW</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -136,6 +136,11 @@
             <artifactId>test-utils</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/GradleProjectTest.java b/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/GradleProjectTest.java
index 6fdf0018102b..299a9677f9ac 100644
--- a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/GradleProjectTest.java
+++ b/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/GradleProjectTest.java
@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIf;
-import software.amazon.awssdk.testutils.SdkVersionUtils;
 import software.amazon.awssdk.utils.Logger;
 
 public class GradleProjectTest {
@@ -75,7 +74,7 @@ static void setUp() throws IOException {
 
         Files.setPosixFilePermissions(gradlew, perms);
 
-        replaceVersion(gradleActual.resolve("init.gradle"), getMigrationToolVersion() + "-PREVIEW");
+        replaceVersion(gradleActual.resolve("init.gradle"), getMigrationToolVersion());
     }
 
     private static void deleteTempDirectories() throws IOException {
diff --git a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenNoCompileTest.java b/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenNoCompileTest.java
index 2da211c3ba5b..f4c50969c9c0 100644
--- a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenNoCompileTest.java
+++ b/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenNoCompileTest.java
@@ -50,7 +50,6 @@ static void setUp() throws IOException {
     @Test
     @EnabledIf("versionAvailable")
     void mavenProject_shouldConvert() throws IOException {
-        boolean experimental = true;
-        verifyTransformation(experimental);
+        verifyTransformation();
     }
 }
diff --git a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenProjectTest.java b/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenProjectTest.java
index 3c950c5ee85c..f55506fddf83 100644
--- a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenProjectTest.java
+++ b/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenProjectTest.java
@@ -47,8 +47,7 @@ static void setUp() throws IOException {
     @Test
     @EnabledIf("versionAvailable")
     void mavenProject_shouldConvert() throws IOException {
-        boolean experimental = false;
-        verifyTransformation(experimental);
+        verifyTransformation();
         verifyCompilation();
     }
 }
diff --git a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTestBase.java b/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTestBase.java
index 4df43daf5712..a859c879f630 100644
--- a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTestBase.java
+++ b/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTestBase.java
@@ -47,18 +47,13 @@ protected static void deleteTempDirectories() throws IOException {
         FileUtils.deleteDirectory(mavenExpected.toFile());
     }
 
-    protected static void verifyTransformation(boolean experimental) throws IOException {
+    protected static void verifyTransformation() throws IOException {
         String recipeCmd = "-Drewrite.activeRecipes=software.amazon.awssdk.v2migration.AwsSdkJavaV1ToV2";
-        if (experimental) {
-            recipeCmd += "Experimental";
-        }
-
         List<String> rewriteArgs = new ArrayList<>();
         // pin version since updates have broken tests
-        String rewriteMavenPluginVersion = "5.46.0";
+        String rewriteMavenPluginVersion = "6.17.0";
         addAll(rewriteArgs, "mvn", "org.openrewrite.maven:rewrite-maven-plugin:" + rewriteMavenPluginVersion + ":run",
-               "-Drewrite.recipeArtifactCoordinates=software.amazon.awssdk:v2-migration:"+ getMigrationToolVersion() + "-PREVIEW",
-               recipeCmd);
+               "-Drewrite.recipeArtifactCoordinates=software.amazon.awssdk:v2-migration:"+ getMigrationToolVersion(), recipeCmd);
 
         run(mavenActual, rewriteArgs.toArray(new String[0]));
         FileUtils.deleteDirectory(mavenActual.resolve("target").toFile());
diff --git a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTransferManagerTest.java b/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTransferManagerTest.java
deleted file mode 100644
index a97cb1de231b..000000000000
--- a/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTransferManagerTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file 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.
- */
-
-package software.amazon.awssdk.v2migrationtests;
-
-import static software.amazon.awssdk.v2migrationtests.TestUtils.getVersion;
-import static software.amazon.awssdk.v2migrationtests.TestUtils.replaceVersion;
-
-import java.io.File;
-import java.io.IOException;
-import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
-
-public class MavenTransferManagerTest extends MavenTestBase {
-
-    @BeforeAll
-    static void setUp() throws IOException {
-        sdkVersion = getVersion();
-        mavenBefore = new File(MavenTransferManagerTest.class.getResource("maven-tm/before").getFile()).toPath();
-        mavenAfter = new File(MavenTransferManagerTest.class.getResource("maven-tm/after").getFile()).toPath();
-        target = new File(MavenTransferManagerTest.class.getResource("/").getFile()).toPath().getParent();
-
-        mavenActual = target.resolve("maven-tm/actual");
-        mavenExpected = target.resolve("maven-tm/expected");
-
-        deleteTempDirectories();
-
-        FileUtils.copyDirectory(mavenBefore.toFile(), mavenActual.toFile());
-        FileUtils.copyDirectory(mavenAfter.toFile(), mavenExpected.toFile());
-
-        replaceVersion(mavenExpected.resolve("pom.xml"), sdkVersion);
-        replaceVersion(mavenActual.resolve("pom.xml"), sdkVersion);
-    }
-
-    @Test
-    @EnabledIf("versionAvailable")
-    void mavenProject_shouldConvert() throws IOException {
-        boolean experimental = true;
-        verifyTransformation(experimental);
-        verifyCompilation();
-    }
-}
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/gradle/before/init.gradle b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/gradle/before/init.gradle
index 25eb4abdc9c1..8e1300870bc2 100644
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/gradle/before/init.gradle
+++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/gradle/before/init.gradle
@@ -3,7 +3,7 @@ initscript {
         maven { url "https://plugins.gradle.org/m2" }
     }
     dependencies {
-        classpath("org.openrewrite:plugin:6.28.0")
+        classpath("org.openrewrite:plugin:7.15.0")
     }
 }
 
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-nocompile/after/src/main/java/foo/bar/S3EnDateTime.java b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-nocompile/after/src/main/java/foo/bar/S3EnDateTime.java
index bee0b278b9af..ecab91a6b763 100644
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-nocompile/after/src/main/java/foo/bar/S3EnDateTime.java
+++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-nocompile/after/src/main/java/foo/bar/S3EnDateTime.java
@@ -25,7 +25,7 @@ public class S3EnDateTime {
     public void parseEvent(String jsonInput) {
         S3EventNotification notification = S3EventNotification.fromJson(jsonInput);
 
-        for (S3EventNotification.S3EventNotificationRecord record : notification.getRecords()) {
+        for (S3EventNotificationRecord record : notification.getRecords()) {
             DateTime eventTime = /*AWS SDK for Java v2 migration: getEventTime returns Instant instead of DateTime in v2. AWS SDK v2 does not include org.joda.time as a dependency. If you want to keep using DateTime, you'll need to manually add "org.joda.time:joda-time" dependency to your project after migration.*/new DateTime(record.getEventTime().toEpochMilli());
 
             GlacierEventData glacierEventData = record.getGlacierEventData();
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/after/pom.xml b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/after/pom.xml
deleted file mode 100644
index cd6274a6a517..000000000000
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/after/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License").
-  ~ You may not use this file except in compliance with the License.
-  ~ A copy of the License is located at
-  ~
-  ~  http://aws.amazon.com/apache2.0
-  ~
-  ~ or in the "license" file accompanying this file. This file 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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>software.amazon.awssdk</groupId>
-    <artifactId>sample-application</artifactId>
-    <version>1.2.3</version>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>software.amazon.awssdk</groupId>
-                <artifactId>bom</artifactId>
-                <version>V2_VERSION</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>s3</artifactId>
-            <version>V2_VERSION</version>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>s3-transfer-manager</artifactId>
-            <version>V2_VERSION</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/before/pom.xml b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/before/pom.xml
deleted file mode 100644
index 70c4e8e9b12c..000000000000
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/before/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License").
-  ~ You may not use this file except in compliance with the License.
-  ~ A copy of the License is located at
-  ~
-  ~  http://aws.amazon.com/apache2.0
-  ~
-  ~ or in the "license" file accompanying this file. This file 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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>software.amazon.awssdk</groupId>
-    <artifactId>sample-application</artifactId>
-    <version>1.2.3</version>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-bom</artifactId>
-                <version>1.11.1000</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/pom.xml b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/pom.xml
index 693894ce86eb..a49910e17980 100644
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/pom.xml
+++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/pom.xml
@@ -62,6 +62,11 @@
             <artifactId>s3-event-notifications</artifactId>
             <version>V2_VERSION</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3-transfer-manager</artifactId>
+            <version>V2_VERSION</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/Application.java b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/Application.java
index fcb5b1da2862..bc3f83e38420 100644
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/Application.java
+++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/Application.java
@@ -70,11 +70,11 @@ public static void main(String... args) {
 
         } catch (SqsException exception) {
             System.out.println(String.format("Error code: %s. RequestId: %s. Raw response content: %s",
-                                             exception.awsErrorDetails().errorCode(), exception.requestId(),
-                                             exception.awsErrorDetails().rawResponse().asUtf8String()));
+                exception.awsErrorDetails().errorCode(), exception.requestId(),
+                exception.awsErrorDetails().rawResponse().asUtf8String()));
         } catch (AwsServiceException exception) {
             System.out.println(String.format("Error message: %s. Service Name: %s",
-                                             exception.awsErrorDetails().errorMessage(), exception.awsErrorDetails().serviceName()));
+                exception.awsErrorDetails().errorMessage(), exception.awsErrorDetails().serviceName()));
         } catch (SdkException exception) {
             System.out.println("Error message " + exception.getMessage());
         }
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java
index 51244f6e1ac4..c28f71bdd5c5 100644
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java
+++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java
@@ -170,8 +170,7 @@ private void completeMpu(S3Client s3, String bucket, String key) {
             .build();
 
         CompleteMultipartUploadRequest completeMpuRequest2 =
-            CompleteMultipartUploadRequest.builder().bucket(bucket).key(key).uploadId("uploadId").multipartUpload(CompletedMultipartUpload.builder().parts(partETags).build())
-                .build();
+            CompleteMultipartUploadRequest.builder().bucket(bucket).key(key).uploadId("uploadId").multipartUpload(CompletedMultipartUpload.builder().parts(partETags).build()).build();
     }
 
     private void listObjects(S3Client s3, String bucket) {
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3RequestConstructor.java b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3RequestConstructor.java
index e884c669749f..19b4b6e2036c 100644
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3RequestConstructor.java
+++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3RequestConstructor.java
@@ -147,8 +147,7 @@ public void requestconstructor() {
 
         s3.abortMultipartUpload(AbortMultipartUploadRequest.builder().bucket("name").key("key").uploadId("upload")
             .build());
-        s3.completeMultipartUpload(CompleteMultipartUploadRequest.builder().bucket("name").key("key").uploadId("upload").multipartUpload(CompletedMultipartUpload.builder().parts(new ArrayList<>()).build())
-            .build());
+        s3.completeMultipartUpload(CompleteMultipartUploadRequest.builder().bucket("name").key("key").uploadId("upload").multipartUpload(CompletedMultipartUpload.builder().parts(new ArrayList<>()).build()).build());
 
         s3.copyObject(CopyObjectRequest.builder()
             .build());
@@ -458,8 +457,7 @@ public void requestconstructor() {
             .build();
 
         List<Tag> tags = new ArrayList<>();
-        GetObjectTaggingResponse getObjectTaggingResult = GetObjectTaggingResponse.builder().tagSet(tags)
-            .build();
+        GetObjectTaggingResponse getObjectTaggingResult = GetObjectTaggingResponse.builder().tagSet(tags).build();
 
         PutBucketVersioningRequest setBucketVersioningConfigurationRequest =
             PutBucketVersioningRequest.builder().bucket(bucketName).versioningConfiguration(VersioningConfiguration.builder()
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3Streaming.java b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3Streaming.java
index bccb2eae944b..b0b6cca9cfe8 100644
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3Streaming.java
+++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3Streaming.java
@@ -61,7 +61,7 @@ void putObject_bucketKeyStreamMetadata(String bucket, String key, InputStream st
         HeadObjectResponse metadataWithLength = HeadObjectResponse.builder()
             .build();
         s3.putObject(PutObjectRequest.builder().bucket(bucket).key(key).contentLength(22L)
-            .build(), RequestBody.fromInputStream(stream, 22L));
+            .build(), RequestBody.fromInputStream(stream, 22));
 
 
         HeadObjectResponse metadataWithoutLength = HeadObjectResponse.builder()
@@ -105,7 +105,7 @@ void putObject_requestPojoWithInputStream(String bucket, String key) {
         HeadObjectResponse metadata = HeadObjectResponse.builder()
             .build();
         s3.putObject(PutObjectRequest.builder().bucket(bucket).key(key).websiteRedirectLocation("location").contentLength(11L)
-            .build(), RequestBody.fromInputStream(inputStream2, 11L));
+            .build(), RequestBody.fromInputStream(inputStream2, 11));
     }
 
     void putObject_requestPojoWithoutPayload(String bucket, String key) {
@@ -117,8 +117,7 @@ void putObject_requestPojoWithoutPayload(String bucket, String key) {
 
     void putObjectSetters() {
         List<Tag> tags = new ArrayList<>();
-        Tagging objectTagging = Tagging.builder().tagSet(tags)
-            .build();
+        Tagging objectTagging = Tagging.builder().tagSet(tags).build();
 
         PutObjectRequest putObjectRequest =
             PutObjectRequest.builder().bucket("bucket").key("key").websiteRedirectLocation("location")
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/after/src/main/java/foo/bar/TransferManagerS3.java b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/TransferManagerS3.java
similarity index 98%
rename from test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/after/src/main/java/foo/bar/TransferManagerS3.java
rename to test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/TransferManagerS3.java
index c4971ff63b1e..fd314f386f47 100644
--- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/after/src/main/java/foo/bar/TransferManagerS3.java
+++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/TransferManagerS3.java
@@ -15,6 +15,10 @@
 
 package foo.bar;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.time.Duration;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -41,18 +45,13 @@
 import software.amazon.awssdk.transfer.s3.model.UploadRequest;
 import software.amazon.awssdk.transfer.s3.progress.TransferProgress;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.time.Duration;
-
 public class TransferManagerS3 {
 
     File file = new File("path/to/file.txt");
 
     void tmConstructor(AwsCredentials credentials, AwsCredentialsProvider credentialsProvider) {
         S3TransferManager tm = S3TransferManager.builder()
-                .build();
+            .build();
         S3TransferManager tmBuilderDefault = S3TransferManager.create();
         S3TransferManager tmBuilderWithS3 = S3TransferManager.builder().build();
         S3TransferManager tmConstructorWithCred = S3TransferManager.builder().s3Client(S3AsyncClient.builder().credentialsProvider(StaticCredentialsProvider.create(credentials)).build()).build();
@@ -66,7 +65,7 @@ void download(S3TransferManager tm, String bucket, String key) {
         FileDownload download2 = tm.downloadFile(DownloadFileRequest.builder().getObjectRequest(GetObjectRequest.builder().bucket(bucket).key(key).overrideConfiguration(AwsRequestOverrideConfiguration.builder().apiCallTimeout(Duration.ofMillis(timeout)).build()).build()).destination(file).build());
 
         GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(bucket).key(key)
-                .build();
+            .build();
 
         FileDownload download3 = tm.downloadFile(DownloadFileRequest.builder().getObjectRequest(getObjectRequest).destination(file).build());
 
@@ -78,11 +77,11 @@ void upload(S3TransferManager tm, String bucket, String key) {
 
         File file = new File("file1.txt");
         PutObjectRequest requestWithFile = PutObjectRequest.builder().bucket(bucket).key(key)
-                .build();
+            .build();
         tm.uploadFile(UploadFileRequest.builder().putObjectRequest(requestWithFile).source(file).build());
 
         PutObjectRequest requestWithoutPayload = PutObjectRequest.builder().bucket(bucket).key(key).websiteRedirectLocation("location")
-                .build();
+            .build();
         tm.upload(UploadRequest.builder().putObjectRequest(requestWithoutPayload).requestBody(AsyncRequestBody.empty()).build());
     }
 
@@ -90,7 +89,7 @@ void copy(S3TransferManager tm, String sourceBucket, String sourceKey, String de
         Copy copy = tm.copy(CopyRequest.builder().copyObjectRequest(CopyObjectRequest.builder().sourceBucket(sourceBucket).sourceKey(sourceKey).destinationBucket(destinationBucket).destinationKey(destinationKey).build()).build());
 
         CopyObjectRequest copyRequest = CopyObjectRequest.builder().sourceBucket(sourceBucket).sourceKey(sourceKey).destinationBucket(destinationBucket).destinationKey(destinationKey)
-                .build();
+            .build();
         Copy copy2 = tm.copy(CopyRequest.builder().copyObjectRequest(copyRequest).build());
     }
 
diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/before/src/main/java/foo/bar/TransferManagerS3.java b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/before/src/main/java/foo/bar/TransferManagerS3.java
similarity index 100%
rename from test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-tm/before/src/main/java/foo/bar/TransferManagerS3.java
rename to test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/before/src/main/java/foo/bar/TransferManagerS3.java
diff --git a/third-party/pom.xml b/third-party/pom.xml
index 1a4bb1e5944a..58ebb262f993 100644
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>third-party</artifactId>
diff --git a/third-party/third-party-jackson-core/pom.xml b/third-party/third-party-jackson-core/pom.xml
index 35a31ac4cfd1..2f102d9a75e7 100644
--- a/third-party/third-party-jackson-core/pom.xml
+++ b/third-party/third-party-jackson-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>third-party</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/third-party/third-party-jackson-dataformat-cbor/pom.xml b/third-party/third-party-jackson-dataformat-cbor/pom.xml
index 32d18071c248..eafc63a7f5eb 100644
--- a/third-party/third-party-jackson-dataformat-cbor/pom.xml
+++ b/third-party/third-party-jackson-dataformat-cbor/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>third-party</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/third-party/third-party-slf4j-api/pom.xml b/third-party/third-party-slf4j-api/pom.xml
index 6066fe4be3cd..a433f4a5483f 100644
--- a/third-party/third-party-slf4j-api/pom.xml
+++ b/third-party/third-party-slf4j-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>third-party</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/services/sms/pom.xml b/utils-lite/pom.xml
similarity index 55%
rename from services/sms/pom.xml
rename to utils-lite/pom.xml
index ce1baa0f281d..36cf9893198f 100644
--- a/services/sms/pom.xml
+++ b/utils-lite/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
   ~
@@ -14,21 +14,52 @@
   ~ permissions and limitations under the License.
   -->
 
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>software.amazon.awssdk</groupId>
-        <artifactId>services</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <artifactId>aws-sdk-java-pom</artifactId>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
-    <artifactId>sms</artifactId>
-    <name>AWS Java SDK :: Services :: AWS Server Migration</name>
-    <description>The AWS Java SDK for AWS Server Migration module holds the client classes that are used for
-        communicating with AWS Server Migration Service
+    <artifactId>utils-lite</artifactId>
+    <name>AWS Java SDK :: Utils Lite</name>
+    <description>
+        A package providing minimal external utils.
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom-internal</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>annotations</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -37,7 +68,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Automatic-Module-Name>software.amazon.awssdk.services.sms</Automatic-Module-Name>
+                            <Automatic-Module-Name>software.amazon.awssdk.utilslite</Automatic-Module-Name>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -45,21 +76,4 @@
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>aws-json-protocol</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>protocol-core</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>http-auth-aws</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
-    </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/utils-lite/src/main/java/software/amazon/awssdk/utilslite/SdkInternalThreadLocal.java b/utils-lite/src/main/java/software/amazon/awssdk/utilslite/SdkInternalThreadLocal.java
new file mode 100644
index 000000000000..d4d0dc4011a4
--- /dev/null
+++ b/utils-lite/src/main/java/software/amazon/awssdk/utilslite/SdkInternalThreadLocal.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.utilslite;
+
+import java.util.HashMap;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+
+/**
+ * Utility for thread-local context storage.
+ */
+@ThreadSafe
+@SdkProtectedApi
+public final class SdkInternalThreadLocal {
+    private static final ThreadLocal<Map<String, String>> STORAGE = new InheritableThreadLocal<>();
+
+    private SdkInternalThreadLocal() {
+    }
+
+    public static void put(String key, String value) {
+        if (key == null) {
+            throw new IllegalArgumentException("Key cannot be null");
+        }
+        Map<String, String> map = STORAGE.get();
+        if (value == null) {
+            if (map != null) {
+                map.remove(key);
+                if (map.isEmpty()) {
+                    STORAGE.remove();
+                }
+            }
+        } else {
+            if (map == null) {
+                map = new HashMap<>();
+                STORAGE.set(map);
+            }
+            map.put(key, value);
+        }
+    }
+
+    public static String get(String key) {
+        if (key == null) {
+            throw new IllegalArgumentException("Key cannot be null");
+        }
+        Map<String, String> map = STORAGE.get();
+        return map != null ? map.get(key) : null;
+    }
+
+    public static String remove(String key) {
+        if (key == null) {
+            throw new IllegalArgumentException("Key cannot be null");
+        }
+        Map<String, String> map = STORAGE.get();
+        return map != null ? map.remove(key) : null;
+    }
+
+    public static void clear() {
+        STORAGE.remove();
+    }
+
+    public static boolean containsKey(String key) {
+        if (key == null) {
+            throw new IllegalArgumentException("Key cannot be null");
+        }
+        Map<String, String> map = STORAGE.get();
+        return map != null && map.containsKey(key);
+    }
+}
\ No newline at end of file
diff --git a/utils-lite/src/test/java/software/amazon/awssdk/utilslite/ThreadStorageTest.java b/utils-lite/src/test/java/software/amazon/awssdk/utilslite/ThreadStorageTest.java
new file mode 100644
index 000000000000..07e5e34e2ecc
--- /dev/null
+++ b/utils-lite/src/test/java/software/amazon/awssdk/utilslite/ThreadStorageTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.utilslite;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SdkInternalThreadLocalTest {
+
+    @AfterEach
+    void cleanup() {
+        SdkInternalThreadLocal.clear();
+    }
+
+    @Test
+    void putAndGet_shouldStoreAndRetrieveValue() {
+        SdkInternalThreadLocal.put("test-key", "test-value");
+
+        assertThat(SdkInternalThreadLocal.get("test-key")).isEqualTo("test-value");
+    }
+
+    @Test
+    void get_withNonExistentKey_shouldReturnNull() {
+        assertThat(SdkInternalThreadLocal.get("non-existent")).isNull();
+    }
+
+    @Test
+    void put_withValidKeyValue_shouldStoreValue() {
+        SdkInternalThreadLocal.put("test-key", "test-value");
+
+        String removed = SdkInternalThreadLocal.remove("test-key");
+
+        assertThat(removed).isEqualTo("test-value");
+        assertThat(SdkInternalThreadLocal.get("test-key")).isNull();
+    }
+
+    @Test
+    void remove_withExistingKey_shouldRemoveAndReturnValue() {
+        SdkInternalThreadLocal.put("test-key", "test-value");
+        SdkInternalThreadLocal.put("test-key", null);
+
+        assertThat(SdkInternalThreadLocal.get("test-key")).isNull();
+    }
+
+    @Test
+    void clear_withMultipleValues_shouldRemoveAllValues() {
+        SdkInternalThreadLocal.put("key1", "value1");
+        SdkInternalThreadLocal.put("key2", "value2");
+
+        SdkInternalThreadLocal.clear();
+
+        assertThat(SdkInternalThreadLocal.get("key1")).isNull();
+        assertThat(SdkInternalThreadLocal.get("key2")).isNull();
+    }
+}
\ No newline at end of file
diff --git a/utils/pom.xml b/utils/pom.xml
index 00b11ae5aa5a..b5095aebce77 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/async/StoringSubscriberTest.java b/utils/src/test/java/software/amazon/awssdk/utils/async/StoringSubscriberTest.java
index 569022d97cfd..773fa7576a18 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/async/StoringSubscriberTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/async/StoringSubscriberTest.java
@@ -159,8 +159,6 @@ public void cancel() {
                 }
             };
 
-            subscriber.onSubscribe(subscription);
-
             Future<Object> consumerFuture = consumer.submit(() -> {
                 int expectedMessageNumber = 0;
                 while (testRunning.get()) {
@@ -183,6 +181,8 @@ public void cancel() {
                 return null;
             });
 
+            subscriber.onSubscribe(subscription);
+
             Thread.sleep(5_000);
             testRunning.set(false);
             consumerFuture.get();
diff --git a/v2-migration/README.md b/v2-migration/README.md
index 30a16d51180f..60302e1fdec2 100755
--- a/v2-migration/README.md
+++ b/v2-migration/README.md
@@ -1,11 +1,29 @@
 # AWS SDK for Java v2 Migration Tool
 
 ## Description
-This modules contains [OpenRewrite][open-rewrite] recipes to automate migration from the AWS SDK for Java v1 to the AWS SDK for Java v2.
+This module contains [OpenRewrite][open-rewrite] recipes to automate migration from the AWS SDK for Java v1 to the 
+AWS SDK for Java v2.
+
+While the majority of v1 code is supported by recipes that transform to the v2 equivalent, there are some classes and 
+methods not covered by the migration tool. For these classes and methods, refer to our 
+[Developer Guide][developer-guide-steps] and [API Reference][api-reference-v2] to manually migrate your code.
 
 ## Usage
 
-For steps on performing the migration, see our [Developer Guide][developer-guide].
+For detailed steps on using the tool, see our [Developer Guide][developer-guide].
+
+### Maven Project
+
+To transform a Maven project, run the following command from your project root directory:
+
+```
+mvn org.openrewrite.maven:rewrite-maven-plugin:6.17.0 \
+  -Drewrite.recipeArtifactCoordinates=software.amazon.awssdk:v2-migration:2.34.0 \
+  -Drewrite.activeRecipes=software.amazon.awssdk.v2migration.AwsSdkJavaV1ToV2
+```
+
+**Note:** Newer OpenRewrite versions may not be compatible. If errors occur during the transforms, specify the 
+[SDK supported version][maven-plugin-version], e.g., `6.17.0`, and run the command again.
 
 ## Development
 
@@ -31,4 +49,7 @@ code and ensures it compiles.
 [open-rewrite]: https://docs.openrewrite.org/
 [rewrite-test]: https://docs.openrewrite.org/authoring-recipes/recipe-testing#rewritetest-interface
 [v2-migration-tests]: ../test/v2-migration-tests
-[developer-guide]: https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/migration-tool.html
\ No newline at end of file
+[developer-guide]: https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/migration-tool.html
+[developer-guide-steps]: https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/migration-steps.html
+[api-reference-v2]: https://sdk.amazonaws.com/java/api/latest/index.html
+[maven-plugin-version]: https://github.com/aws/aws-sdk-java-v2/blob/master/test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTestBase.java#L54
\ No newline at end of file
diff --git a/v2-migration/pom.xml b/v2-migration/pom.xml
index 9f183630c041..bcf7046a396c 100644
--- a/v2-migration/pom.xml
+++ b/v2-migration/pom.xml
@@ -21,12 +21,12 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.34.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>v2-migration</artifactId>
-    <version>${awsjavasdk.version}-PREVIEW</version>
+    <version>${awsjavasdk.version}</version>
     <name>AWS Java SDK :: V2 Migration</name>
     <description>
         Contains OpenRewrite recipes to help users migrate from the AWS SDK for Java v1 to the AWS SDK for Java v2
@@ -34,7 +34,7 @@
 
     <properties>
         <awsjavasdk.version>${project.parent.version}</awsjavasdk.version>
-        <openrewrite.version>2.23.0</openrewrite.version>
+        <openrewrite.version>3.14.0</openrewrite.version>
         <junit.version>5.10.3</junit.version>
         <awssdkjavav1.version>1.12.472</awssdkjavav1.version>
     </properties>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java-8</artifactId>
-            <scope>runtime</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openrewrite.recipe</groupId>
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/ConstructorToFluent.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/ConstructorToFluent.java
index 51e8c726b8dc..f0e7d65ae36e 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/ConstructorToFluent.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/ConstructorToFluent.java
@@ -147,6 +147,8 @@ private static J.MethodInvocation addWither(Expression select, String simpleName
                 Collections.singletonList(simpleName),
                 Collections.singletonList(parameterType),
                 null,
+                null,
+                null,
                 null
             );
 
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/HttpSettingsToHttpClient.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/HttpSettingsToHttpClient.java
index b29ce8b40791..b32a02291e84 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/HttpSettingsToHttpClient.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/HttpSettingsToHttpClient.java
@@ -308,6 +308,8 @@ private J.MethodInvocation addHttpClientBuilderIfNeeded(
                 Collections.emptyList(),
                 parametersTypes,
                 Collections.emptyList(),
+                Collections.emptyList(),
+                Collections.emptyList(),
                 Collections.emptyList()
             );
 
@@ -359,6 +361,8 @@ private JContainer<Expression> httpClientBuilderInvoke(Map<String, Expression> h
                 Collections.emptyList(),
                 Collections.emptyList(),
                 Collections.emptyList(),
+                Collections.emptyList(),
+                Collections.emptyList(),
                 Collections.emptyList()
             );
 
@@ -403,6 +407,8 @@ private static J.MethodInvocation invokeHttpSetting(Map.Entry<String, Expression
                 Collections.emptyList(),
                 parametersTypes,
                 Collections.emptyList(),
+                Collections.emptyList(),
+                Collections.emptyList(),
                 Collections.emptyList()
             );
 
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/NewClassToBuilder.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/NewClassToBuilder.java
index d275946f8e22..27c0778e705e 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/NewClassToBuilder.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/NewClassToBuilder.java
@@ -131,6 +131,8 @@ public J visitNewClass(J.NewClass previousNewClass, ExecutionContext executionCo
                 Collections.emptyList(),
                 Collections.emptyList(),
                 Collections.emptyList(),
+                Collections.emptyList(),
+                Collections.emptyList(),
                 Collections.emptyList()
             );
 
@@ -156,6 +158,8 @@ public J visitNewClass(J.NewClass previousNewClass, ExecutionContext executionCo
                 Collections.emptyList(),
                 Collections.emptyList(),
                 Collections.emptyList(),
+                Collections.emptyList(),
+                Collections.emptyList(),
                 Collections.emptyList()
             );
 
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3AddImportsAndComments.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3AddImportsAndComments.java
index 6f14bbeadb77..3004c5f66e41 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3AddImportsAndComments.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3AddImportsAndComments.java
@@ -39,7 +39,7 @@
 public class S3AddImportsAndComments extends Recipe {
 
     private static final MethodMatcher CREATE_BUCKET = v1S3MethodMatcher("createBucket(String, "
-                                                                         + V1_S3_MODEL_PKG + "Region");
+                                                                         + V1_S3_MODEL_PKG + "Region)");
     private static final MethodMatcher LIST_NEXT_BATCH_OBJECTS = v1S3MethodMatcher("listNextBatchOfObjects(..)");
     private static final MethodMatcher LIST_NEXT_BATCH_VERSIONS = v1S3MethodMatcher("listNextBatchOfVersions(..)");
     private static final MethodMatcher GET_METADATA = v1S3MethodMatcher("getCachedResponseMetadata(..)");
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3NonStreamingRequestToV2.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3NonStreamingRequestToV2.java
index b64cb7264e0b..2154c480706a 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3NonStreamingRequestToV2.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3NonStreamingRequestToV2.java
@@ -331,6 +331,8 @@ private Expression argsToPojo(JavaType.FullyQualified fqcn, List<String> names,
                 names,
                 types,
                 null,
+                null,
+                null,
                 null
             );
 
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3PojoToV2.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3PojoToV2.java
new file mode 100644
index 000000000000..3503b038d4d3
--- /dev/null
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3PojoToV2.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.v2migration;
+
+import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.V1_S3_MODEL_PKG;
+import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.V2_S3_MODEL_PKG;
+
+import java.util.List;
+import java.util.regex.Pattern;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.java.AddImport;
+import org.openrewrite.java.JavaTemplate;
+import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.tree.Expression;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaType;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+@SdkInternalApi
+public class S3PojoToV2 extends Recipe {
+
+    private static final Pattern COMPETE_MPU = Pattern.compile(V1_S3_MODEL_PKG + "CompleteMultipartUploadRequest");
+    private static final Pattern OBJECT_TAGGING = Pattern.compile(V1_S3_MODEL_PKG + "ObjectTagging");
+    private static final Pattern GET_OBJECT_TAGGING_RESULT = Pattern.compile(V1_S3_MODEL_PKG + "GetObjectTaggingResult");
+
+    @Override
+    public String getDisplayName() {
+        return "S3 POJOs to V2";
+    }
+
+    @Override
+    public String getDescription() {
+        return "S3 POJOs to V2";
+    }
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new Visitor();
+    }
+
+    private static final class Visitor extends JavaVisitor<ExecutionContext> {
+
+        @Override
+        public J visitNewClass(J.NewClass newClass, ExecutionContext executionContext) {
+            JavaType type = newClass.getType();
+            if (!(type instanceof JavaType.FullyQualified)) {
+                return newClass;
+            }
+
+            if (type.isAssignableFrom(COMPETE_MPU) && newClass.getArguments().size() == 4) {
+                addV2S3ModelImport("CompleteMultipartUploadRequest");
+                addV2S3ModelImport("CompletedMultipartUpload");
+                List<Expression> params = newClass.getArguments();
+                String v2Builder = "CompleteMultipartUploadRequest.builder().bucket(#{any()}).key(#{any()}).uploadId(#{any()})"
+                                   + ".multipartUpload(CompletedMultipartUpload.builder().parts(#{any()}).build()).build()";
+                return JavaTemplate.builder(v2Builder)
+                                   .build().apply(getCursor(), newClass.getCoordinates().replace(),
+                                                  params.get(0), params.get(1), params.get(2),  params.get(3));
+            }
+            if (type.isAssignableFrom(OBJECT_TAGGING) && newClass.getArguments().size() == 1) {
+                String v2Builder = "Tagging.builder().tagSet(#{any()}).build();";
+                return JavaTemplate.builder(v2Builder)
+                                   .build().apply(getCursor(), newClass.getCoordinates().replace(),
+                                                  newClass.getArguments().get(0));
+            }
+            if (type.isAssignableFrom(GET_OBJECT_TAGGING_RESULT) && newClass.getArguments().size() == 1) {
+                String v2Builder = "GetObjectTaggingResponse.builder().tagSet(#{any()}).build();";
+                return JavaTemplate.builder(v2Builder)
+                                   .build().apply(getCursor(), newClass.getCoordinates().replace(),
+                                                  newClass.getArguments().get(0));
+            }
+
+            return super.visitNewClass(newClass, executionContext);
+        }
+
+        private void addV2S3ModelImport(String className) {
+            doAfterVisit(new AddImport<>(V2_S3_MODEL_PKG + className, null, false));
+        }
+    }
+}
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3PutObjectRequestToV2.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3PutObjectRequestToV2.java
index 151d24a95c24..db9601b045e5 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3PutObjectRequestToV2.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3PutObjectRequestToV2.java
@@ -305,13 +305,8 @@ private J.MethodInvocation addInputStreamToPutObject(J.MethodInvocation method,
                     .withComments(inputStreamBufferingWarningComment());
             }
 
-            StringBuilder sb = new StringBuilder("#{any()}, RequestBody.fromInputStream(#{any()}, #{any()}");
-            if (contentLen instanceof J.Literal) {
-                sb.append("L");
-            }
-            sb.append(")");
-
-            return JavaTemplate.builder(sb.toString()).build()
+            v2Method = "#{any()}, RequestBody.fromInputStream(#{any()}, #{any()})";
+            return JavaTemplate.builder(v2Method).build()
                                .apply(getCursor(), method.getCoordinates().replaceArguments(),
                                       method.getArguments().get(0), inputStream, contentLen);
         }
@@ -346,12 +341,7 @@ private J.MethodInvocation transformPutObjectWithStreamAndMetadata(J.MethodInvoc
                                    .withComments(inputStreamBufferingWarningComment());
             }
 
-            sb.append(".build(), RequestBody.fromInputStream(#{any()}, #{any()}");
-
-            if (contentLen instanceof J.Literal) {
-                sb.append("L");
-            }
-            sb.append(")");
+            sb.append(".build(), RequestBody.fromInputStream(#{any()}, #{any()})");
 
             params = Arrays.copyOf(params, 4);
             params[3] = contentLen;
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3StreamingRequestToV2.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3StreamingRequestToV2.java
index 9d9c237acc1c..403bd213a6bd 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3StreamingRequestToV2.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3StreamingRequestToV2.java
@@ -123,6 +123,8 @@ private J.MethodInvocation stringToRequestBody(Expression fileExpr) {
                 Collections.singletonList("stringContent"),
                 Collections.singletonList(JavaType.buildType("java.lang.String")),
                 null,
+                null,
+                null,
                 null
             );
 
@@ -186,6 +188,8 @@ private J.MethodInvocation fileToRequestBody(Expression fileExpr) {
                 Collections.singletonList("file"),
                 Collections.singletonList(JavaType.buildType("java.io.File")),
                 null,
+                null,
+                null,
                 null
             );
 
@@ -217,6 +221,8 @@ private Expression bucketAndKeyToPutObject(Expression bucketExpr, Expression key
                 Arrays.asList("bucket", "key"),
                 Arrays.asList(bucketExpr.getType(), keyExpr.getType()),
                 null,
+                null,
+                null,
                 null
             );
 
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3StreamingResponseToV2.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3StreamingResponseToV2.java
index 3504afb21e51..1c7e8adce40c 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3StreamingResponseToV2.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3StreamingResponseToV2.java
@@ -149,6 +149,8 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext execu
                 Collections.emptyList(),
                 Collections.emptyList(),
                 Collections.emptyList(),
+                Collections.emptyList(),
+                Collections.emptyList(),
                 Collections.emptyList()
             );
 
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/SdkExceptionToV2.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/SdkExceptionToV2.java
new file mode 100644
index 000000000000..8e244787bdb6
--- /dev/null
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/SdkExceptionToV2.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file 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.
+ */
+
+package software.amazon.awssdk.v2migration;
+
+import static software.amazon.awssdk.v2migration.internal.utils.NamingUtils.transformMethodName;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.MethodMatcher;
+import org.openrewrite.java.tree.J;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+@SdkInternalApi
+public class SdkExceptionToV2 extends Recipe {
+
+    public static MethodMatcher v1ExceptionMethod(String methodSignature) {
+        return new MethodMatcher("com.amazonaws.AmazonServiceException " + methodSignature, true);
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "SDK Exceptions Methods to V2";
+    }
+
+    @Override
+    public String getDescription() {
+        return "SDK Exceptions Methods to V2";
+    }
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new Visitor();
+    }
+
+    private static final class Visitor extends JavaIsoVisitor<ExecutionContext> {
+
+        @Override
+        public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
+            if (v1ExceptionMethod("getErrorCode()").matches(method)) {
+                String newMethodName = "awsErrorDetails().errorCode()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
+            if (v1ExceptionMethod("getServiceName()").matches(method)) {
+                String newMethodName = "awsErrorDetails().serviceName()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
+            if (v1ExceptionMethod("getErrorMessage()").matches(method)) {
+                String newMethodName = "awsErrorDetails().errorMessage()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
+            if (v1ExceptionMethod("getStatusCode()").matches(method)) {
+                String newMethodName = "awsErrorDetails().sdkHttpResponse().statusCode()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
+            if (v1ExceptionMethod("getHttpHeaders()").matches(method)) {
+                // TODO: v2 returns Map<String, List<String>>. Convert it to Map<String, String>
+                String newMethodName = "awsErrorDetails().sdkHttpResponse().headers()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
+            if (v1ExceptionMethod("getRawResponse()").matches(method)) {
+                String newMethodName = "awsErrorDetails().rawResponse().asByteArray()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
+            if (v1ExceptionMethod("getRawResponseContent()").matches(method)) {
+                String newMethodName = "awsErrorDetails().rawResponse().asUtf8String()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
+
+            return super.visitMethodInvocation(method, executionContext);
+        }
+    }
+}
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/TransferManagerMethodsToV2.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/TransferManagerMethodsToV2.java
index 749d94d1ed8a..d9a7948bd619 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/TransferManagerMethodsToV2.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/TransferManagerMethodsToV2.java
@@ -15,10 +15,12 @@
 
 package software.amazon.awssdk.v2migration;
 
+import static software.amazon.awssdk.v2migration.internal.utils.NamingUtils.transformMethodName;
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.V2_S3_MODEL_PKG;
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.V2_TM_CLIENT;
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.V2_TM_MODEL_PKG;
 import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.v2TmMethodMatcher;
+import static software.amazon.awssdk.v2migration.internal.utils.S3TransformUtils.v2TransferProgressMethodMatcher;
 
 import java.util.regex.Pattern;
 import org.openrewrite.ExecutionContext;
@@ -49,14 +51,18 @@ public class TransferManagerMethodsToV2 extends Recipe {
     private static final MethodMatcher COPY_REQUEST =
         v2TmMethodMatcher(String.format("copy(%sCopyObjectRequest)", V2_S3_MODEL_PKG));
     private static final MethodMatcher COPY_BUCKET_KEY =
-        v2TmMethodMatcher("copy(String, String, String, String");
+        v2TmMethodMatcher("copy(String, String, String, String)");
 
     private static final MethodMatcher DOWNLOAD_DIR = v2TmMethodMatcher("downloadDirectory(String, String, java.io.File)");
 
     private static final MethodMatcher UPLOAD_DIR = v2TmMethodMatcher("uploadDirectory(String, String, java.io.File, boolean)");
 
+    private static final MethodMatcher GET_BYTES_TRANSFERRED = v2TransferProgressMethodMatcher("getBytesTransferred()");
+    private static final MethodMatcher GET_TOTAL_BYTES_TO_TRANSFER = v2TransferProgressMethodMatcher("getTotalBytesToTransfer()");
+    private static final MethodMatcher GET_PERCENT_TRANSFERRED = v2TransferProgressMethodMatcher("getPercentTransferred()");
+
     private static final Pattern S3_TM_CREDENTIAL = Pattern.compile(V2_TM_CLIENT);
-    private static final Pattern V2_AWSCREDENTAIL = Pattern.compile("software.amazon.awssdk.auth.credentials.AwsCredentials");
+    private static final Pattern V2_AWS_CREDENTIALS = Pattern.compile("software.amazon.awssdk.auth.credentials.AwsCredentials");
     private static final Pattern V2_CREDENTIAL_PROVIDER = Pattern.compile("software.amazon.awssdk.auth.credentials"
                                                                           + ".AwsCredentialsProvider");
 
@@ -116,6 +122,21 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext execu
                 method = transformUploadDirectory(method);
                 return super.visitMethodInvocation(method, executionContext);
             }
+            if (GET_BYTES_TRANSFERRED.matches(method, false)) {
+                String newMethodName = "snapshot().transferredBytes()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
+            if (GET_TOTAL_BYTES_TO_TRANSFER.matches(method, false)) {
+                String newMethodName = "snapshot().totalBytes()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
+            if (GET_PERCENT_TRANSFERRED.matches(method, false)) {
+                String newMethodName = "snapshot().ratioTransferred()";
+                method = transformMethodName(method, newMethodName, getCursor());
+                return super.visitMethodInvocation(method, executionContext);
+            }
 
             return super.visitMethodInvocation(method, executionContext);
         }
@@ -131,7 +152,7 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext executionContext) {
                 newClass.getArguments().size() == 1 &&
                 newClass.getArguments().get(0).getType() != null) {
                 Expression arg = newClass.getArguments().get(0);
-                if (arg.getType().isAssignableFrom(V2_AWSCREDENTAIL)) {
+                if (arg.getType().isAssignableFrom(V2_AWS_CREDENTIALS)) {
                     addS3AsyncClientImport();
                     addStaticCredentialsProviderImport();
 
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/V1BuilderVariationsToV2Builder.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/V1BuilderVariationsToV2Builder.java
index 2264637619a9..d8bb986e03b9 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/V1BuilderVariationsToV2Builder.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/V1BuilderVariationsToV2Builder.java
@@ -135,6 +135,8 @@ private J.MethodInvocation renameStandardToBuilderOrDefaultClientToCreate(J.Meth
                 Collections.emptyList(),
                 Collections.emptyList(),
                 Collections.emptyList(),
+                Collections.emptyList(),
+                Collections.emptyList(),
                 Collections.emptyList()
             );
 
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/internal/utils/NamingUtils.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/internal/utils/NamingUtils.java
index 3e1c71f800e0..64f8a3858d28 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/internal/utils/NamingUtils.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/internal/utils/NamingUtils.java
@@ -15,6 +15,9 @@
 
 package software.amazon.awssdk.v2migration.internal.utils;
 
+import org.openrewrite.Cursor;
+import org.openrewrite.java.JavaTemplate;
+import org.openrewrite.java.tree.J;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.internal.CodegenNamingUtils;
@@ -59,6 +62,11 @@ public static boolean isSetter(String name) {
     }
 
     public static boolean isGetter(String name) {
-        return !StringUtils.isBlank(name) && name.startsWith("get") && !name.equals("get");
+        return !StringUtils.isBlank(name) && name.startsWith("get") && !"get".equals(name);
+    }
+
+    public static J.MethodInvocation transformMethodName(J.MethodInvocation method, String newMethodName, Cursor cursor) {
+        return JavaTemplate.builder("#{any()}." + newMethodName).build()
+                           .apply(cursor, method.getCoordinates().replace(), method.getSelect());
     }
 }
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/internal/utils/S3TransformUtils.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/internal/utils/S3TransformUtils.java
index 87981c4f8bca..a4390027f79b 100644
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/internal/utils/S3TransformUtils.java
+++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/internal/utils/S3TransformUtils.java
@@ -46,6 +46,7 @@ public final class S3TransformUtils {
 
     public static final String V2_TM_CLIENT = "software.amazon.awssdk.transfer.s3.S3TransferManager";
     public static final String V2_TM_MODEL_PKG = "software.amazon.awssdk.transfer.s3.model.";
+    public static final String V2_TM_PROGRESS = "software.amazon.awssdk.transfer.s3.progress.TransferProgress";
 
     public static final Set<String> SUPPORTED_METADATA_TRANSFORMS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
         "contentLength",
@@ -91,6 +92,10 @@ public static MethodMatcher v2TmMethodMatcher(String methodSignature) {
         return new MethodMatcher(V2_TM_CLIENT + " " + methodSignature, true);
     }
 
+    public static MethodMatcher v2TransferProgressMethodMatcher(String methodSignature) {
+        return new MethodMatcher(V2_TM_PROGRESS + " " + methodSignature, true);
+    }
+
     public static void addMetadataFields(StringBuilder sb, String metadataName,
                                          Map<String, Map<String, Expression>> metadataMap) {
         Map<String, Expression> map = metadataMap.get(metadataName);
diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/openrewrite/ChangeMethodInvocationReturnType.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/openrewrite/ChangeMethodInvocationReturnType.java
deleted file mode 100644
index 40b3706d96f5..000000000000
--- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/openrewrite/ChangeMethodInvocationReturnType.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file 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.
- */
-
-package software.amazon.awssdk.v2migration.openrewrite;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Collections;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Option;
-import org.openrewrite.Recipe;
-import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.MethodMatcher;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaType;
-import org.openrewrite.java.tree.TypeUtils;
-import org.openrewrite.marker.Markers;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-
-/**
- * This class contains source imported from https://github
- * .com/openrewrite/rewrite/blob/main/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodInvocationReturnType.java,
- * licensed under the Apache License 2.0, available at the time of the fork (4/11/2025) here:
- * https://github.com/openrewrite/rewrite/blob/main/LICENSE
- * <p>
- * All original source licensed under the Apache License 2.0. All modifications are licensed under the Apache
- * License 2.0 by Amazon Web Services.
- */
-@SdkInternalApi
-public class ChangeMethodInvocationReturnType extends Recipe {
-
-    @Option(displayName = "Method pattern",
-        description = "A method pattern is used to find matching method invocations.",
-        example = "org.mockito.Matchers anyVararg()")
-    private final String methodPattern;
-
-    @Option(displayName = "New method invocation return type",
-        description = "The fully qualified new return type of method invocation.",
-        example = "long")
-    private final String newReturnType;
-
-    @JsonCreator
-    public ChangeMethodInvocationReturnType(@JsonProperty("methodPattern") String methodPattern,
-                                            @JsonProperty("newReturnType") String newReturnType) {
-        this.methodPattern = methodPattern;
-        this.newReturnType = newReturnType;
-    }
-
-    @Override
-    public String getDisplayName() {
-        return "Change method invocation return type";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Changes the return type of a method invocation.";
-    }
-
-    @Override
-    public TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new JavaIsoVisitor<ExecutionContext>() {
-            private final MethodMatcher methodMatcher = new MethodMatcher(methodPattern, false);
-
-            private boolean methodUpdated;
-
-            @Override
-            public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
-                J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
-                JavaType.Method type = m.getMethodType();
-                if (methodMatcher.matches(method) && type != null && !newReturnType.equals(type.getReturnType().toString())) {
-                    type = type.withReturnType(JavaType.buildType(newReturnType));
-                    m = m.withMethodType(type);
-                    if (m.getName().getType() != null) {
-                        m = m.withName(m.getName().withType(type));
-                    }
-                    methodUpdated = true;
-                }
-                return m;
-            }
-
-            @Override
-            public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
-                methodUpdated = false;
-                JavaType.FullyQualified originalType = multiVariable.getTypeAsFullyQualified();
-                J.VariableDeclarations mv = super.visitVariableDeclarations(multiVariable, ctx);
-
-                if (methodUpdated) {
-                    JavaType newType = JavaType.buildType(newReturnType);
-                    JavaType.FullyQualified newFieldType = TypeUtils.asFullyQualified(newType);
-
-                    maybeAddImport(newFieldType);
-                    maybeRemoveImport(originalType);
-
-                    mv = mv.withTypeExpression(mv.getTypeExpression() == null ?
-                                               null :
-                                               new J.Identifier(mv.getTypeExpression().getId(),
-                                                                mv.getTypeExpression().getPrefix(),
-                                                                Markers.EMPTY,
-                                                                Collections.emptyList(),
-                                                                newReturnType.substring(newReturnType.lastIndexOf('.') + 1),
-                                                                newType,
-                                                                null
-                                               )
-                    );
-
-                    mv = mv.withVariables(ListUtils.map(mv.getVariables(), var -> {
-                        JavaType.FullyQualified varType = TypeUtils.asFullyQualified(var.getType());
-                        if (varType != null && !varType.equals(newType)) {
-                            return var.withType(newType).withName(var.getName().withType(newType));
-                        }
-                        return var;
-                    }));
-                }
-
-                return mv;
-            }
-        };
-    }
-}
\ No newline at end of file
diff --git a/v2-migration/src/main/resources/META-INF/rewrite/aws-sdk-java-v1-to-v2-with-tm.yml b/v2-migration/src/main/resources/META-INF/rewrite/aws-sdk-java-v1-to-v2-with-tm.yml
deleted file mode 100644
index 9769969f3748..000000000000
--- a/v2-migration/src/main/resources/META-INF/rewrite/aws-sdk-java-v1-to-v2-with-tm.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-#
-#  http://aws.amazon.com/apache2.0
-#
-# or in the "license" file accompanying this file. This file 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.
-#
----
-type: specs.openrewrite.org/v1beta/recipe
-name: software.amazon.awssdk.v2migration.AwsSdkJavaV1ToV2Experimental
-displayName: Migrate from the AWS SDK for Java v1 to the AWS SDK for Java v2 including S3 Transfer Manager.
-description: This recipe will apply changes required for migrating from the AWS SDK for Java v1 to the AWS SDK for Java v2, including S3 Transfer Manager. Transforms for Transfer Manager are incomplete and in-progress.
-tags:
-  - aws
-  - sdk
-recipeList:
-  - software.amazon.awssdk.v2migration.AddTransferManagerDependency
-  - software.amazon.awssdk.v2migration.AddS3EventNotificationDependency
-  - software.amazon.awssdk.v2migration.UpgradeSdkDependencies
-  - software.amazon.awssdk.v2migration.S3AddImportsAndComments
-  - software.amazon.awssdk.v2migration.S3EventNotificationMethodToV2
-  - software.amazon.awssdk.v2migration.S3TypesToV2
-  - software.amazon.awssdk.v2migration.S3StreamingResponseToV2
-  - software.amazon.awssdk.v2migration.S3StreamingRequestToV2
-  - software.amazon.awssdk.v2migration.S3NonStreamingRequestToV2
-  - software.amazon.awssdk.v2migration.S3MethodsToV2
-  - software.amazon.awssdk.v2migration.S3EventNotificationMethodsToV2
-  - software.amazon.awssdk.v2migration.S3MethodsConstructorToFluent
-  - software.amazon.awssdk.v2migration.S3UriToV2
-  - software.amazon.awssdk.v2migration.EnumGettersToV2
-  - software.amazon.awssdk.v2migration.ChangeTransferManagerTypes
-  - software.amazon.awssdk.v2migration.ChangeS3EventNotificationTypes
-  - software.amazon.awssdk.v2migration.ChangeSdkType
-  - software.amazon.awssdk.v2migration.ChangeSdkCoreTypes
-  # At this point, all classes should be changed to v2 equivalents
-  - software.amazon.awssdk.v2migration.V1BuilderVariationsToV2Builder
-  - software.amazon.awssdk.v2migration.NewClassToBuilderPattern
-  - software.amazon.awssdk.v2migration.NewClassToStaticFactory
-  - software.amazon.awssdk.v2migration.V1GetterToV2
-  - software.amazon.awssdk.v2migration.HttpSettingsToHttpClient
-  - software.amazon.awssdk.v2migration.WrapSdkClientBuilderRegionStr
-  - software.amazon.awssdk.v2migration.EnumCasingToV2
-  - software.amazon.awssdk.v2migration.SdkBytesToByteBuffer
-  - software.amazon.awssdk.v2migration.ByteBufferToSdkBytes
-  - software.amazon.awssdk.v2migration.DateToInstant
-  - software.amazon.awssdk.v2migration.S3NonStreamingRequestToV2Complex
-  - software.amazon.awssdk.v2migration.S3PutObjectRequestToV2
-  - software.amazon.awssdk.v2migration.SettersToBuilderV2
-  - software.amazon.awssdk.v2migration.S3TmAddComments
-  - software.amazon.awssdk.v2migration.ChangeTransferManagerSimpleMethods
-  - software.amazon.awssdk.v2migration.TransferManagerMethodsToV2
\ No newline at end of file
diff --git a/v2-migration/src/main/resources/META-INF/rewrite/aws-sdk-java-v1-to-v2.yml b/v2-migration/src/main/resources/META-INF/rewrite/aws-sdk-java-v1-to-v2.yml
index 3c4f420719f5..3a427b78bfef 100644
--- a/v2-migration/src/main/resources/META-INF/rewrite/aws-sdk-java-v1-to-v2.yml
+++ b/v2-migration/src/main/resources/META-INF/rewrite/aws-sdk-java-v1-to-v2.yml
@@ -21,6 +21,7 @@ tags:
   - aws
   - sdk
 recipeList:
+  - software.amazon.awssdk.v2migration.AddTransferManagerDependency
   - software.amazon.awssdk.v2migration.AddS3EventNotificationDependency
   - software.amazon.awssdk.v2migration.UpgradeSdkDependencies
   - software.amazon.awssdk.v2migration.S3AddImportsAndComments
@@ -31,11 +32,14 @@ recipeList:
   - software.amazon.awssdk.v2migration.S3NonStreamingRequestToV2
   - software.amazon.awssdk.v2migration.S3MethodsToV2
   - software.amazon.awssdk.v2migration.S3EventNotificationMethodsToV2
+  - software.amazon.awssdk.v2migration.S3PojoToV2
   - software.amazon.awssdk.v2migration.S3MethodsConstructorToFluent
   - software.amazon.awssdk.v2migration.S3UriToV2
   - software.amazon.awssdk.v2migration.EnumGettersToV2
+  - software.amazon.awssdk.v2migration.ChangeTransferManagerTypes
   - software.amazon.awssdk.v2migration.ChangeS3EventNotificationTypes
   - software.amazon.awssdk.v2migration.ChangeSdkType
+  - software.amazon.awssdk.v2migration.SdkExceptionToV2
   - software.amazon.awssdk.v2migration.ChangeSdkCoreTypes
   # At this point, all classes should be changed to v2 equivalents
   - software.amazon.awssdk.v2migration.V1BuilderVariationsToV2Builder
@@ -50,4 +54,7 @@ recipeList:
   - software.amazon.awssdk.v2migration.DateToInstant
   - software.amazon.awssdk.v2migration.S3NonStreamingRequestToV2Complex
   - software.amazon.awssdk.v2migration.S3PutObjectRequestToV2
-  - software.amazon.awssdk.v2migration.SettersToBuilderV2
\ No newline at end of file
+  - software.amazon.awssdk.v2migration.SettersToBuilderV2
+  - software.amazon.awssdk.v2migration.S3TmAddComments
+  - software.amazon.awssdk.v2migration.ChangeTransferManagerSimpleMethods
+  - software.amazon.awssdk.v2migration.TransferManagerMethodsToV2
\ No newline at end of file
diff --git a/v2-migration/src/main/resources/META-INF/rewrite/change-exception-types.yml b/v2-migration/src/main/resources/META-INF/rewrite/change-exception-types.yml
index ac28f9e1ea5d..601c78dc6cf9 100644
--- a/v2-migration/src/main/resources/META-INF/rewrite/change-exception-types.yml
+++ b/v2-migration/src/main/resources/META-INF/rewrite/change-exception-types.yml
@@ -31,28 +31,6 @@ recipeList:
   - org.openrewrite.java.ChangeMethodName:
       methodPattern: com.amazonaws.AmazonServiceException getRequestId()
       newMethodName: requestId
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: com.amazonaws.AmazonServiceException getErrorCode()
-      newMethodName: awsErrorDetails().errorCode
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: com.amazonaws.AmazonServiceException getServiceName()
-      newMethodName: awsErrorDetails().serviceName
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: com.amazonaws.AmazonServiceException getErrorMessage()
-      newMethodName: awsErrorDetails().errorMessage
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: com.amazonaws.AmazonServiceException getStatusCode()
-      newMethodName: awsErrorDetails().sdkHttpResponse().statusCode
-  ### TODO: v2 returns Map<String, List<String>>. Convert it to Map<String, String>
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: com.amazonaws.AmazonServiceException getHttpHeaders()
-      newMethodName: awsErrorDetails().sdkHttpResponse().headers
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: com.amazonaws.AmazonServiceException getRawResponse()
-      newMethodName: awsErrorDetails().rawResponse().asByteArray
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: com.amazonaws.AmazonServiceException getRawResponseContent()
-      newMethodName: awsErrorDetails().rawResponse().asUtf8String
   - software.amazon.awssdk.v2migration.AddCommentToMethod:
       methodPattern: com.amazonaws.AmazonServiceException getErrorType()
       comment: getErrorType is not supported in v2. AwsServiceException is a service error in v2. Consider removing it.
diff --git a/v2-migration/src/main/resources/META-INF/rewrite/change-s3-event-notification-methods.yml b/v2-migration/src/main/resources/META-INF/rewrite/change-s3-event-notification-methods.yml
index d43fc06bdb39..3d590ef614cd 100644
--- a/v2-migration/src/main/resources/META-INF/rewrite/change-s3-event-notification-methods.yml
+++ b/v2-migration/src/main/resources/META-INF/rewrite/change-s3-event-notification-methods.yml
@@ -17,7 +17,7 @@ name: software.amazon.awssdk.v2migration.S3EventNotificationMethodsToV2
 displayName: Change S3EventNotification methods to v2.
 description: Change S3EventNotification methods to v2.
 recipeList:
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.event.S3EventNotification.S3EventNotificationRecord getEventNameAsEnum()
       newReturnType: String
   - org.openrewrite.java.ChangeMethodName:
diff --git a/v2-migration/src/main/resources/META-INF/rewrite/change-s3-types.yml b/v2-migration/src/main/resources/META-INF/rewrite/change-s3-types.yml
index 0c8096334214..0d0e3391c8e1 100644
--- a/v2-migration/src/main/resources/META-INF/rewrite/change-s3-types.yml
+++ b/v2-migration/src/main/resources/META-INF/rewrite/change-s3-types.yml
@@ -17,82 +17,82 @@ name: software.amazon.awssdk.v2migration.S3TypesToV2
 displayName: Change S3 types to v2.
 description: Change S3 types to v2.
 recipeList:
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getObject(com.amazonaws.services.s3.model.GetObjectRequest, java.io.File)
       newReturnType: software.amazon.awssdk.services.s3.model.GetObjectResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketAcl(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketAclResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getObjectAcl(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetObjectAclResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketAccelerateConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketAccelerateConfigurationResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketLifecycleConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketLifecycleConfigurationResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketCrossOriginConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketCorsResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketLoggingConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketLoggingResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketNotificationConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketNotificationConfigurationResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketPolicy(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketPolicyResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketReplicationConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketReplicationResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketTaggingConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketTaggingResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketVersioningConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketVersioningResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3 getBucketWebsiteConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketWebsiteResponse
 
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getObject(com.amazonaws.services.s3.model.GetObjectRequest, java.io.File)
       newReturnType: software.amazon.awssdk.services.s3.model.GetObjectResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketAcl(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketAclResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getObjectAcl(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetObjectAclResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketAccelerateConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketAccelerateConfigurationResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketLifecycleConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketLifecycleConfigurationResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketCrossOriginConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketCorsResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketLoggingConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketLoggingResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketNotificationConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketNotificationConfigurationResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketPolicy(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketPolicyResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketReplicationConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketReplicationResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketTaggingConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketTaggingResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketVersioningConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketVersioningResponse
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.AmazonS3Client getBucketWebsiteConfiguration(..)
       newReturnType: software.amazon.awssdk.services.s3.model.GetBucketWebsiteResponse
\ No newline at end of file
diff --git a/v2-migration/src/main/resources/META-INF/rewrite/change-transfer-manager-simple-methods.yml b/v2-migration/src/main/resources/META-INF/rewrite/change-transfer-manager-simple-methods.yml
index 8fbc8dee0856..d4dc3f6f3cc2 100644
--- a/v2-migration/src/main/resources/META-INF/rewrite/change-transfer-manager-simple-methods.yml
+++ b/v2-migration/src/main/resources/META-INF/rewrite/change-transfer-manager-simple-methods.yml
@@ -34,13 +34,4 @@ recipeList:
       newMethodName: serializeToString
   - org.openrewrite.java.ChangeMethodName:
       methodPattern: software.amazon.awssdk.transfer.s3.model.ResumableTransfer serialize(java.io.OutputStream)
-      newMethodName: serializeToOutputStream
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: software.amazon.awssdk.transfer.s3.progress.TransferProgress getBytesTransferred()
-      newMethodName: snapshot().transferredBytes
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: software.amazon.awssdk.transfer.s3.progress.TransferProgress getTotalBytesToTransfer()
-      newMethodName: snapshot().totalBytes
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: software.amazon.awssdk.transfer.s3.progress.TransferProgress getPercentTransferred()
-      newMethodName: snapshot().ratioTransferred
\ No newline at end of file
+      newMethodName: serializeToOutputStream
\ No newline at end of file
diff --git a/v2-migration/src/main/resources/META-INF/rewrite/change-transfer-manager-types.yml b/v2-migration/src/main/resources/META-INF/rewrite/change-transfer-manager-types.yml
index 159f7b123262..6739f5d74ae4 100644
--- a/v2-migration/src/main/resources/META-INF/rewrite/change-transfer-manager-types.yml
+++ b/v2-migration/src/main/resources/META-INF/rewrite/change-transfer-manager-types.yml
@@ -18,10 +18,10 @@ name: software.amazon.awssdk.v2migration.ChangeTransferManagerTypes
 displayName: Change SDK TransferManager types from v1 to v2
 description: Change SDK TransferManager types from v1 to v2.
 recipeList:
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.transfer.TransferManager resumeDownload(..)
       newReturnType: software.amazon.awssdk.transfer.s3.model.FileDownload
-  - software.amazon.awssdk.v2migration.openrewrite.ChangeMethodInvocationReturnType:
+  - org.openrewrite.java.ChangeMethodInvocationReturnType:
       methodPattern: com.amazonaws.services.s3.transfer.TransferManager resumeUpload(..)
       newReturnType: software.amazon.awssdk.transfer.s3.model.FileUpload
   - org.openrewrite.java.ChangeType:
diff --git a/v2-migration/src/main/resources/META-INF/rewrite/s3-methods-constructor-to-fluent.yml b/v2-migration/src/main/resources/META-INF/rewrite/s3-methods-constructor-to-fluent.yml
index 1ff60af26d89..42ffb5200902 100644
--- a/v2-migration/src/main/resources/META-INF/rewrite/s3-methods-constructor-to-fluent.yml
+++ b/v2-migration/src/main/resources/META-INF/rewrite/s3-methods-constructor-to-fluent.yml
@@ -662,18 +662,6 @@ recipeList:
       fluentNames:
         - withPartNumber
         - withETag
-  - software.amazon.awssdk.v2migration.ConstructorToFluent:
-      clzzFqcn: com.amazonaws.services.s3.model.CompleteMultipartUploadRequest
-      parameterTypes:
-        - java.lang.String
-        - java.lang.String
-        - java.lang.String
-        - java.util.List<com.amazonaws.services.s3.model.PartETag>
-      fluentNames:
-        - withBucket
-        - withKey
-        - withUploadId
-        - withMultipartUpload
   - software.amazon.awssdk.v2migration.ConstructorToFluent:
       clzzFqcn: com.amazonaws.services.s3.model.ListPartsRequest
       parameterTypes:
@@ -805,10 +793,4 @@ recipeList:
         - java.lang.String
       fluentNames:
         - withBucket
-        - withPolicy
-  - software.amazon.awssdk.v2migration.ConstructorToFluent:
-      clzzFqcn: com.amazonaws.services.s3.model.GetObjectTaggingResult
-      parameterTypes:
-        - java.util.List<com.amazonaws.services.s3.model.Tag>
-      fluentNames:
-        - withTagSet
\ No newline at end of file
+        - withPolicy
\ No newline at end of file
diff --git a/v2-migration/src/test/java/software/amazon/awssdk/v2migration/ChangeConfigTypesTest.java b/v2-migration/src/test/java/software/amazon/awssdk/v2migration/ChangeConfigTypesTest.java
index 3ea66b1e7ebd..11ef971526d2 100644
--- a/v2-migration/src/test/java/software/amazon/awssdk/v2migration/ChangeConfigTypesTest.java
+++ b/v2-migration/src/test/java/software/amazon/awssdk/v2migration/ChangeConfigTypesTest.java
@@ -29,6 +29,7 @@
 import org.openrewrite.java.Java8Parser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.TypeValidation;
 
 public class ChangeConfigTypesTest implements RewriteTest {
 
@@ -46,7 +47,8 @@ public void defaults(RecipeSpec spec) {
             throw new RuntimeException(e);
         }
 
-        spec.parser(Java8Parser.builder().classpath("aws-java-sdk-sqs", "sdk-core"));
+        spec.parser(Java8Parser.builder().classpath("aws-java-sdk-sqs", "sdk-core"))
+            .typeValidationOptions(TypeValidation.all().immutableExecutionContext(false));
     }
 
     @Test
diff --git a/v2-migration/src/test/java/software/amazon/awssdk/v2migration/ChangeExceptionTypesTest.java b/v2-migration/src/test/java/software/amazon/awssdk/v2migration/ChangeExceptionTypesTest.java
index f0007840e9a1..f5c63bbcb4f2 100644
--- a/v2-migration/src/test/java/software/amazon/awssdk/v2migration/ChangeExceptionTypesTest.java
+++ b/v2-migration/src/test/java/software/amazon/awssdk/v2migration/ChangeExceptionTypesTest.java
@@ -29,13 +29,15 @@
 import org.openrewrite.java.Java8Parser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.TypeValidation;
 
 public class ChangeExceptionTypesTest implements RewriteTest {
 
     @Override
     public void defaults(RecipeSpec spec) {
         try (InputStream stream = getClass().getResourceAsStream("/META-INF/rewrite/change-exception-types.yml")) {
-            spec.recipes(Environment.builder()
+            spec.recipes(new SdkExceptionToV2(),
+                         Environment.builder()
                                     .load(new YamlResourceLoader(stream, URI.create("rewrite.yml"), new Properties()))
                                     .build()
                                     .activateRecipes("software.amazon.awssdk.v2migration.ChangeExceptionTypes"));
@@ -43,7 +45,8 @@ public void defaults(RecipeSpec spec) {
             throw new RuntimeException(e);
         }
 
-        spec.parser(Java8Parser.builder().classpath("aws-java-sdk-sqs", "sdk-core"));
+        spec.parser(Java8Parser.builder().classpath("aws-java-sdk-sqs", "sdk-core"))
+            .typeValidationOptions(TypeValidation.all().methodInvocations(false));
     }
 
     @Test