Skip to content

Commit 33b12a0

Browse files
dagnirdagnir
authored
Merge branch 'master' into apache-tls-auth
2 parents 7c6d650 + 6ff0c80 commit 33b12a0

File tree

248 files changed

+1147
-366
lines changed

Some content is hidden

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

248 files changed

+1147
-366
lines changed

‎.changes/2.7.21.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"version": "2.7.21",
3+
"date": "2019-08-09",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"description": "Fixed the issue where ByteArrayAsyncRequestBody can send duplicate requests when another request comes in at the same time the subscription completes."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "AWS Elemental MediaConvert",
13+
"description": "AWS Elemental MediaConvert has added support for multi-DRM SPEKE with CMAF outputs, MP3 ingest, and options for improved video quality."
14+
},
15+
{
16+
"type": "feature",
17+
"category": "Amazon GuardDuty",
18+
"description": "New \"evidence\" field in the finding model to provide evidence information explaining why the finding has been triggered. Currently only threat-intelligence findings have this field. Some documentation updates."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "Amazon Lex Runtime Service",
23+
"description": "Manage Amazon Lex session state using APIs on the client"
24+
},
25+
{
26+
"type": "feature",
27+
"category": "Amazon Redshift",
28+
"description": "Add expectedNextSnapshotScheduleTime and expectedNextSnapshotScheduleTimeStatus to redshift cluster object."
29+
},
30+
{
31+
"type": "feature",
32+
"category": "AWS IoT",
33+
"description": "This release adds Quality of Service (QoS) support for AWS IoT rules engine republish action."
34+
},
35+
{
36+
"type": "bugfix",
37+
"category": "AWS SDK for Java v2",
38+
"description": "For APIs that support input event streams, set the `Content-Type` to `application/vnd.amazon.eventstream` on the request."
39+
}
40+
]
41+
}

‎CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
# __2.7.21__ __2019-08-09__
2+
## __AWS Elemental MediaConvert__
3+
- ### Features
4+
- AWS Elemental MediaConvert has added support for multi-DRM SPEKE with CMAF outputs, MP3 ingest, and options for improved video quality.
5+
6+
## __AWS IoT__
7+
- ### Features
8+
- This release adds Quality of Service (QoS) support for AWS IoT rules engine republish action.
9+
10+
## __AWS SDK for Java v2__
11+
- ### Bugfixes
12+
- Fixed the issue where ByteArrayAsyncRequestBody can send duplicate requests when another request comes in at the same time the subscription completes.
13+
- For APIs that support input event streams, set the `Content-Type` to `application/vnd.amazon.eventstream` on the request.
14+
15+
## __Amazon GuardDuty__
16+
- ### Features
17+
- New "evidence" field in the finding model to provide evidence information explaining why the finding has been triggered. Currently only threat-intelligence findings have this field. Some documentation updates.
18+
19+
## __Amazon Lex Runtime Service__
20+
- ### Features
21+
- Manage Amazon Lex session state using APIs on the client
22+
23+
## __Amazon Redshift__
24+
- ### Features
25+
- Add expectedNextSnapshotScheduleTime and expectedNextSnapshotScheduleTimeStatus to redshift cluster object.
26+
127
# __2.7.20__ __2019-08-08__
228
## __AWS CodeBuild__
329
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To automatically manage module versions (currently all modules have the same ver
4848
<dependency>
4949
<groupId>software.amazon.awssdk</groupId>
5050
<artifactId>bom</artifactId>
51-
<version>2.7.20</version>
51+
<version>2.7.21</version>
5252
<type>pom</type>
5353
<scope>import</scope>
5454
</dependency>
@@ -82,12 +82,12 @@ Alternatively you can add dependencies for the specific services you use only:
8282
<dependency>
8383
<groupId>software.amazon.awssdk</groupId>
8484
<artifactId>ec2</artifactId>
85-
<version>2.7.20</version>
85+
<version>2.7.21</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>software.amazon.awssdk</groupId>
8989
<artifactId>s3</artifactId>
90-
<version>2.7.20</version>
90+
<version>2.7.21</version>
9191
</dependency>
9292
```
9393

@@ -99,7 +99,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
9999
<dependency>
100100
<groupId>software.amazon.awssdk</groupId>
101101
<artifactId>aws-sdk-java</artifactId>
102-
<version>2.7.20</version>
102+
<version>2.7.21</version>
103103
</dependency>
104104
```
105105

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.7.21-SNAPSHOT</version>
7+
<version>2.7.22-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>aws-sdk-java-pom</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.7.21-SNAPSHOT</version>
8+
<version>2.7.22-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.7.21-SNAPSHOT</version>
7+
<version>2.7.22-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<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.7.21-SNAPSHOT</version>
24+
<version>2.7.22-SNAPSHOT</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
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>aws-sdk-java-pom</artifactId>
10-
<version>2.7.21-SNAPSHOT</version>
10+
<version>2.7.22-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>software.amazon.awssdk</groupId>
88
<artifactId>aws-sdk-java-pom</artifactId>
9-
<version>2.7.21-SNAPSHOT</version>
9+
<version>2.7.22-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>codegen-lite</artifactId>
1212
<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.7.21-SNAPSHOT</version>
25+
<version>2.7.22-SNAPSHOT</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.7.21-SNAPSHOT</version>
24+
<version>2.7.22-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamUtils.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,20 @@ private static boolean operationContainsEventStream(OperationModel opModel, Shap
161161
return doesShapeContainsEventStream(opModel.getInputShape(), eventStreamShape) ||
162162
doesShapeContainsEventStream(opModel.getOutputShape(), eventStreamShape);
163163
}
164+
165+
/**
166+
* @return true if the provide model is a request/response shape model that contains event stream shape.
167+
* Otherwise return false.
168+
*/
169+
public static boolean isEventStreamParentModel(ShapeModel shapeModel) {
170+
return containsEventStream(shapeModel);
171+
}
172+
173+
private static boolean containsEventStream(ShapeModel shapeModel) {
174+
return shapeModel != null
175+
&& shapeModel.getMembers() != null
176+
&& shapeModel.getMembers().stream()
177+
.filter(m -> m.getShape() != null)
178+
.anyMatch(m -> m.getShape().isEventStream());
179+
}
164180
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ protected FieldSpec operationInfoField() {
7373
.add(".hasPayloadMembers($L)", shapeModel.hasPayloadMembers())
7474
// Adding httpMethod to avoid validation failure while creating the SdkHttpFullRequest
7575
.add(".httpMethod($T.GET)", SdkHttpMethod.class)
76+
.add(".hasEvent(true)")
7677
.add(".build()");
7778

7879

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
package software.amazon.awssdk.codegen.poet.transform.protocols;
1717

18+
import static software.amazon.awssdk.codegen.poet.eventstream.EventStreamUtils.isEventStreamParentModel;
19+
1820
import com.squareup.javapoet.ClassName;
1921
import com.squareup.javapoet.CodeBlock;
2022
import com.squareup.javapoet.FieldSpec;
@@ -103,6 +105,10 @@ protected FieldSpec operationInfoField() {
103105
initializationCodeBlockBuilder.add(".hasStreamingInput(true)");
104106
}
105107

108+
if (isEventStreamParentModel(shapeModel)) {
109+
initializationCodeBlockBuilder.add(".hasEventStreamingInput(true)");
110+
}
111+
106112
CodeBlock codeBlock = initializationCodeBlockBuilder.add(".build()").build();
107113

108114
return FieldSpec.builder(ClassName.get(OperationInfo.class), "SDK_OPERATION_BINDING")

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventonemarshaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@SdkInternalApi
2020
public class EventOneMarshaller implements Marshaller<EventOne> {
2121
private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().hasExplicitPayloadMember(false)
22-
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).build();
22+
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).hasEvent(true).build();
2323

2424
private final BaseAwsJsonProtocolFactory protocolFactory;
2525

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationrequestmarshaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class EventStreamOperationRequestMarshaller implements Marshaller<EventStreamOperationRequest> {
2121
private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder()
2222
.requestUri("/2016-03-11/eventStreamOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true)
23-
.hasPayloadMembers(true).build();
23+
.hasPayloadMembers(true).hasEventStreamingInput(true).build();
2424

2525
private final BaseAwsJsonProtocolFactory protocolFactory;
2626

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationwithonlyinputrequestmarshaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class EventStreamOperationWithOnlyInputRequestMarshaller implements
2121
Marshaller<EventStreamOperationWithOnlyInputRequest> {
2222
private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder()
2323
.requestUri("/2016-03-11/EventStreamOperationWithOnlyInput").httpMethod(SdkHttpMethod.POST)
24-
.hasExplicitPayloadMember(false).hasPayloadMembers(true).build();
24+
.hasExplicitPayloadMember(false).hasPayloadMembers(true).hasEventStreamingInput(true).build();
2525

2626
private final BaseAwsJsonProtocolFactory protocolFactory;
2727

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventthreemarshaller.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
@SdkInternalApi
2020
public class EventThreeMarshaller implements Marshaller<EventThree> {
2121
private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().hasExplicitPayloadMember(false)
22-
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).build();
23-
22+
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).hasEvent(true).build();
2423
private final BaseAwsJsonProtocolFactory protocolFactory;
2524

2625
public EventThreeMarshaller(BaseAwsJsonProtocolFactory protocolFactory) {

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventtwomarshaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@SdkInternalApi
2020
public class EventTwoMarshaller implements Marshaller<EventTwo> {
2121
private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().hasExplicitPayloadMember(false)
22-
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).build();
22+
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).hasEvent(true).build();
2323

2424
private final BaseAwsJsonProtocolFactory protocolFactory;
2525

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/inputeventmarshaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@SdkInternalApi
2020
public class InputEventMarshaller implements Marshaller<InputEvent> {
2121
private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().hasExplicitPayloadMember(true)
22-
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).build();
22+
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).hasEvent(true).build();
2323

2424
private final BaseAwsJsonProtocolFactory protocolFactory;
2525

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/inputeventtwomarshaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@SdkInternalApi
2020
public class InputEventTwoMarshaller implements Marshaller<InputEventTwo> {
2121
private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().hasExplicitPayloadMember(false)
22-
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).build();
22+
.hasPayloadMembers(true).httpMethod(SdkHttpMethod.GET).hasEvent(true).build();
2323

2424
private final BaseAwsJsonProtocolFactory protocolFactory;
2525

‎core/annotations/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.7.21-SNAPSHOT</version>
8+
<version>2.7.22-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/auth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.7.21-SNAPSHOT</version>
10+
<version>2.7.22-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>auth</artifactId>

‎core/aws-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.7.21-SNAPSHOT</version>
10+
<version>2.7.22-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>aws-core</artifactId>

‎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.7.21-SNAPSHOT</version>
24+
<version>2.7.22-SNAPSHOT</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.7.21-SNAPSHOT</version>
25+
<version>2.7.22-SNAPSHOT</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
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.7.21-SNAPSHOT</version>
8+
<version>2.7.22-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

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

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

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

0 commit comments

Comments
 (0)