Skip to content

Commit 075cd97

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #973 from aws/staging/bbeab449-6005-4d7b-81ec-20ecdcddfab6
Pull request: release <- staging/bbeab449-6005-4d7b-81ec-20ecdcddfab6
2 parents d2388d0 + 7d349dd commit 075cd97

File tree

306 files changed

+2241
-466
lines changed

Some content is hidden

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

306 files changed

+2241
-466
lines changed

‎.changes/2.14.25.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"version": "2.14.25",
3+
"date": "2020-09-24",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Elastic Kubernetes Service",
8+
"description": "Amazon EKS now supports configuring your cluster's service CIDR during cluster creation."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "AWS Amplify",
13+
"description": "Allow Oauth Token in CreateApp call to be a maximum of 1000 characters instead of 100"
14+
},
15+
{
16+
"type": "bugfix",
17+
"category": "AWS SDK for Java v2",
18+
"description": "Fixed an issue where successful JSON service responses were required to include a payload (fixes NullPointerException originating from JsonProtocolUnmarshaller)."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "AWS Savings Plans",
23+
"description": "Introducing Queued SavingsPlans that will enable customers to queue their purchase request of Savings Plans for future dates."
24+
},
25+
{
26+
"type": "feature",
27+
"category": "Amazon Transcribe Service",
28+
"description": "Amazon Transcribe now supports WebM, OGG, AMR and AMR-WB as input formats. You can also specify an output key as a location within your S3 buckets to store the output of your transcription jobs."
29+
},
30+
{
31+
"type": "bugfix",
32+
"category": "AWS SDK for Java v2",
33+
"description": "Fixed an issue with XML services, where the service responding with no payload would treat the payload as empty. Now, empty payloads will properly be populated within the XML response as \"null\"."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Synthetics",
38+
"description": "AWS Synthetics now supports AWS X-Ray Active Tracing feature. RunConfig is now an optional parameter with timeout updated from (60 - 900 seconds) to (3 - 840 seconds)."
39+
},
40+
{
41+
"type": "feature",
42+
"category": "Amazon Textract",
43+
"description": "AWS Textract now supports output results for asynchronous jobs to customer specified s3 bucket."
44+
},
45+
{
46+
"type": "feature",
47+
"category": "AWS SDK for Java v2",
48+
"description": "Updated service endpoint metadata."
49+
}
50+
]
51+
}

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
# __2.14.25__ __2020-09-24__
2+
## __AWS Amplify__
3+
- ### Features
4+
- Allow Oauth Token in CreateApp call to be a maximum of 1000 characters instead of 100
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Updated service endpoint metadata.
9+
10+
- ### Bugfixes
11+
- Fixed an issue where successful JSON service responses were required to include a payload (fixes NullPointerException originating from JsonProtocolUnmarshaller).
12+
- Fixed an issue with XML services, where the service responding with no payload would treat the payload as empty. Now, empty payloads will properly be populated within the XML response as "null".
13+
14+
## __AWS Savings Plans__
15+
- ### Features
16+
- Introducing Queued SavingsPlans that will enable customers to queue their purchase request of Savings Plans for future dates.
17+
18+
## __Amazon Elastic Kubernetes Service__
19+
- ### Features
20+
- Amazon EKS now supports configuring your cluster's service CIDR during cluster creation.
21+
22+
## __Amazon Textract__
23+
- ### Features
24+
- AWS Textract now supports output results for asynchronous jobs to customer specified s3 bucket.
25+
26+
## __Amazon Transcribe Service__
27+
- ### Features
28+
- Amazon Transcribe now supports WebM, OGG, AMR and AMR-WB as input formats. You can also specify an output key as a location within your S3 buckets to store the output of your transcription jobs.
29+
30+
## __Synthetics__
31+
- ### Features
32+
- AWS Synthetics now supports AWS X-Ray Active Tracing feature. RunConfig is now an optional parameter with timeout updated from (60 - 900 seconds) to (3 - 840 seconds).
33+
134
# __2.14.24__ __2020-09-23__
235
## __AWS Backup__
336
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To automatically manage module versions (currently all modules have the same ver
4949
<dependency>
5050
<groupId>software.amazon.awssdk</groupId>
5151
<artifactId>bom</artifactId>
52-
<version>2.14.24</version>
52+
<version>2.14.25</version>
5353
<type>pom</type>
5454
<scope>import</scope>
5555
</dependency>
@@ -83,12 +83,12 @@ Alternatively you can add dependencies for the specific services you use only:
8383
<dependency>
8484
<groupId>software.amazon.awssdk</groupId>
8585
<artifactId>ec2</artifactId>
86-
<version>2.14.24</version>
86+
<version>2.14.25</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.14.24</version>
91+
<version>2.14.25</version>
9292
</dependency>
9393
```
9494

@@ -100,7 +100,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
100100
<dependency>
101101
<groupId>software.amazon.awssdk</groupId>
102102
<artifactId>aws-sdk-java</artifactId>
103-
<version>2.14.24</version>
103+
<version>2.14.25</version>
104104
</dependency>
105105
```
106106

‎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.14.24</version>
23+
<version>2.14.25</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎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.14.24</version>
23+
<version>2.14.25</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.14.24</version>
20+
<version>2.14.25</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.14.24</version>
23+
<version>2.14.25</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.14.24</version>
20+
<version>2.14.25</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎buildspecs/integ-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ phases:
99
commands:
1010
- |
1111
if [ ! -z "$INTEGRATION_TEST_ROLE_ARN" ]; then
12-
ASSUME_ROLE_OUTPUT=`aws sts assume-role --role-arn "$INTEGRATION_TEST_ROLE_ARN" --role-session-name "integration-tests" --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' --output text`
12+
ASSUME_ROLE_OUTPUT=`aws sts assume-role --role-arn "$INTEGRATION_TEST_ROLE_ARN" --role-session-name "integration-tests" --duration-seconds 7200 --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' --output text`
1313
AWS_ACCESS_KEY_ID=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $1 }'`
1414
AWS_SECRET_ACCESS_KEY=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $2 }'`
1515
AWS_SESSION_TOKEN=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $3 }'`

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

‎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.14.24</version>
23+
<version>2.14.25</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.14.24</version>
23+
<version>2.14.25</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎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.14.24</version>
25+
<version>2.14.25</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.14.24</version>
25+
<version>2.14.25</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/metrics-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.14.24</version>
8+
<version>2.14.25</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/pom.xml

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

2727
<artifactId>core</artifactId>

‎core/profiles/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.14.24</version>
25+
<version>2.14.25</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

‎core/protocols/aws-cbor-protocol/pom.xml

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

‎core/protocols/aws-ion-protocol/pom.xml

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

‎core/protocols/aws-json-protocol/pom.xml

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

‎core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonProtocolUnmarshaller.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ public T unmarshall(JsonUnmarshallerContext context,
164164

165165
public <TypeT extends SdkPojo> TypeT unmarshall(SdkPojo sdkPojo,
166166
SdkHttpFullResponse response) throws IOException {
167-
if (hasPayloadMembersOnUnmarshall(sdkPojo) && !hasExplicitBlobPayloadMember(sdkPojo)) {
168-
SdkJsonNode jsonNode = parser.parse(ReleasableInputStream.wrap(response.content().orElse(null)).disableClose());
167+
if (hasPayloadMembersOnUnmarshall(sdkPojo) && !hasExplicitBlobPayloadMember(sdkPojo) && response.content().isPresent()) {
168+
SdkJsonNode jsonNode = parser.parse(ReleasableInputStream.wrap(response.content().get()).disableClose());
169169
return unmarshall(sdkPojo, response, jsonNode);
170170
} else {
171171
return unmarshall(sdkPojo, response, null);
@@ -204,8 +204,9 @@ private static <TypeT extends SdkPojo> TypeT unmarshallStructured(SdkPojo sdkPoj
204204
SdkJsonNode jsonContent,
205205
JsonUnmarshallerContext context) {
206206
for (SdkField<?> field : sdkPojo.sdkFields()) {
207-
if (isExplicitPayloadMember(field) && field.marshallingType() == MarshallingType.SDK_BYTES) {
208-
field.set(sdkPojo, SdkBytes.fromInputStream(context.response().content().orElse(null)));
207+
if (isExplicitPayloadMember(field) && field.marshallingType() == MarshallingType.SDK_BYTES &&
208+
context.response().content().isPresent()) {
209+
field.set(sdkPojo, SdkBytes.fromInputStream(context.response().content().get()));
209210
} else {
210211
SdkJsonNode jsonFieldContent = getSdkJsonNode(jsonContent, field);
211212
JsonUnmarshaller<Object> unmarshaller = context.getUnmarshaller(field.location(), field.marshallingType());

‎core/protocols/aws-query-protocol/pom.xml

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

‎core/protocols/aws-xml-protocol/pom.xml

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

‎core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlProtocolUnmarshaller.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public static XmlProtocolUnmarshaller create() {
5555

5656
public <TypeT extends SdkPojo> TypeT unmarshall(SdkPojo sdkPojo,
5757
SdkHttpFullResponse response) {
58-
5958
XmlElement document = XmlResponseParserUtils.parse(sdkPojo, response);
6059
return unmarshall(sdkPojo, document, response);
6160
}
@@ -81,6 +80,11 @@ SdkPojo unmarshall(XmlUnmarshallerContext context, SdkPojo sdkPojo, XmlElement r
8180
XmlUnmarshaller<Object> unmarshaller = REGISTRY.getUnmarshaller(field.location(), field.marshallingType());
8281

8382
if (root != null && field.location() == MarshallLocation.PAYLOAD) {
83+
if (!context.response().content().isPresent()) {
84+
// This is a payload field, but the service sent no content. Do not populate this field (leave it null).
85+
continue;
86+
}
87+
8488
if (isAttribute(field)) {
8589
root.getOptionalAttributeByName(field.unmarshallLocationName())
8690
.ifPresent(e -> field.set(sdkPojo, e));

‎core/protocols/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.14.24</version>
23+
<version>2.14.25</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/protocol-core/pom.xml

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

‎core/regions/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.14.24</version>
25+
<version>2.14.25</version>
2626
</parent>
2727

2828
<artifactId>regions</artifactId>

0 commit comments

Comments
 (0)