Merge pull request #2825 from aws/staging/2800174d-5f20-472f-8765-cd6…

…e97599d25

Pull request: release <- staging/2800174d-5f20-472f-8765-cd6e97599d25

.changes/2.21.38.json

@@ -0,0 +1,72 @@
+{
+    "version": "2.21.38",
+    "date": "2023-12-04",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "contributor": "",
+            "description": "Fixes double checksum validation for GetObject. Now when ChecksumMode is enabled, x-amz-te:append-md5 will not be sent, and only the flexible checksum will be validated. If ChecksumMode is enabled and no ChecksumAlgorithm was returned, no validation will be performed."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Archetype Lambda",
+            "contributor": "",
+            "description": "Update archetype-lambda to use AWS CRT HTTP client as the default HTTP client and bump dependency version."
+        },
+        {
+            "type": "feature",
+            "category": "AWSBillingConductor",
+            "contributor": "",
+            "description": "This release adds the ability to specify a linked account of the billing group for the custom line item resource."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cloud9",
+            "contributor": "",
+            "description": "This release adds the requirement to include the imageId parameter in the CreateEnvironmentEC2 API call."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CloudFormation",
+            "contributor": "",
+            "description": "Including UPDATE_* states as a success status for CreateStack waiter."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaLive",
+            "contributor": "",
+            "description": "Adds support for custom color correction on channels using 3D LUT files."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Service Catalog App Registry",
+            "contributor": "",
+            "description": "Documentation-only updates for Dawn"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon SQS",
+            "contributor": "",
+            "description": "Adds a client builder option to disable the default MD5 checksum validation for SendMessage, ReceiveMessage and SendMessageBatch"
+        },
+        {
+            "type": "feature",
+            "category": "Braket",
+            "contributor": "",
+            "description": "This release enhances service support to create quantum tasks and hybrid jobs associated with Braket Direct Reservations."
+        },
+        {
+            "type": "feature",
+            "category": "FinSpace User Environment Management service",
+            "contributor": "",
+            "description": "Release General Purpose type clusters"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,48 @@
+# __2.21.38__ __2023-12-04__
+## __AWS Archetype Lambda__
+  - ### Features
+    - Update archetype-lambda to use AWS CRT HTTP client as the default HTTP client and bump dependency version.
+
+## __AWS Cloud9__
+  - ### Features
+    - This release adds the requirement to include the imageId parameter in the CreateEnvironmentEC2 API call.
+
+## __AWS CloudFormation__
+  - ### Features
+    - Including UPDATE_* states as a success status for CreateStack waiter.
+
+## __AWS Elemental MediaLive__
+  - ### Features
+    - Adds support for custom color correction on channels using 3D LUT files.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __AWS Service Catalog App Registry__
+  - ### Features
+    - Documentation-only updates for Dawn
+
+## __AWSBillingConductor__
+  - ### Features
+    - This release adds the ability to specify a linked account of the billing group for the custom line item resource.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fixes double checksum validation for GetObject. Now when ChecksumMode is enabled, x-amz-te:append-md5 will not be sent, and only the flexible checksum will be validated. If ChecksumMode is enabled and no ChecksumAlgorithm was returned, no validation will be performed.
+
+## __Amazon SQS__
+  - ### Features
+    - Adds a client builder option to disable the default MD5 checksum validation for SendMessage, ReceiveMessage and SendMessageBatch
+
+## __Braket__
+  - ### Features
+    - This release enhances service support to create quantum tasks and hybrid jobs associated with Braket Direct Reservations.
+
+## __FinSpace User Environment Management service__
+  - ### Features
+    - Release General Purpose type clusters
+
 # __2.21.37__ __2023-12-01__
 ## __Amazon DynamoDB Enhanced__
   - ### 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.21.37</version>
+      <version>2.21.38</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.21.37</version>
+  <version>2.21.38</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.21.37</version>
+  <version>2.21.38</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.21.37</version>
+  <version>2.21.38</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.21.37</version>
+        <version>2.21.38</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.21.37</version>
+        <version>2.21.38</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-lambda/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -35,8 +35,8 @@
     <requiredProperty key="service">
     </requiredProperty>
     <requiredProperty key="httpClient">
-      <defaultValue>url-connection-client</defaultValue>
-      <validationRegex>(url-connection-client|apache-client|netty-nio-client)</validationRegex>
+      <defaultValue>aws-crt-client</defaultValue>
+      <validationRegex>(url-connection-client|apache-client|netty-nio-client|aws-crt-client)</validationRegex>
     </requiredProperty>
     <requiredProperty key="region">
      <defaultValue>null</defaultValue>

archetypes/archetype-lambda/src/main/resources/archetype-resources/pom.xml

@@ -16,7 +16,7 @@
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <aws.java.sdk.version>${javaSdkVersion}</aws.java.sdk.version>
         <aws.lambda.java.version>1.2.3</aws.lambda.java.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.10.1</junit5.version>
 #if( $httpClient == 'netty-nio-client')
         <netty.openssl.version>${nettyOpenSslVersion}</netty.openssl.version>
 #end

archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/archetype.properties

@@ -5,6 +5,6 @@ package=software.amazonaws.test
 service=dynamodb
 httpClient=apache-client
 handlerClassName=MyApacheFunction
-region=null
-javaSdkVersion=2.11.0
+region=us-west-2
+javaSdkVersion=2.21.0
 nettyOpenSslVersion=2.0.29.Final

archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/pom.xml

@@ -13,9 +13,9 @@
         <maven.shade.plugin.version>3.2.1</maven.shade.plugin.version>
         <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-        <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
+        <aws.java.sdk.version>2.21.0</aws.java.sdk.version>
         <aws.lambda.java.version>1.2.3</aws.lambda.java.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.10.1</junit5.version>
     </properties>
 
     <dependencyManagement>

archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java

@@ -2,7 +2,6 @@
 package software.amazonaws.test;
 
 import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
-import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
@@ -20,7 +19,7 @@ private DependencyFactory() {}
     public static DynamoDbClient dynamoDbClient() {
         return DynamoDbClient.builder()
                        .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
-                       .region(Region.of(System.getenv(SdkSystemSetting.AWS_REGION.environmentVariable())))
+                       .region(Region.US_WEST_2)
                        .httpClientBuilder(ApacheHttpClient.builder())
                        .build();
     }

archetypes/archetype-lambda/src/test/resources/projects/crtclient/archetype.properties

@@ -0,0 +1,11 @@
+groupId=software.amazonaws.test
+artifactId=test-crt-artifact
+version=1.0-SNAPSHOT
+package=software.amazonaws.test
+service=s3
+httpClient=aws-crt-client
+handlerClassName=MyCrtFunction
+region=us-east-1
+javaSdkVersion=2.21.0
+nettyOpenSslVersion=2.0.29.Final
+

archetypes/archetype-lambda/src/test/resources/projects/crtclient/goal.txt

@@ -0,0 +1 @@
+verify

archetypes/archetype-lambda/src/test/resources/projects/crtclient/reference/README.md

@@ -0,0 +1,45 @@
+# MyCrtFunction
+
+This project contains an AWS Lambda maven application with [AWS Java SDK 2.x](https://github.com/aws/aws-sdk-java-v2) dependencies.
+
+## Prerequisites
+- Java 1.8+
+- Apache Maven
+- [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
+- Docker
+
+## Development
+
+The generated function handler class just returns the input. The configured AWS Java SDK client is created in `DependencyFactory` class and you can 
+add the code to interact with the SDK client based on your use case.
+
+#### Building the project
+```
+mvn clean install
+```
+
+#### Testing it locally
+```
+sam local invoke
+```
+
+#### Adding more SDK clients
+To add more service clients, you need to add the specific services modules in `pom.xml` and create the clients in `DependencyFactory` following the same 
+pattern as s3Client.
+
+## Deployment
+
+The generated project contains a default [SAM template](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html) file `template.yaml` where you can 
+configure different properties of your lambda function such as memory size and timeout. You might also need to add specific policies to the lambda function
+so that it can access other AWS resources.
+
+To deploy the application, you can run the following command:
+
+```
+sam deploy --guided
+```
+
+See [Deploying Serverless Applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-deploying.html) for more info.
+
+
+

archetypes/archetype-lambda/src/test/resources/projects/crtclient/reference/pom.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.amazonaws.test</groupId>
+    <artifactId>test-crt-artifact</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.shade.plugin.version>3.2.1</maven.shade.plugin.version>
+        <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <aws.java.sdk.version>2.21.0</aws.java.sdk.version>
+        <aws.lambda.java.version>1.2.3</aws.lambda.java.version>
+        <junit5.version>5.10.1</junit5.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${aws.java.sdk.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-crt-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>${aws.lambda.java.version}</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven.shade.plugin.version}</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <finalName>test-crt-artifact</finalName>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <!-- Suppress module-info.class warning-->
+                                <exclude>module-info.class</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>