Skip to content

Commit 1953a9d

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2769 from aws/staging/507216cd-4b05-4879-ba95-a70fd6ef6db1
Pull request: release <- staging/507216cd-4b05-4879-ba95-a70fd6ef6db1
2 parents 98b7fc7 + c79273e commit 1953a9d

File tree

534 files changed

+4353
-2981
lines changed

Some content is hidden

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

534 files changed

+4353
-2981
lines changed

‎.changes/2.21.22.json

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"version": "2.21.22",
3+
"date": "2023-11-13",
4+
"entries": [
5+
{
6+
"type": "documentation",
7+
"category": "Amazon CodeCatalyst",
8+
"contributor": "",
9+
"description": "If you see a NullPointerException from DefaultCodeCatalystBaseClientBuilder after upgrading to this version, ensure you're not using an old version of codecatalyst."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Data Exchange",
14+
"contributor": "",
15+
"description": "Removed Required trait for DataSet.OriginDetails.ProductId."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Database Migration Service",
20+
"contributor": "",
21+
"description": "Added new Db2 LUW Target endpoint with related endpoint settings. New executeTimeout endpoint setting for mysql endpoint. New ReplicationDeprovisionTime field for serverless describe-replications."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": "",
27+
"description": "SdkPlugins can now see and modify all configuration set on the client, including default values"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS SDK for Java v2",
32+
"contributor": "",
33+
"description": "The `serviceClientConfiguration` from SDK clients now includes the defaults set by the SDK."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS Service Catalog App Registry",
38+
"contributor": "",
39+
"description": "When the customer associates a resource collection to their application with this new feature, then a new application tag will be applied to all supported resources that are part of that collection. This allows customers to more easily find the application that is associated with those resources."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Amazon EC2 Container Service",
44+
"contributor": "",
45+
"description": "Adds a Client Token parameter to the ECS RunTask API. The Client Token parameter allows for idempotent RunTask requests."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon EMR",
50+
"contributor": "",
51+
"description": "Updated GetClusterSessionCredentials API to allow Amazon SageMaker Studio to connect to EMR on EC2 clusters to support IdentityCenter/PEZ integration."
52+
},
53+
{
54+
"type": "feature",
55+
"category": "Amazon Elastic Compute Cloud",
56+
"contributor": "",
57+
"description": "Adds the new EC2 DescribeInstanceTopology API, which you can use to retrieve the network topology of your running instances on select platform types to determine their relative proximity to each other."
58+
},
59+
{
60+
"type": "feature",
61+
"category": "Amazon Transcribe Streaming Service",
62+
"contributor": "",
63+
"description": "This release enables customers to call the AWS Transcribe streaming service with the capability of identifying multiple languages in the stream."
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: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
# __2.21.22__ __2023-11-13__
2+
## __AWS Data Exchange__
3+
- ### Features
4+
- Removed Required trait for DataSet.OriginDetails.ProductId.
5+
6+
## __AWS Database Migration Service__
7+
- ### Features
8+
- Added new Db2 LUW Target endpoint with related endpoint settings. New executeTimeout endpoint setting for mysql endpoint. New ReplicationDeprovisionTime field for serverless describe-replications.
9+
10+
## __AWS SDK for Java v2__
11+
- ### Features
12+
- SdkPlugins can now see and modify all configuration set on the client, including default values
13+
- The `serviceClientConfiguration` from SDK clients now includes the defaults set by the SDK.
14+
- Updated endpoint and partition metadata.
15+
16+
## __AWS Service Catalog App Registry__
17+
- ### Features
18+
- When the customer associates a resource collection to their application with this new feature, then a new application tag will be applied to all supported resources that are part of that collection. This allows customers to more easily find the application that is associated with those resources.
19+
20+
## __Amazon CodeCatalyst__
21+
- ### Documentations
22+
- If you see a NullPointerException from DefaultCodeCatalystBaseClientBuilder after upgrading to this version, ensure you're not using an old version of codecatalyst.
23+
24+
## __Amazon EC2 Container Service__
25+
- ### Features
26+
- Adds a Client Token parameter to the ECS RunTask API. The Client Token parameter allows for idempotent RunTask requests.
27+
28+
## __Amazon EMR__
29+
- ### Features
30+
- Updated GetClusterSessionCredentials API to allow Amazon SageMaker Studio to connect to EMR on EC2 clusters to support IdentityCenter/PEZ integration.
31+
32+
## __Amazon Elastic Compute Cloud__
33+
- ### Features
34+
- Adds the new EC2 DescribeInstanceTopology API, which you can use to retrieve the network topology of your running instances on select platform types to determine their relative proximity to each other.
35+
36+
## __Amazon Transcribe Streaming Service__
37+
- ### Features
38+
- This release enables customers to call the AWS Transcribe streaming service with the capability of identifying multiple languages in the stream.
39+
140
# __2.21.21__ __2023-11-10__
241
## __AWS Control Tower__
342
- ### Features
@@ -1318,7 +1357,7 @@ Special thanks to the following contributors to this release:
13181357
## __Contributors__
13191358
Special thanks to the following contributors to this release:
13201359

1321-
[@faucct](https://github.com/faucct), [@psnilesh](https://github.com/psnilesh)
1360+
[@psnilesh](https://github.com/psnilesh), [@faucct](https://github.com/faucct)
13221361
# __2.20.146__ __2023-09-12__
13231362
## __AWS CRT-based S3 Client__
13241363
- ### Bugfixes

‎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.21</version>
55+
<version>2.21.22</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.21</version>
89+
<version>2.21.22</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.21.21</version>
94+
<version>2.21.22</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.21</version>
106+
<version>2.21.22</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.21</version>
23+
<version>2.21.22</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.21</version>
23+
<version>2.21.22</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/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.21</version>
23+
<version>2.21.22</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/pom.xml

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

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.21.21</version>
20+
<version>2.21.22</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

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

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.21.21</version>
20+
<version>2.21.22</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎build-tools/src/main/resources/software/amazon/awssdk/checkstyle-suppressions.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,8 @@
4949

5050
<!-- Allow non-java.base usage in tests -->
5151
<suppress checks="software.amazon.awssdk.buildtools.checkstyle.NonJavaBaseModuleCheck" files=".*testutils.*"/>
52+
53+
<!-- Allow private field declaration before public, to have correct initialization order -->
54+
<suppress checks="DeclarationOrder"
55+
files=".*SdkAdvancedClientOption\.java$"/>
5256
</suppressions>

‎bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.21.21</version>
24+
<version>2.21.22</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.21.21</version>
25+
<version>2.21.22</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.21.21</version>
24+
<version>2.21.22</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.21.21</version>
25+
<version>2.21.22</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.21.21</version>
24+
<version>2.21.22</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonGeneratorTasks.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
package software.amazon.awssdk.codegen.emitters.tasks;
1717

1818
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
19-
import software.amazon.awssdk.codegen.poet.model.SdkClientConfigurationUtilGeneratorTask;
2019

2120
/**
2221
* Common generator tasks.
2322
*/
2423
class CommonGeneratorTasks extends CompositeGeneratorTask {
2524
CommonGeneratorTasks(GeneratorTaskParams params) {
2625
super(new CommonClientGeneratorTasks(params),
27-
new SdkClientConfigurationUtilGeneratorTask(params),
2826
new SyncClientGeneratorTasks(params),
2927
new MarshallerGeneratorTasks(params),
3028
new ModelClassGeneratorTasks(params),

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import software.amazon.awssdk.codegen.model.config.customization.MultipartCustomization;
2828
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
2929
import software.amazon.awssdk.codegen.poet.ClassSpec;
30-
import software.amazon.awssdk.codegen.poet.PoetExtension;
3130
import software.amazon.awssdk.codegen.poet.PoetUtils;
3231
import software.amazon.awssdk.codegen.poet.rules.EndpointRulesSpecUtils;
3332
import software.amazon.awssdk.codegen.utils.AuthUtils;
@@ -43,7 +42,6 @@ public class AsyncClientBuilderClass implements ClassSpec {
4342
private final ClassName builderInterfaceName;
4443
private final ClassName builderClassName;
4544
private final ClassName builderBaseClassName;
46-
private final ClassName serviceConfigClassName;
4745
private final EndpointRulesSpecUtils endpointRulesSpecUtils;
4846

4947
public AsyncClientBuilderClass(IntermediateModel model) {
@@ -55,7 +53,6 @@ public AsyncClientBuilderClass(IntermediateModel model) {
5553
this.builderClassName = ClassName.get(basePackage, model.getMetadata().getAsyncBuilder());
5654
this.builderBaseClassName = ClassName.get(basePackage, model.getMetadata().getBaseBuilder());
5755
this.endpointRulesSpecUtils = new EndpointRulesSpecUtils(model);
58-
this.serviceConfigClassName = new PoetExtension(model).getServiceConfigClass();
5956
}
6057

6158
@Override
@@ -89,7 +86,6 @@ public TypeSpec poetSpec() {
8986
}
9087

9188
builder.addMethod(buildClientMethod());
92-
builder.addMethod(SyncClientBuilderClass.initializeServiceClientConfigMethod(serviceConfigClassName));
9389

9490
return builder.build();
9591
}
@@ -137,12 +133,9 @@ private MethodSpec buildClientMethod() {
137133
.returns(clientInterfaceName)
138134
.addStatement("$T clientConfiguration = super.asyncClientConfiguration()",
139135
SdkClientConfiguration.class)
140-
.addStatement("this.validateClientOptions(clientConfiguration)")
141-
.addStatement("$T serviceClientConfiguration = initializeServiceClientConfig"
142-
+ "(clientConfiguration)",
143-
serviceConfigClassName);
136+
.addStatement("this.validateClientOptions(clientConfiguration)");
144137

145-
builder.addStatement("$1T client = new $2T(serviceClientConfiguration, clientConfiguration)",
138+
builder.addStatement("$1T client = new $2T(clientConfiguration)",
146139
clientInterfaceName, clientClassName);
147140
if (model.asyncClientDecoratorClassName().isPresent()) {
148141
builder.addStatement("return new $T().decorate(client, clientConfiguration, clientContextParams.copy().build())",

0 commit comments

Comments
 (0)