Merge from master

.changes/2.23.20.json

@@ -0,0 +1,54 @@
+{
+    "version": "2.23.20",
+    "date": "2024-02-07",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS CRT Sync HTTP Client",
+            "contributor": "",
+            "description": "Fixed an issue where `CancellationException` was thrown incorrectly from AWS CRT Sync HTTP client when execution time exceeded the total configured API call attempt timeout or API call timeout. Now it throws `ApiCallAttemptTimeoutException`/`ApiCallTimeoutException` accordingly. See [#4820](https://github.com/aws/aws-sdk-java-v2/issues/4820)"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Bump `aws-crt` version to `0.29.9`"
+        },
+        {
+            "type": "feature",
+            "category": "AWS DataSync",
+            "contributor": "",
+            "description": "AWS DataSync now supports manifests for specifying files or objects to transfer."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudFront KeyValueStore",
+            "contributor": "",
+            "description": "Switching CloudFront KeyValueStore onto the new SRA (Smithy Reference Architecture) identity and auth logic that was released in v2.21.0."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lex Model Building V2",
+            "contributor": "",
+            "description": "This release introduces a new bot replication feature as part of Lex Global Resiliency offering. This feature leverages a new set of APIs that allow customers to create bot replicas and replicate changes to bots across regions."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Redshift",
+            "contributor": "",
+            "description": "LisRecommendations API to fetch Amazon Redshift Advisor recommendations."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CRT-based S3 Client",
+            "contributor": "",
+            "description": "Exposes a setting to set the memory limit when making asynchronous calls with the CRT-based S3 client"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}

.changes/2.23.21.json

@@ -0,0 +1,24 @@
+{
+    "version": "2.23.21",
+    "date": "2024-02-08",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS CodePipeline",
+            "contributor": "",
+            "description": "Add ability to execute pipelines with new parallel & queued execution modes and add support for triggers with filtering on branches and file paths."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon QuickSight",
+            "contributor": "",
+            "description": "General Interactions for Visuals; Waterfall Chart Color Configuration; Documentation Update"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkSpaces",
+            "contributor": "",
+            "description": "This release introduces User-Decoupling feature. This feature allows Workspaces Core customers to provision workspaces without providing users. CreateWorkspaces and DescribeWorkspaces APIs will now take a new optional parameter \"WorkspaceName\"."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,4 +1,47 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.23.21__ __2024-02-08__
+## __AWS CodePipeline__
+  - ### Features
+    - Add ability to execute pipelines with new parallel & queued execution modes and add support for triggers with filtering on branches and file paths.
+
+## __Amazon QuickSight__
+  - ### Features
+    - General Interactions for Visuals; Waterfall Chart Color Configuration; Documentation Update
+
+## __Amazon WorkSpaces__
+  - ### Features
+    - This release introduces User-Decoupling feature. This feature allows Workspaces Core customers to provision workspaces without providing users. CreateWorkspaces and DescribeWorkspaces APIs will now take a new optional parameter "WorkspaceName".
+
+# __2.23.20__ __2024-02-07__
+## __AWS CRT Sync HTTP Client__
+  - ### Bugfixes
+    - Fixed an issue where `CancellationException` was thrown incorrectly from AWS CRT Sync HTTP client when execution time exceeded the total configured API call attempt timeout or API call timeout. Now it throws `ApiCallAttemptTimeoutException`/`ApiCallTimeoutException` accordingly. See [#4820](https://github.com/aws/aws-sdk-java-v2/issues/4820)
+
+## __AWS CRT-based S3 Client__
+  - ### Features
+    - Exposes a setting to set the memory limit when making asynchronous calls with the CRT-based S3 client
+
+## __AWS DataSync__
+  - ### Features
+    - AWS DataSync now supports manifests for specifying files or objects to transfer.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Bump `aws-crt` version to `0.29.9`
+    - Updated endpoint and partition metadata.
+
+## __Amazon CloudFront KeyValueStore__
+  - ### Features
+    - Switching CloudFront KeyValueStore onto the new SRA (Smithy Reference Architecture) identity and auth logic that was released in v2.21.0.
+
+## __Amazon Lex Model Building V2__
+  - ### Features
+    - This release introduces a new bot replication feature as part of Lex Global Resiliency offering. This feature leverages a new set of APIs that allow customers to create bot replicas and replicate changes to bots across regions.
+
+## __Amazon Redshift__
+  - ### Features
+    - LisRecommendations API to fetch Amazon Redshift Advisor recommendations.
+
 # __2.23.19__ __2024-02-06__
 ## __AWS AppSync__
   - ### Features

README.md

@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.23.19</version>
+      <version>2.23.21</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.23.19</version>
+  <version>2.23.21</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.23.19</version>
+  <version>2.23.21</version>
 </dependency>
 ```
 
@@ -103,7 +103,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.23.19</version>
+  <version>2.23.21</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-tools/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

aws-sdk-java/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle-logging-bridge/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <artifactId>bundle-logging-bridge</artifactId>
     <packaging>jar</packaging>

bundle-sdk/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <artifactId>bundle-sdk</artifactId>
     <packaging>jar</packaging>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.23.20-SNAPSHOT</version>
+        <version>2.23.22-SNAPSHOT</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

codegen/src/main/java/software/amazon/awssdk/codegen/model/service/AuthType.java

@@ -36,6 +36,10 @@ public enum AuthType {
         this.value = value;
     }
 
+    public String value() {
+        return value;
+    }
+
     public static AuthType fromValue(String value) {
         String normalizedValue = StringUtils.lowerCase(value);
         return Arrays.stream(values())

codegen/src/main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeCodegenKnowledgeIndex.java

@@ -0,0 +1,80 @@
+/*
+ * 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.codegen.poet.auth.scheme;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
+
+/**
+ * Knowledge index to get access to the configured service auth schemes and operations overrides. This index is optimized for
+ * code generation of switch statements therefore the data is grouped by operations that share the same auth schemes.
+ */
+public final class AuthSchemeCodegenKnowledgeIndex {
+    /**
+     * We delegate this value to {@link ModelAuthSchemeKnowledgeIndex#operationsToMetadata()}. We just wrap the results in an
+     * interface that easier to use for the layer that does the code generation.
+     */
+    private final Map<List<String>, List<AuthSchemeCodegenMetadata>> operationsToAuthSchemes;
+
+    private AuthSchemeCodegenKnowledgeIndex(IntermediateModel intermediateModel) {
+        this.operationsToAuthSchemes = ModelAuthSchemeKnowledgeIndex.of(intermediateModel).operationsToMetadata();
+    }
+
+    /**
+     * Creates a new {@link AuthSchemeCodegenKnowledgeIndex} using the given {@code intermediateModel}..
+     */
+    public static AuthSchemeCodegenKnowledgeIndex of(IntermediateModel intermediateModel) {
+        return new AuthSchemeCodegenKnowledgeIndex(intermediateModel);
+    }
+
+    /**
+     * Returns the service defaults auth schemes. These can be overridden by operation.
+     *
+     * @return the service defaults auth schemes.
+     */
+    public List<AuthSchemeCodegenMetadata> serviceDefaultAuthSchemes() {
+        return operationsToAuthSchemes.get(Collections.emptyList());
+    }
+
+    /**
+     * Returns true if there are auth scheme overrides per operation.
+     *
+     * @return true if there are auth scheme overrides per operation
+     */
+    public boolean hasPerOperationAuthSchemesOverrides() {
+        // The map at least contains one key-value pair (keyed with Collections.emptyList()).
+        // If we have more than that then we have at least one override.
+        return operationsToAuthSchemes.size() > 1;
+    }
+
+    /**
+     * Traverses each group of operations with the same set of auth schemes.
+     *
+     * @param consumer The consumer to call for each group of operations with the same set of auth schemes.
+     */
+    public void forEachOperationsOverridesGroup(BiConsumer<List<String>, List<AuthSchemeCodegenMetadata>> consumer) {
+        for (Map.Entry<List<String>, List<AuthSchemeCodegenMetadata>> kvp : operationsToAuthSchemes.entrySet()) {
+            if (kvp.getKey().isEmpty()) {
+                // We are traversing operation groups, ignore service wide defaults.
+                continue;
+            }
+            consumer.accept(kvp.getKey(), kvp.getValue());
+        }
+    }
+}