Skip to content

Commit 51b376e

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2825 from aws/staging/2800174d-5f20-472f-8765-cd6e97599d25
Pull request: release <- staging/2800174d-5f20-472f-8765-cd6e97599d25
2 parents 0502daf + 57bcd75 commit 51b376e

File tree

508 files changed

+1875
-671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

508 files changed

+1875
-671
lines changed

‎.changes/2.21.38.json

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"version": "2.21.38",
3+
"date": "2023-12-04",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "Amazon S3",
8+
"contributor": "",
9+
"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."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Archetype Lambda",
14+
"contributor": "",
15+
"description": "Update archetype-lambda to use AWS CRT HTTP client as the default HTTP client and bump dependency version."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWSBillingConductor",
20+
"contributor": "",
21+
"description": "This release adds the ability to specify a linked account of the billing group for the custom line item resource."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS Cloud9",
26+
"contributor": "",
27+
"description": "This release adds the requirement to include the imageId parameter in the CreateEnvironmentEC2 API call."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS CloudFormation",
32+
"contributor": "",
33+
"description": "Including UPDATE_* states as a success status for CreateStack waiter."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS Elemental MediaLive",
38+
"contributor": "",
39+
"description": "Adds support for custom color correction on channels using 3D LUT files."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "AWS Service Catalog App Registry",
44+
"contributor": "",
45+
"description": "Documentation-only updates for Dawn"
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon SQS",
50+
"contributor": "",
51+
"description": "Adds a client builder option to disable the default MD5 checksum validation for SendMessage, ReceiveMessage and SendMessageBatch"
52+
},
53+
{
54+
"type": "feature",
55+
"category": "Braket",
56+
"contributor": "",
57+
"description": "This release enhances service support to create quantum tasks and hybrid jobs associated with Braket Direct Reservations."
58+
},
59+
{
60+
"type": "feature",
61+
"category": "FinSpace User Environment Management service",
62+
"contributor": "",
63+
"description": "Release General Purpose type clusters"
64+
},
65+
{
66+
"type": "feature",
67+
"category": "AWS SDK for Java v2",
68+
"contributor": "",
69+
"description": "Updated endpoint and partition metadata."
70+
}
71+
]
72+
}

‎CHANGELOG.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,48 @@
1+
# __2.21.38__ __2023-12-04__
2+
## __AWS Archetype Lambda__
3+
- ### Features
4+
- Update archetype-lambda to use AWS CRT HTTP client as the default HTTP client and bump dependency version.
5+
6+
## __AWS Cloud9__
7+
- ### Features
8+
- This release adds the requirement to include the imageId parameter in the CreateEnvironmentEC2 API call.
9+
10+
## __AWS CloudFormation__
11+
- ### Features
12+
- Including UPDATE_* states as a success status for CreateStack waiter.
13+
14+
## __AWS Elemental MediaLive__
15+
- ### Features
16+
- Adds support for custom color correction on channels using 3D LUT files.
17+
18+
## __AWS SDK for Java v2__
19+
- ### Features
20+
- Updated endpoint and partition metadata.
21+
22+
## __AWS Service Catalog App Registry__
23+
- ### Features
24+
- Documentation-only updates for Dawn
25+
26+
## __AWSBillingConductor__
27+
- ### Features
28+
- This release adds the ability to specify a linked account of the billing group for the custom line item resource.
29+
30+
## __Amazon S3__
31+
- ### Bugfixes
32+
- 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.
33+
34+
## __Amazon SQS__
35+
- ### Features
36+
- Adds a client builder option to disable the default MD5 checksum validation for SendMessage, ReceiveMessage and SendMessageBatch
37+
38+
## __Braket__
39+
- ### Features
40+
- This release enhances service support to create quantum tasks and hybrid jobs associated with Braket Direct Reservations.
41+
42+
## __FinSpace User Environment Management service__
43+
- ### Features
44+
- Release General Purpose type clusters
45+
146
# __2.21.37__ __2023-12-01__
247
## __Amazon DynamoDB Enhanced__
348
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
5252
<dependency>
5353
<groupId>software.amazon.awssdk</groupId>
5454
<artifactId>bom</artifactId>
55-
<version>2.21.37</version>
55+
<version>2.21.38</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
8686
<dependency>
8787
<groupId>software.amazon.awssdk</groupId>
8888
<artifactId>ec2</artifactId>
89-
<version>2.21.37</version>
89+
<version>2.21.38</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.21.37</version>
94+
<version>2.21.38</version>
9595
</dependency>
9696
```
9797

@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
103103
<dependency>
104104
<groupId>software.amazon.awssdk</groupId>
105105
<artifactId>aws-sdk-java</artifactId>
106-
<version>2.21.37</version>
106+
<version>2.21.38</version>
107107
</dependency>
108108
```
109109

‎archetypes/archetype-app-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.21.37</version>
23+
<version>2.21.38</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/archetype-lambda/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.21.37</version>
23+
<version>2.21.38</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<requiredProperty key="service">
3636
</requiredProperty>
3737
<requiredProperty key="httpClient">
38-
<defaultValue>url-connection-client</defaultValue>
39-
<validationRegex>(url-connection-client|apache-client|netty-nio-client)</validationRegex>
38+
<defaultValue>aws-crt-client</defaultValue>
39+
<validationRegex>(url-connection-client|apache-client|netty-nio-client|aws-crt-client)</validationRegex>
4040
</requiredProperty>
4141
<requiredProperty key="region">
4242
<defaultValue>null</defaultValue>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
1717
<aws.java.sdk.version>${javaSdkVersion}</aws.java.sdk.version>
1818
<aws.lambda.java.version>1.2.3</aws.lambda.java.version>
19-
<junit5.version>5.8.1</junit5.version>
19+
<junit5.version>5.10.1</junit5.version>
2020
#if( $httpClient == 'netty-nio-client')
2121
<netty.openssl.version>${nettyOpenSslVersion}</netty.openssl.version>
2222
#end

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ package=software.amazonaws.test
55
service=dynamodb
66
httpClient=apache-client
77
handlerClassName=MyApacheFunction
8-
region=null
9-
javaSdkVersion=2.11.0
8+
region=us-west-2
9+
javaSdkVersion=2.21.0
1010
nettyOpenSslVersion=2.0.29.Final

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<maven.shade.plugin.version>3.2.1</maven.shade.plugin.version>
1414
<maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
1515
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
16-
<aws.java.sdk.version>2.11.0</aws.java.sdk.version>
16+
<aws.java.sdk.version>2.21.0</aws.java.sdk.version>
1717
<aws.lambda.java.version>1.2.3</aws.lambda.java.version>
18-
<junit5.version>5.8.1</junit5.version>
18+
<junit5.version>5.10.1</junit5.version>
1919
</properties>
2020

2121
<dependencyManagement>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
package software.amazonaws.test;
33

44
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
5-
import software.amazon.awssdk.core.SdkSystemSetting;
65
import software.amazon.awssdk.http.apache.ApacheHttpClient;
76
import software.amazon.awssdk.regions.Region;
87
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
@@ -20,7 +19,7 @@ private DependencyFactory() {}
2019
public static DynamoDbClient dynamoDbClient() {
2120
return DynamoDbClient.builder()
2221
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
23-
.region(Region.of(System.getenv(SdkSystemSetting.AWS_REGION.environmentVariable())))
22+
.region(Region.US_WEST_2)
2423
.httpClientBuilder(ApacheHttpClient.builder())
2524
.build();
2625
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
groupId=software.amazonaws.test
2+
artifactId=test-crt-artifact
3+
version=1.0-SNAPSHOT
4+
package=software.amazonaws.test
5+
service=s3
6+
httpClient=aws-crt-client
7+
handlerClassName=MyCrtFunction
8+
region=us-east-1
9+
javaSdkVersion=2.21.0
10+
nettyOpenSslVersion=2.0.29.Final
11+

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
verify

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# MyCrtFunction
2+
3+
This project contains an AWS Lambda maven application with [AWS Java SDK 2.x](https://github.com/aws/aws-sdk-java-v2) dependencies.
4+
5+
## Prerequisites
6+
- Java 1.8+
7+
- Apache Maven
8+
- [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
9+
- Docker
10+
11+
## Development
12+
13+
The generated function handler class just returns the input. The configured AWS Java SDK client is created in `DependencyFactory` class and you can
14+
add the code to interact with the SDK client based on your use case.
15+
16+
#### Building the project
17+
```
18+
mvn clean install
19+
```
20+
21+
#### Testing it locally
22+
```
23+
sam local invoke
24+
```
25+
26+
#### Adding more SDK clients
27+
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
28+
pattern as s3Client.
29+
30+
## Deployment
31+
32+
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
33+
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
34+
so that it can access other AWS resources.
35+
36+
To deploy the application, you can run the following command:
37+
38+
```
39+
sam deploy --guided
40+
```
41+
42+
See [Deploying Serverless Applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-deploying.html) for more info.
43+
44+
45+

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

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>software.amazonaws.test</groupId>
6+
<artifactId>test-crt-artifact</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
<packaging>jar</packaging>
9+
<properties>
10+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11+
<maven.compiler.source>1.8</maven.compiler.source>
12+
<maven.compiler.target>1.8</maven.compiler.target>
13+
<maven.shade.plugin.version>3.2.1</maven.shade.plugin.version>
14+
<maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
15+
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
16+
<aws.java.sdk.version>2.21.0</aws.java.sdk.version>
17+
<aws.lambda.java.version>1.2.3</aws.lambda.java.version>
18+
<junit5.version>5.10.1</junit5.version>
19+
</properties>
20+
21+
<dependencyManagement>
22+
<dependencies>
23+
<dependency>
24+
<groupId>software.amazon.awssdk</groupId>
25+
<artifactId>bom</artifactId>
26+
<version>${aws.java.sdk.version}</version>
27+
<type>pom</type>
28+
<scope>import</scope>
29+
</dependency>
30+
</dependencies>
31+
</dependencyManagement>
32+
33+
<dependencies>
34+
<dependency>
35+
<groupId>software.amazon.awssdk</groupId>
36+
<artifactId>s3</artifactId>
37+
<exclusions>
38+
<exclusion>
39+
<groupId>software.amazon.awssdk</groupId>
40+
<artifactId>netty-nio-client</artifactId>
41+
</exclusion>
42+
<exclusion>
43+
<groupId>software.amazon.awssdk</groupId>
44+
<artifactId>apache-client</artifactId>
45+
</exclusion>
46+
</exclusions>
47+
</dependency>
48+
49+
<dependency>
50+
<groupId>software.amazon.awssdk</groupId>
51+
<artifactId>aws-crt-client</artifactId>
52+
</dependency>
53+
54+
<dependency>
55+
<groupId>com.amazonaws</groupId>
56+
<artifactId>aws-lambda-java-core</artifactId>
57+
<version>${aws.lambda.java.version}</version>
58+
</dependency>
59+
60+
<!-- Test Dependencies -->
61+
<dependency>
62+
<groupId>org.junit.jupiter</groupId>
63+
<artifactId>junit-jupiter</artifactId>
64+
<version>${junit5.version}</version>
65+
<scope>test</scope>
66+
</dependency>
67+
</dependencies>
68+
69+
<build>
70+
<plugins>
71+
<plugin>
72+
<groupId>org.apache.maven.plugins</groupId>
73+
<artifactId>maven-compiler-plugin</artifactId>
74+
<version>${maven.compiler.plugin.version}</version>
75+
</plugin>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-shade-plugin</artifactId>
79+
<version>${maven.shade.plugin.version}</version>
80+
<configuration>
81+
<createDependencyReducedPom>false</createDependencyReducedPom>
82+
<finalName>test-crt-artifact</finalName>
83+
<filters>
84+
<filter>
85+
<artifact>*:*</artifact>
86+
<excludes>
87+
<!-- Suppress module-info.class warning-->
88+
<exclude>module-info.class</exclude>
89+
</excludes>
90+
</filter>
91+
</filters>
92+
</configuration>
93+
<executions>
94+
<execution>
95+
<phase>package</phase>
96+
<goals>
97+
<goal>shade</goal>
98+
</goals>
99+
</execution>
100+
</executions>
101+
</plugin>
102+
</plugins>
103+
</build>
104+
</project>

0 commit comments

Comments
 (0)