Skip to content

Commit b26c2a0

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1839 from aws/staging/772ba767-d673-4303-84a4-55b0d638610d
Pull request: release <- staging/772ba767-d673-4303-84a4-55b0d638610d
2 parents 230d0dd + 6b5ff2a commit b26c2a0

File tree

388 files changed

+4415
-508
lines changed

Some content is hidden

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

388 files changed

+4415
-508
lines changed

‎.changes/2.17.82.json

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"version": "2.17.82",
3+
"date": "2021-11-15",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS WAFV2",
8+
"contributor": "",
9+
"description": "Your options for logging web ACL traffic now include Amazon CloudWatch Logs log groups and Amazon S3 buckets."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "Amazon Elastic Compute Cloud",
14+
"contributor": "",
15+
"description": "Adds a new VPC Subnet attribute \"EnableDns64.\" When enabled on IPv6 Subnets, the Amazon-Provided DNS Resolver returns synthetic IPv6 addresses for IPv4-only destinations."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Database Migration Service",
20+
"contributor": "",
21+
"description": "Add Settings in JSON format for the source GCP MySQL endpoint"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": "",
27+
"description": "Updated service endpoint metadata."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Simple Systems Manager (SSM)",
32+
"contributor": "",
33+
"description": "Adds support for Session Reason and Max Session Duration for Systems Manager Session Manager."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS Transfer Family",
38+
"contributor": "",
39+
"description": "AWS Transfer Family now supports integrating a custom identity provider using AWS Lambda"
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Migration Hub Strategy Recommendations",
44+
"contributor": "",
45+
"description": "AWS SDK for Migration Hub Strategy Recommendations. It includes APIs to start the portfolio assessment, import portfolio data for assessment, and to retrieve recommendations. For more information, see the AWS Migration Hub documentation at https://docs.aws.amazon.com/migrationhub/index.html"
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon Elastic Kubernetes Service",
50+
"contributor": "",
51+
"description": "Adding Tags support to Cluster Registrations."
52+
},
53+
{
54+
"type": "feature",
55+
"category": "Amazon AppStream",
56+
"contributor": "",
57+
"description": "This release includes support for images of AmazonLinux2 platform type."
58+
},
59+
{
60+
"type": "bugfix",
61+
"category": "AWS SDK for Java v2",
62+
"contributor": "",
63+
"description": "Update the REST-JSON marshalling logic to conform to the standard expected behavior WRT to the `Content-Type` of the request."
64+
},
65+
{
66+
"type": "feature",
67+
"category": "AWS SDK for Java v2",
68+
"contributor": "erin889",
69+
"description": "Use System Property Proxy Settings for Netty and AWS Common Runtime (CRT) HTTP Clients. See [#2321](https://github.com/aws/aws-sdk-java-v2/issues/2321), [#1793](https://github.com/aws/aws-sdk-java-v2/issues/1793)"
70+
}
71+
]
72+
}

‎CHANGELOG.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,49 @@
1+
# __2.17.82__ __2021-11-15__
2+
## __AWS Database Migration Service__
3+
- ### Features
4+
- Add Settings in JSON format for the source GCP MySQL endpoint
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Updated service endpoint metadata.
9+
- Use System Property Proxy Settings for Netty and AWS Common Runtime (CRT) HTTP Clients. See [#2321](https://github.com/aws/aws-sdk-java-v2/issues/2321), [#1793](https://github.com/aws/aws-sdk-java-v2/issues/1793)
10+
- Contributed by: [@erin889](https://github.com/erin889)
11+
12+
- ### Bugfixes
13+
- Update the REST-JSON marshalling logic to conform to the standard expected behavior WRT to the `Content-Type` of the request.
14+
15+
## __AWS Transfer Family__
16+
- ### Features
17+
- AWS Transfer Family now supports integrating a custom identity provider using AWS Lambda
18+
19+
## __AWS WAFV2__
20+
- ### Features
21+
- Your options for logging web ACL traffic now include Amazon CloudWatch Logs log groups and Amazon S3 buckets.
22+
23+
## __Amazon AppStream__
24+
- ### Features
25+
- This release includes support for images of AmazonLinux2 platform type.
26+
27+
## __Amazon Elastic Compute Cloud__
28+
- ### Features
29+
- Adds a new VPC Subnet attribute "EnableDns64." When enabled on IPv6 Subnets, the Amazon-Provided DNS Resolver returns synthetic IPv6 addresses for IPv4-only destinations.
30+
31+
## __Amazon Elastic Kubernetes Service__
32+
- ### Features
33+
- Adding Tags support to Cluster Registrations.
34+
35+
## __Amazon Simple Systems Manager (SSM)__
36+
- ### Features
37+
- Adds support for Session Reason and Max Session Duration for Systems Manager Session Manager.
38+
39+
## __Migration Hub Strategy Recommendations__
40+
- ### Features
41+
- AWS SDK for Migration Hub Strategy Recommendations. It includes APIs to start the portfolio assessment, import portfolio data for assessment, and to retrieve recommendations. For more information, see the AWS Migration Hub documentation at https://docs.aws.amazon.com/migrationhub/index.html
42+
43+
## __Contributors__
44+
Special thanks to the following contributors to this release:
45+
46+
[@erin889](https://github.com/erin889)
147
# __2.17.81__ __2021-11-12__
248
## __AWS Elemental MediaConvert__
349
- ### 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.17.81</version>
55+
<version>2.17.82</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.17.81</version>
89+
<version>2.17.82</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.81</version>
94+
<version>2.17.82</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.17.81</version>
106+
<version>2.17.82</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.17.81</version>
23+
<version>2.17.82</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.17.81</version>
23+
<version>2.17.82</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.17.81</version>
23+
<version>2.17.82</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.17.81</version>
23+
<version>2.17.82</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

Lines changed: 6 additions & 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.17.81</version>
20+
<version>2.17.82</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>
@@ -1448,6 +1448,11 @@ Amazon AutoScaling, etc).</description>
14481448
<artifactId>resiliencehub</artifactId>
14491449
<version>${awsjavasdk.version}</version>
14501450
</dependency>
1451+
<dependency>
1452+
<groupId>software.amazon.awssdk</groupId>
1453+
<artifactId>migrationhubstrategy</artifactId>
1454+
<version>${awsjavasdk.version}</version>
1455+
</dependency>
14511456
</dependencies>
14521457
<build>
14531458
<finalName>${project.artifactId}-${project.version}</finalName>

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

‎bom/pom.xml

Lines changed: 6 additions & 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.17.81</version>
20+
<version>2.17.82</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>
@@ -1588,6 +1588,11 @@
15881588
<artifactId>resiliencehub</artifactId>
15891589
<version>${awsjavasdk.version}</version>
15901590
</dependency>
1591+
<dependency>
1592+
<groupId>software.amazon.awssdk</groupId>
1593+
<artifactId>migrationhubstrategy</artifactId>
1594+
<version>${awsjavasdk.version}</version>
1595+
</dependency>
15911596
</dependencies>
15921597
</dependencyManagement>
15931598
</project>

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

‎codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,17 @@ public List<MemberModel> getUnboundMembers() {
187187
List<MemberModel> unboundMembers = new ArrayList<>();
188188
if (members != null) {
189189
for (MemberModel member : members) {
190-
if (member.getHttp().getLocation() == null) {
190+
if (member.getHttp().getLocation() == null && !member.getHttp().getIsPayload()) {
191191
if (hasPayloadMember) {
192+
// There is an explicit payload, but this unbound
193+
// member isn't it.
194+
// Note: Somewhat unintuitive, explicit payloads don't
195+
// have an explicit location; they're identified by
196+
// the payload HTTP trait being true.
192197
throw new IllegalStateException(String.format(
193-
"C2J Shape %s has both an explicit payload member and unbound (no explicit location) members. "
194-
+ "This is undefined behavior, verify the correctness of the C2J model", c2jName));
198+
"C2J Shape %s has both an explicit payload member and unbound (no explicit location) member, %s."
199+
+ " This is undefined behavior, verify the correctness of the C2J model.",
200+
c2jName, member.getName()));
195201
}
196202
unboundMembers.add(member);
197203
}
@@ -221,8 +227,17 @@ public List<MemberModel> getUnboundEventMembers() {
221227
public boolean hasPayloadMembers() {
222228
return hasPayloadMember ||
223229
getExplicitEventPayloadMember() != null ||
224-
!getUnboundMembers().isEmpty() ||
225-
(isEvent() && !getUnboundEventMembers().isEmpty());
230+
hasImplicitPayloadMembers();
231+
232+
}
233+
234+
public boolean hasImplicitPayloadMembers() {
235+
return !getUnboundMembers().isEmpty() ||
236+
hasImplicitEventPayloadMembers();
237+
}
238+
239+
public boolean hasImplicitEventPayloadMembers() {
240+
return isEvent() && !getUnboundEventMembers().isEmpty();
226241
}
227242

228243
/**

‎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
@@ -65,6 +65,7 @@ protected FieldSpec operationInfoField() {
6565
.add(".hasExplicitPayloadMember($L)", shapeModel.isHasPayloadMember() ||
6666
shapeModel.getExplicitEventPayloadMember() != null)
6767
.add(".hasPayloadMembers($L)", shapeModel.hasPayloadMembers())
68+
.add(".hasImplicitPayloadMembers($L)", shapeModel.hasImplicitEventPayloadMembers())
6869
// Adding httpMethod to avoid validation failure while creating the SdkHttpFullRequest
6970
.add(".httpMethod($T.GET)", SdkHttpMethod.class)
7071
.add(".hasEvent(true)")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ protected FieldSpec operationInfoField() {
9595
.add(".httpMethod($T.$L)", SdkHttpMethod.class, shapeModel.getMarshaller().getVerb())
9696
.add(".hasExplicitPayloadMember($L)", shapeModel.isHasPayloadMember() ||
9797
shapeModel.getExplicitEventPayloadMember() != null)
98+
.add(".hasImplicitPayloadMembers($L)", shapeModel.hasImplicitPayloadMembers())
9899
.add(".hasPayloadMembers($L)", shapeModel.hasPayloadMembers());
99100

100101
if (StringUtils.isNotBlank(shapeModel.getMarshaller().getTarget())) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
@SdkInternalApi
2020
public class AllTypesRequestMarshaller implements Marshaller<AllTypesRequest> {
2121
private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/")
22-
.httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).build();
22+
.httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true)
23+
.hasPayloadMembers(true).build();
2324

2425
private final BaseAwsJsonProtocolFactory protocolFactory;
2526

@@ -32,11 +33,10 @@ public SdkHttpFullRequest marshall(AllTypesRequest allTypesRequest) {
3233
Validate.paramNotNull(allTypesRequest, "allTypesRequest");
3334
try {
3435
ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
35-
.createProtocolMarshaller(SDK_OPERATION_BINDING);
36+
.createProtocolMarshaller(SDK_OPERATION_BINDING);
3637
return protocolMarshaller.marshall(allTypesRequest);
3738
} catch (Exception e) {
3839
throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
3940
}
4041
}
4142
}
42-

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

Lines changed: 3 additions & 4 deletions
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).hasEvent(true).build();
22+
.hasPayloadMembers(true).hasImplicitPayloadMembers(true).httpMethod(SdkHttpMethod.GET).hasEvent(true).build();
2323

2424
private final BaseAwsJsonProtocolFactory protocolFactory;
2525

@@ -34,11 +34,10 @@ public SdkHttpFullRequest marshall(EventOne eventOne) {
3434
ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
3535
.createProtocolMarshaller(SDK_OPERATION_BINDING);
3636
return protocolMarshaller.marshall(eventOne).toBuilder().putHeader(":message-type", "event")
37-
.putHeader(":event-type", eventOne.sdkEventType().toString()).putHeader(":content-type", protocolFactory.getContentType())
38-
.build();
37+
.putHeader(":event-type", eventOne.sdkEventType().toString())
38+
.putHeader(":content-type", protocolFactory.getContentType()).build();
3939
} catch (Exception e) {
4040
throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
4141
}
4242
}
4343
}
44-

0 commit comments

Comments
 (0)