Skip to content

Commit 5bd6447

Browse files
Merge pull request #2412 from aws/staging/412e4cbd-0702-4fc1-8e12-16677182904c
Pull request: release <- staging/412e4cbd-0702-4fc1-8e12-16677182904c
2 parents c8a7880 + fd96d25 commit 5bd6447

File tree

443 files changed

+3610
-5172
lines changed

Some content is hidden

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

443 files changed

+3610
-5172
lines changed

.changes/2.20.20.json

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"version": "2.20.20",
3+
"date": "2023-03-08",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS Elemental MediaPackage",
8+
"contributor": "",
9+
"description": "This release provides the date and time live resources were created."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Elemental MediaPackage VOD",
14+
"contributor": "",
15+
"description": "This release provides the date and time VOD resources were created."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Lake Formation",
20+
"contributor": "",
21+
"description": "This release adds two new API support \"GetDataCellsFiler\" and \"UpdateDataCellsFilter\", and also updates the corresponding documentation."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Athena",
26+
"contributor": "",
27+
"description": "A new field SubstatementType is added to GetQueryExecution API, so customers have an error free way to detect the query type and interpret the result."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon DynamoDB",
32+
"contributor": "",
33+
"description": "Adds deletion protection support to DynamoDB tables. Tables with deletion protection enabled cannot be deleted. Deletion protection is disabled by default, can be enabled via the CreateTable or UpdateTable APIs, and is visible in TableDescription. This setting is not replicated for Global Tables."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon Elastic Compute Cloud",
38+
"contributor": "",
39+
"description": "Introducing Amazon EC2 C7g, M7g and R7g instances, powered by the latest generation AWS Graviton3 processors and deliver up to 25% better performance over Graviton2-based instances."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Amazon Route 53 Resolver",
44+
"contributor": "",
45+
"description": "Add dual-stack and IPv6 support for Route 53 Resolver Endpoint,Add IPv6 target IP in Route 53 Resolver Forwarding Rule"
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon S3",
50+
"contributor": "",
51+
"description": "Adding PartType field to UploadPartRequest to indicate whether the part is the last part or not."
52+
},
53+
{
54+
"type": "feature",
55+
"category": "Amazon SageMaker Service",
56+
"contributor": "",
57+
"description": "There needs to be a user identity to specify the SageMaker user who perform each action regarding the entity. However, these is a not a unified concept of user identity across SageMaker service that could be used today."
58+
},
59+
{
60+
"type": "feature",
61+
"category": "AWS SDK for Java v2",
62+
"contributor": "",
63+
"description": "Updated endpoint and partition metadata."
64+
}
65+
]
66+
}

CHANGELOG.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
# __2.20.20__ __2023-03-08__
2+
## __AWS Elemental MediaPackage__
3+
- ### Features
4+
- This release provides the date and time live resources were created.
5+
6+
## __AWS Elemental MediaPackage VOD__
7+
- ### Features
8+
- This release provides the date and time VOD resources were created.
9+
10+
## __AWS Lake Formation__
11+
- ### Features
12+
- This release adds two new API support "GetDataCellsFiler" and "UpdateDataCellsFilter", and also updates the corresponding documentation.
13+
14+
## __AWS SDK for Java v2__
15+
- ### Features
16+
- Updated endpoint and partition metadata.
17+
18+
## __Amazon Athena__
19+
- ### Features
20+
- A new field SubstatementType is added to GetQueryExecution API, so customers have an error free way to detect the query type and interpret the result.
21+
22+
## __Amazon DynamoDB__
23+
- ### Features
24+
- Adds deletion protection support to DynamoDB tables. Tables with deletion protection enabled cannot be deleted. Deletion protection is disabled by default, can be enabled via the CreateTable or UpdateTable APIs, and is visible in TableDescription. This setting is not replicated for Global Tables.
25+
26+
## __Amazon Elastic Compute Cloud__
27+
- ### Features
28+
- Introducing Amazon EC2 C7g, M7g and R7g instances, powered by the latest generation AWS Graviton3 processors and deliver up to 25% better performance over Graviton2-based instances.
29+
30+
## __Amazon Route 53 Resolver__
31+
- ### Features
32+
- Add dual-stack and IPv6 support for Route 53 Resolver Endpoint,Add IPv6 target IP in Route 53 Resolver Forwarding Rule
33+
34+
## __Amazon S3__
35+
- ### Features
36+
- Adding PartType field to UploadPartRequest to indicate whether the part is the last part or not.
37+
38+
## __Amazon SageMaker Service__
39+
- ### Features
40+
- There needs to be a user identity to specify the SageMaker user who perform each action regarding the entity. However, these is a not a unified concept of user identity across SageMaker service that could be used today.
41+
142
# __2.20.19__ __2023-03-07__
243
## __AWS Database Migration Service__
344
- ### 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.19</version>
55+
<version>2.20.20</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.19</version>
89+
<version>2.20.20</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.20.19</version>
94+
<version>2.20.20</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.19</version>
106+
<version>2.20.20</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.19</version>
23+
<version>2.20.20</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.19</version>
23+
<version>2.20.20</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.19</version>
23+
<version>2.20.20</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.19</version>
23+
<version>2.20.20</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.19</version>
20+
<version>2.20.20</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.19</version>
23+
<version>2.20.20</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.19</version>
20+
<version>2.20.20</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.19</version>
24+
<version>2.20.20</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.19</version>
25+
<version>2.20.20</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.19</version>
24+
<version>2.20.20</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.19</version>
25+
<version>2.20.20</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.19</version>
24+
<version>2.20.20</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
194194
memberModel.setUnionEnumTypeName(namingStrategy.getUnionEnumTypeName(memberModel));
195195
memberModel.setContextParam(c2jMemberDefinition.getContextParam());
196196
memberModel.setRequired(isRequiredMember(c2jMemberName, parentShape));
197+
memberModel.setSynthetic(shape.isSynthetic());
197198

198199

199200
// Pass the xmlNameSpace from the member reference
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.awssdk.codegen.customization.processors;
17+
18+
import java.util.Map;
19+
import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
20+
import software.amazon.awssdk.codegen.model.config.customization.CustomSdkShapes;
21+
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
22+
import software.amazon.awssdk.codegen.model.service.ServiceModel;
23+
import software.amazon.awssdk.codegen.model.service.Shape;
24+
25+
public class CustomSdkShapesProcessor implements CodegenCustomizationProcessor {
26+
27+
private final CustomSdkShapes customSdkShapes;
28+
29+
CustomSdkShapesProcessor(CustomSdkShapes customSdkShapes) {
30+
this.customSdkShapes = customSdkShapes;
31+
}
32+
33+
@Override
34+
public void preprocess(ServiceModel serviceModel) {
35+
if (customSdkShapes == null) {
36+
return;
37+
}
38+
Map<String, Shape> shapes = serviceModel.getShapes();
39+
customSdkShapes.getShapes().forEach((shapeName, shape) -> {
40+
shape.setSynthetic(true);
41+
shapes.put(shapeName, shape);
42+
});
43+
serviceModel.setShapes(shapes);
44+
}
45+
46+
@Override
47+
public void postprocess(IntermediateModel intermediateModel) {
48+
// added custom shapes in service model instead of intermediate model
49+
}
50+
}

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/DefaultCustomizationProcessor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public static CodegenCustomizationProcessor getProcessorFor(
3232
new RenameShapesProcessor(config.getRenameShapes()),
3333
new ShapeModifiersProcessor(config.getShapeModifiers()),
3434
new ShapeSubstitutionsProcessor(config.getShapeSubstitutions()),
35+
new CustomSdkShapesProcessor(config.getCustomSdkShapes()),
3536
new OperationModifiersProcessor(config.getOperationModifiers()),
3637
new RemoveExceptionMessagePropertyProcessor(),
3738
new UseLegacyEventGenerationSchemeProcessor(),
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.awssdk.codegen.model.config.customization;
17+
18+
import java.util.Collections;
19+
import java.util.Map;
20+
import software.amazon.awssdk.codegen.model.service.Shape;
21+
22+
public class CustomSdkShapes {
23+
private Map<String, Shape> shapes;
24+
25+
public Map<String, Shape> getShapes() {
26+
return shapes;
27+
}
28+
29+
public void setShapes(Map<String, Shape> shapes) {
30+
this.shapes = shapes != null ? Collections.unmodifiableMap(shapes) : Collections.emptyMap();
31+
}
32+
33+
public Shape getShape(String shapeName) {
34+
return shapes.get(shapeName);
35+
}
36+
}

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public class CustomizationConfig {
5555
*/
5656
private Map<String, OperationModifier> operationModifiers;
5757
private Map<String, ShapeSubstitution> shapeSubstitutions;
58+
private CustomSdkShapes customSdkShapes;
5859
private Map<String, ShapeModifier> shapeModifiers;
5960
/**
6061
* Sets the custom field name that identifies the type of modeled exception for JSON protocols.
@@ -253,6 +254,14 @@ public void setRenameShapes(Map<String, String> renameShapes) {
253254
this.renameShapes = renameShapes;
254255
}
255256

257+
public CustomSdkShapes getCustomSdkShapes() {
258+
return customSdkShapes;
259+
}
260+
261+
public void setCustomSdkShapes(CustomSdkShapes customSdkShapes) {
262+
this.customSdkShapes = customSdkShapes;
263+
}
264+
256265
public Map<String, ShapeSubstitution> getShapeSubstitutions() {
257266
return shapeSubstitutions;
258267
}

0 commit comments

Comments
 (0)