Skip to content

Commit d600d27

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2562 from aws/staging/73ebd643-5221-483e-b50f-91849b7c89a0
Pull request: release <- staging/73ebd643-5221-483e-b50f-91849b7c89a0
2 parents b024587 + 8682960 commit d600d27

File tree

445 files changed

+2344
-1296
lines changed

Some content is hidden

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

445 files changed

+2344
-1296
lines changed

‎.changes/2.20.68.json

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"version": "2.20.68",
3+
"date": "2023-05-18",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "",
9+
"description": "This update fixes an issue where CompletableFutures are leaked/never completed when the submission to the FUTURE_COMPLETE_EXECUTOR is rejected.\n\nBy default, the SDK uses `2 * number of cores` (with a maximum of 64), and uses bounded queue of size 1000. In cases where the throughput to the client exceeds the executor's ability to keep up, it would reject executions. Before this change this would lead to leaked futures."
10+
},
11+
{
12+
"type": "bugfix",
13+
"category": "S3 Transfer Manager",
14+
"contributor": "",
15+
"description": "Fixed the issue where S3 Transfer Manager attempted to load AWS CRT classes when Java based S3 client was used. See [#3936](https://github.com/aws/aws-sdk-java-v2/issues/3936)."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS CloudTrail",
20+
"contributor": "",
21+
"description": "Add ConflictException to PutEventSelectors, add (Channel/EDS)ARNInvalidException to Tag APIs. These exceptions provide customers with more specific error messages instead of internal errors."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS Compute Optimizer",
26+
"contributor": "",
27+
"description": "In this launch, we add support for showing integration status with external metric providers such as Instana, Datadog ...etc in GetEC2InstanceRecommendations and ExportEC2InstanceRecommendations apis"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS Elemental MediaConvert",
32+
"contributor": "",
33+
"description": "This release introduces a new MXF Profile for XDCAM which is strictly compliant with the SMPTE RDD 9 standard and improved handling of output name modifiers."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS Security Token Service",
38+
"contributor": "",
39+
"description": "API updates for the AWS Security Token Service"
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Amazon Athena",
44+
"contributor": "",
45+
"description": "Removing SparkProperties from EngineConfiguration object for StartSession API call"
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon Connect Service",
50+
"contributor": "",
51+
"description": "You can programmatically create and manage prompts using APIs, for example, to extract prompts stored within Amazon Connect and add them to your Amazon S3 bucket. AWS CloudTrail, AWS CloudFormation and tagging are supported."
52+
},
53+
{
54+
"type": "feature",
55+
"category": "Amazon EC2 Container Service",
56+
"contributor": "",
57+
"description": "Documentation only release to address various tickets."
58+
},
59+
{
60+
"type": "feature",
61+
"category": "Amazon Elastic Compute Cloud",
62+
"contributor": "",
63+
"description": "Add support for i4g.large, i4g.xlarge, i4g.2xlarge, i4g.4xlarge, i4g.8xlarge and i4g.16xlarge instances powered by AWS Graviton2 processors that deliver up to 15% better compute performance than our other storage-optimized instances."
64+
},
65+
{
66+
"type": "feature",
67+
"category": "Amazon Relational Database Service",
68+
"contributor": "",
69+
"description": "RDS documentation update for the EngineVersion parameter of ModifyDBSnapshot"
70+
},
71+
{
72+
"type": "feature",
73+
"category": "Amazon SageMaker geospatial capabilities",
74+
"contributor": "",
75+
"description": "This release makes ExecutionRoleArn a required field in the StartEarthObservationJob API."
76+
},
77+
{
78+
"type": "feature",
79+
"category": "AWS SDK for Java v2",
80+
"contributor": "",
81+
"description": "Updated endpoint and partition metadata."
82+
}
83+
]
84+
}

‎CHANGELOG.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
# __2.20.68__ __2023-05-18__
2+
## __AWS CloudTrail__
3+
- ### Features
4+
- Add ConflictException to PutEventSelectors, add (Channel/EDS)ARNInvalidException to Tag APIs. These exceptions provide customers with more specific error messages instead of internal errors.
5+
6+
## __AWS Compute Optimizer__
7+
- ### Features
8+
- In this launch, we add support for showing integration status with external metric providers such as Instana, Datadog ...etc in GetEC2InstanceRecommendations and ExportEC2InstanceRecommendations apis
9+
10+
## __AWS Elemental MediaConvert__
11+
- ### Features
12+
- This release introduces a new MXF Profile for XDCAM which is strictly compliant with the SMPTE RDD 9 standard and improved handling of output name modifiers.
13+
14+
## __AWS SDK for Java v2__
15+
- ### Features
16+
- Updated endpoint and partition metadata.
17+
18+
- ### Bugfixes
19+
- This update fixes an issue where CompletableFutures are leaked/never completed when the submission to the FUTURE_COMPLETE_EXECUTOR is rejected.
20+
21+
By default, the SDK uses `2 * number of cores` (with a maximum of 64), and uses bounded queue of size 1000. In cases where the throughput to the client exceeds the executor's ability to keep up, it would reject executions. Before this change this would lead to leaked futures.
22+
23+
## __AWS Security Token Service__
24+
- ### Features
25+
- API updates for the AWS Security Token Service
26+
27+
## __Amazon Athena__
28+
- ### Features
29+
- Removing SparkProperties from EngineConfiguration object for StartSession API call
30+
31+
## __Amazon Connect Service__
32+
- ### Features
33+
- You can programmatically create and manage prompts using APIs, for example, to extract prompts stored within Amazon Connect and add them to your Amazon S3 bucket. AWS CloudTrail, AWS CloudFormation and tagging are supported.
34+
35+
## __Amazon EC2 Container Service__
36+
- ### Features
37+
- Documentation only release to address various tickets.
38+
39+
## __Amazon Elastic Compute Cloud__
40+
- ### Features
41+
- Add support for i4g.large, i4g.xlarge, i4g.2xlarge, i4g.4xlarge, i4g.8xlarge and i4g.16xlarge instances powered by AWS Graviton2 processors that deliver up to 15% better compute performance than our other storage-optimized instances.
42+
43+
## __Amazon Relational Database Service__
44+
- ### Features
45+
- RDS documentation update for the EngineVersion parameter of ModifyDBSnapshot
46+
47+
## __Amazon SageMaker geospatial capabilities__
48+
- ### Features
49+
- This release makes ExecutionRoleArn a required field in the StartEarthObservationJob API.
50+
51+
## __S3 Transfer Manager__
52+
- ### Bugfixes
53+
- Fixed the issue where S3 Transfer Manager attempted to load AWS CRT classes when Java based S3 client was used. See [#3936](https://github.com/aws/aws-sdk-java-v2/issues/3936).
54+
155
# __2.20.67__ __2023-05-16__
256
## __AWS Direct Connect__
357
- ### 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.20.67</version>
55+
<version>2.20.68</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.20.67</version>
89+
<version>2.20.68</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.20.67</version>
94+
<version>2.20.68</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.20.67</version>
106+
<version>2.20.68</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.20.67</version>
23+
<version>2.20.68</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.20.67</version>
23+
<version>2.20.68</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.20.67</version>
23+
<version>2.20.68</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.20.67</version>
23+
<version>2.20.68</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.20.67</version>
20+
<version>2.20.68</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.20.67</version>
23+
<version>2.20.68</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.20.67</version>
20+
<version>2.20.68</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎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.20.67</version>
24+
<version>2.20.68</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.20.67</version>
25+
<version>2.20.68</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.20.67</version>
24+
<version>2.20.68</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.20.67</version>
25+
<version>2.20.68</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.20.67</version>
24+
<version>2.20.68</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/resources/software/amazon/awssdk/codegen/rules/AwsEndpointProviderUtils.java.resource

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,33 @@ public final class AwsEndpointProviderUtils {
150150
String clientEndpointPath = clientEndpoint.getRawPath();
151151

152152
// [client endpoint path]/[request path]
153-
String requestPath = request.getUri().getRawPath();
153+
String requestPath = request.encodedPath();
154154

155155
// [client endpoint path]/[additional path added by resolver]
156156
String resolvedUriPath = resolvedUri.getRawPath();
157157

158-
// our goal is to construct [client endpoint path]/[additional path added by resolver]/[request path], so we
159-
// just need to strip the client endpoint path from the marshalled request path to isolate just the part added
160-
// by the marshaller
161-
String requestPathWithClientPathRemoved = StringUtils.replaceOnce(requestPath, clientEndpointPath, "");
162-
String finalPath = SdkHttpUtils.appendUri(resolvedUriPath, requestPathWithClientPathRemoved);
158+
String finalPath = requestPath;
159+
160+
// If there is an additional path added by resolver, i.e., [additional path added by resolver] not null,
161+
// we need to combine the path
162+
if (!resolvedUriPath.equals(clientEndpointPath)) {
163+
finalPath = combinePath(clientEndpointPath, requestPath, resolvedUriPath);
164+
}
163165

164166
return request.toBuilder().protocol(resolvedUri.getScheme()).host(resolvedUri.getHost()).port(resolvedUri.getPort())
165-
.encodedPath(finalPath).build();
167+
.encodedPath(finalPath).build();
168+
}
169+
170+
/**
171+
* Our goal is to construct [client endpoint path]/[additional path added by resolver]/[request path], so we just need to
172+
* strip the client endpoint path from the marshalled request path to isolate just the part added by the marshaller. Trailing
173+
* slash is removed from client endpoint path before stripping because it could cause the leading slash to be removed from the
174+
* request path: e.g., StringUtils.replaceOnce("/", "//test", "") generates "/test" and the expected result is "//test"
175+
*/
176+
private static String combinePath(String clientEndpointPath, String requestPath, String resolvedUriPath) {
177+
String requestPathWithClientPathRemoved = StringUtils.replaceOnce(requestPath, clientEndpointPath, "");
178+
String finalPath = SdkHttpUtils.appendUri(resolvedUriPath, requestPathWithClientPathRemoved);
179+
return finalPath;
166180
}
167181

168182
public static AwsRequest addHeaders(AwsRequest request, Map<String, List<String>> headers) {

‎core/annotations/pom.xml

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

‎core/arns/pom.xml

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

‎core/auth-crt/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>core</artifactId>
25-
<version>2.20.67</version>
25+
<version>2.20.68</version>
2626
</parent>
2727

2828
<artifactId>auth-crt</artifactId>

‎core/auth/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>core</artifactId>
25-
<version>2.20.67</version>
25+
<version>2.20.68</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>

‎core/aws-core/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>core</artifactId>
25-
<version>2.20.67</version>
25+
<version>2.20.68</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/crt-core/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>core</artifactId>
24-
<version>2.20.67</version>
24+
<version>2.20.68</version>
2525
</parent>
2626

2727
<artifactId>crt-core</artifactId>

‎core/endpoints-spi/pom.xml

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

‎core/imds/pom.xml

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

0 commit comments

Comments
 (0)