Skip to content

Commit c828d4c

Browse files
Merge pull request #707 from aws/staging/c007a175-c118-498d-a017-e48c7182ccb9
Pull request: release <- staging/c007a175-c118-498d-a017-e48c7182ccb9
2 parents 681a17d + 803a72e commit c828d4c

File tree

353 files changed

+3034
-968
lines changed

Some content is hidden

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

353 files changed

+3034
-968
lines changed

.changes/2.10.40.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"version": "2.10.40",
3+
"date": "2019-12-20",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Relational Database Service",
8+
"description": "This release adds an operation that enables users to specify whether a database is restarted when its SSL/TLS certificate is rotated. Only customers who do not use SSL/TLS should use this operation."
9+
},
10+
{
11+
"type": "bugfix",
12+
"category": "Amazon S3",
13+
"description": "Fixed an issue where the SDK would attempt to validate the checksum on a PutObjectRequest when S3 was returning invalid checksums. This would cause all requests to buckets with customer-managed-key service-side encryption to fail."
14+
},
15+
{
16+
"type": "feature",
17+
"category": "AWS Device Farm",
18+
"description": "Introduced browser testing support through AWS Device Farm"
19+
},
20+
{
21+
"type": "feature",
22+
"category": "Amazon Redshift",
23+
"description": "Documentation updates for Amazon Redshift RA3 node types."
24+
},
25+
{
26+
"type": "feature",
27+
"category": "AWS SecurityHub",
28+
"description": "Additional resource types are now fully supported in the AWS Security Finding Format (ASFF). These resources include AwsElbv2LoadBalancer, AwsKmsKey, AwsIamRole, AwsSqsQueue, AwsLambdaFunction, AwsSnsTopic, and AwsCloudFrontDistribution. Each of these resource types includes an accompanying resource details object with fields for security finding providers to populate. Updates were made to the AwsIamAccessKey resource details object to include information on principal ID and name. To learn more, visit our documentation on the ASFF."
29+
},
30+
{
31+
"type": "feature",
32+
"category": "Amazon Elastic Compute Cloud",
33+
"description": "This release introduces the ability to tag key pairs, placement groups, export tasks, import image tasks, import snapshot tasks and export image tasks. You can use tags to organize and identify your resources for cost allocation."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon Simple Systems Manager (SSM)",
38+
"description": "This release updates the attachments support to include AttachmentReference source for Automation documents."
39+
},
40+
{
41+
"type": "feature",
42+
"category": "Amazon Transcribe Service",
43+
"description": "AWS Transcribe now supports vocabulary filtering that allows customers to input words to the service that they don't want to see in the output transcript."
44+
},
45+
{
46+
"type": "feature",
47+
"category": "Amazon Elastic Kubernetes Service",
48+
"description": "Amazon EKS now supports restricting access to the API server public endpoint by applying CIDR blocks"
49+
},
50+
{
51+
"type": "feature",
52+
"category": "Amazon Pinpoint",
53+
"description": "This release of the Amazon Pinpoint API introduces versioning support for message templates."
54+
}
55+
]
56+
}

CHANGELOG.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
# __2.10.40__ __2019-12-20__
2+
## __AWS Device Farm__
3+
- ### Features
4+
- Introduced browser testing support through AWS Device Farm
5+
6+
## __AWS SecurityHub__
7+
- ### Features
8+
- Additional resource types are now fully supported in the AWS Security Finding Format (ASFF). These resources include AwsElbv2LoadBalancer, AwsKmsKey, AwsIamRole, AwsSqsQueue, AwsLambdaFunction, AwsSnsTopic, and AwsCloudFrontDistribution. Each of these resource types includes an accompanying resource details object with fields for security finding providers to populate. Updates were made to the AwsIamAccessKey resource details object to include information on principal ID and name. To learn more, visit our documentation on the ASFF.
9+
10+
## __Amazon Elastic Compute Cloud__
11+
- ### Features
12+
- This release introduces the ability to tag key pairs, placement groups, export tasks, import image tasks, import snapshot tasks and export image tasks. You can use tags to organize and identify your resources for cost allocation.
13+
14+
## __Amazon Elastic Kubernetes Service__
15+
- ### Features
16+
- Amazon EKS now supports restricting access to the API server public endpoint by applying CIDR blocks
17+
18+
## __Amazon Pinpoint__
19+
- ### Features
20+
- This release of the Amazon Pinpoint API introduces versioning support for message templates.
21+
22+
## __Amazon Redshift__
23+
- ### Features
24+
- Documentation updates for Amazon Redshift RA3 node types.
25+
26+
## __Amazon Relational Database Service__
27+
- ### Features
28+
- This release adds an operation that enables users to specify whether a database is restarted when its SSL/TLS certificate is rotated. Only customers who do not use SSL/TLS should use this operation.
29+
30+
## __Amazon S3__
31+
- ### Bugfixes
32+
- Fixed an issue where the SDK would attempt to validate the checksum on a PutObjectRequest when S3 was returning invalid checksums. This would cause all requests to buckets with customer-managed-key service-side encryption to fail.
33+
34+
## __Amazon Simple Systems Manager (SSM)__
35+
- ### Features
36+
- This release updates the attachments support to include AttachmentReference source for Automation documents.
37+
38+
## __Amazon Transcribe Service__
39+
- ### Features
40+
- AWS Transcribe now supports vocabulary filtering that allows customers to input words to the service that they don't want to see in the output transcript.
41+
142
# __2.10.39__ __2019-12-19__
243
## __AWS CodeStar connections__
344
- ### 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.10.39</version>
51+
<version>2.10.40</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.10.39</version>
85+
<version>2.10.40</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>software.amazon.awssdk</groupId>
8989
<artifactId>s3</artifactId>
90-
<version>2.10.39</version>
90+
<version>2.10.40</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.10.39</version>
102+
<version>2.10.40</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.10.39</version>
7+
<version>2.10.40</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.10.39</version>
8+
<version>2.10.40</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.10.39</version>
7+
<version>2.10.40</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>bom</artifactId>

build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/PluralEnumNames.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.puppycrawl.tools.checkstyle.api.DetailAST;
2020
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
2121
import java.util.Arrays;
22+
import java.util.Collections;
2223
import java.util.List;
2324

2425
/**
@@ -27,7 +28,7 @@
2728
*/
2829
public class PluralEnumNames extends AbstractCheck {
2930
private static final List<String> PLURAL_ENDINGS = Arrays.asList("S", "s");
30-
private static final List<String> NON_PLURAL_ENDINGS = Arrays.asList("Status");
31+
private static final List<String> NON_PLURAL_ENDINGS = Collections.singletonList("Status");
3132

3233
@Override
3334
public int[] getDefaultTokens() {

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.10.39</version>
24+
<version>2.10.40</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.10.39</version>
10+
<version>2.10.40</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite-maven-plugin/src/main/java/software/amazon/awssdk/codegen/lite/maven/plugin/RegionGenerationMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void generateRegionClass(Path baseSourcesDirectory, Partitions partitions
9292
public void generateServiceMetadata(Path baseSourcesDirectory, Partitions partitions) {
9393
Path sourcesDirectory = baseSourcesDirectory.resolve(SERVICE_METADATA_BASE.replace(".", "/"));
9494
Set<String> services = new HashSet<>();
95-
partitions.getPartitions().stream().forEach(p -> services.addAll(p.getServices().keySet()));
95+
partitions.getPartitions().forEach(p -> services.addAll(p.getServices().keySet()));
9696

9797
services.stream()
9898
// Use hardcoded file for elasticache until the incorrect fips endpoint is fixed

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.10.39</version>
9+
<version>2.10.40</version>
1010
</parent>
1111
<artifactId>codegen-lite</artifactId>
1212
<name>AWS Java SDK :: Code Generator Lite</name>

codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataProviderGenerator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ private CodeBlock partitions(Partitions partitions) {
8282
CodeBlock.Builder builder = CodeBlock.builder().add("$T.<String, PartitionMetadata>builder()", ImmutableMap.class);
8383

8484
partitions.getPartitions()
85-
.stream()
8685
.forEach(p -> builder.add(".put($S, new $T())", p.getPartition(), partitionMetadataClass(p.getPartition())));
8786

8887
return builder.add(".build()").build();

codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataProviderGenerator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ private CodeBlock regions(Partitions partitions) {
8383
CodeBlock.Builder builder = CodeBlock.builder().add("$T.<Region, RegionMetadata>builder()", ImmutableMap.class);
8484

8585
partitions.getPartitions()
86-
.stream()
8786
.forEach(p -> p.getRegions()
8887
.keySet()
8988
.forEach(r -> builder.add(".put(Region.$L, new $T())", regionClass(r), regionMetadataClass(r))));

codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataGenerator.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ private CodeBlock serviceEndpoints(Partitions partitions) {
131131
CodeBlock.Builder builder = CodeBlock.builder().add("$T.<String, String>builder()", ImmutableMap.class);
132132

133133
services.entrySet()
134-
.stream()
135134
.forEach(s -> s.getValue().getEndpoints()
136135
.entrySet()
137136
.stream()
@@ -173,7 +172,6 @@ private CodeBlock signingRegionOverrides(Partitions partitions) {
173172
CodeBlock.Builder builder = CodeBlock.builder().add("$T.<String, String>builder()", ImmutableMap.class);
174173

175174
serviceData.entrySet()
176-
.stream()
177175
.forEach(s -> s.getValue().getEndpoints()
178176
.entrySet()
179177
.stream()
@@ -225,7 +223,6 @@ private Map<Partition, Service> getServiceData(Partitions partitions) {
225223
Map<Partition, Service> serviceData = new TreeMap<>(Comparator.comparing(Partition::getPartition));
226224

227225
partitions.getPartitions()
228-
.stream()
229226
.forEach(p -> p.getServices()
230227
.entrySet()
231228
.stream()

codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataProviderGenerator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,8 @@ private CodeBlock regions(Partitions partitions) {
8686
Set<String> seenServices = new HashSet<>();
8787

8888
partitions.getPartitions()
89-
.stream()
9089
.forEach(p -> p.getServices()
9190
.keySet()
92-
.stream()
9391
.forEach(s -> {
9492
if (!seenServices.contains(s)) {
9593
builder.add(".put($S, new $T())", s, serviceMetadataClass(s));

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

codegen/src/main/java/software/amazon/awssdk/codegen/AddEmptyInputShape.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private Map<String, ShapeModel> addEmptyInputShapes(
5454
Map<String, OperationModel> javaOperationMap) {
5555
Map<String, Operation> operations = serviceModel.getOperations();
5656

57-
Map<String, ShapeModel> emptyInputShapes = new HashMap<String, ShapeModel>();
57+
Map<String, ShapeModel> emptyInputShapes = new HashMap<>();
5858

5959
for (Map.Entry<String, Operation> entry : operations.entrySet()) {
6060
String operationName = entry.getKey();

codegen/src/main/java/software/amazon/awssdk/codegen/AddExceptionShapes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public Map<String, ShapeModel> process(Map<String, OperationModel> currentOperat
4242

4343
private Map<String, ShapeModel> constructExceptionShapes() {
4444
// Java shape models, to be constructed
45-
Map<String, ShapeModel> javaShapes = new HashMap<String, ShapeModel>();
45+
Map<String, ShapeModel> javaShapes = new HashMap<>();
4646

4747
for (Map.Entry<String, Shape> shape : getServiceModel().getShapes().entrySet()) {
4848
if (shape.getValue().isException()) {

codegen/src/main/java/software/amazon/awssdk/codegen/AddInputShapes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public Map<String, ShapeModel> process(Map<String, OperationModel> currentOperat
4343

4444
private Map<String, ShapeModel> constructInputShapes() {
4545
// Java input shape models, to be constructed
46-
Map<String, ShapeModel> javaShapes = new HashMap<String, ShapeModel>();
46+
Map<String, ShapeModel> javaShapes = new HashMap<>();
4747

4848
for (Map.Entry<String, Operation> entry : getServiceModel().getOperations().entrySet()) {
4949

codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private static String getResultShapeName(Operation operation, Map<String, Shape>
143143

144144
public Map<String, OperationModel> constructOperations() {
145145

146-
Map<String, OperationModel> javaOperationModels = new TreeMap<String, OperationModel>();
146+
Map<String, OperationModel> javaOperationModels = new TreeMap<>();
147147
Map<String, Shape> c2jShapes = serviceModel.getShapes();
148148

149149
for (Map.Entry<String, Operation> entry : serviceModel.getOperations().entrySet()) {
@@ -234,6 +234,6 @@ private Integer getHttpStatusCode(ErrorTrait errorTrait) {
234234
}
235235

236236
private boolean isPaginated(Operation op) {
237-
return paginators.keySet().contains(op.getName()) && paginators.get(op.getName()).isValid();
237+
return paginators.containsKey(op.getName()) && paginators.get(op.getName()).isValid();
238238
}
239239
}

codegen/src/main/java/software/amazon/awssdk/codegen/AddOutputShapes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private Map<String, ShapeModel> constructOutputShapes() {
4747
Map<String, Shape> c2jShapes = getServiceModel().getShapes();
4848

4949
// Java shape models, to be constructed
50-
Map<String, ShapeModel> javaShapes = new HashMap<String, ShapeModel>();
50+
Map<String, ShapeModel> javaShapes = new HashMap<>();
5151

5252
for (Map.Entry<String, Operation> entry : operations.entrySet()) {
5353

codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,11 @@ public IntermediateModel build() {
100100

101101
customization.preprocess(service);
102102

103-
Map<String, OperationModel> operations = new TreeMap<>();
104103
Map<String, ShapeModel> shapes = new HashMap<>();
105-
Map<String, AuthorizerModel> authorizers = new HashMap<>();
106104

107-
operations.putAll(new AddOperations(this).constructOperations());
108-
authorizers.putAll(new AddCustomAuthorizers(this.service, getNamingStrategy()).constructAuthorizers());
105+
Map<String, OperationModel> operations = new TreeMap<>(new AddOperations(this).constructOperations());
106+
Map<String, AuthorizerModel> authorizers =
107+
new HashMap<>(new AddCustomAuthorizers(this.service, getNamingStrategy()).constructAuthorizers());
109108

110109
OperationModel endpointOperation = null;
111110

codegen/src/main/java/software/amazon/awssdk/codegen/RemoveUnusedShapes.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private RemoveUnusedShapes() {
4040

4141
public static Map<String, ShapeModel> removeUnusedShapes(IntermediateModel model) {
4242

43-
Map<String, ShapeModel> out = new HashMap<String, ShapeModel>();
43+
Map<String, ShapeModel> out = new HashMap<>();
4444
Map<String, ShapeModel> in = model.getShapes();
4545

4646
for (OperationModel opModel : model.getOperations().values()) {
@@ -114,20 +114,20 @@ private static void addShapeAndMembers(String shapeName,
114114
private static List<String> resolveMemberShapes(MemberModel member) {
115115

116116
if (member == null) {
117-
return new LinkedList<String>();
117+
return new LinkedList<>();
118118
}
119119
if (member.getEnumType() != null) {
120120
return Collections.singletonList(member.getEnumType());
121121
} else if (member.isList()) {
122122
return resolveMemberShapes(member.getListModel().getListMemberModel());
123123
} else if (member.isMap()) {
124-
List<String> memberShapes = new LinkedList<String>();
124+
List<String> memberShapes = new LinkedList<>();
125125
memberShapes.addAll(resolveMemberShapes(member.getMapModel().getKeyModel()));
126126
memberShapes.addAll(resolveMemberShapes(member.getMapModel().getValueModel()));
127127
return memberShapes;
128128
} else if (member.isSimple()) {
129129
// member is scalar, do nothing
130-
return new LinkedList<String>();
130+
return new LinkedList<>();
131131
} else {
132132
// member is a structure.
133133
return Collections.singletonList(member.getVariable().getSimpleType());

0 commit comments

Comments
 (0)