Skip to content

Commit faaef83

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1880 from aws/staging/51e464f1-5861-4476-84bd-52e0ba17fee9
Pull request: release <- staging/51e464f1-5861-4476-84bd-52e0ba17fee9
2 parents 2113b11 + 8cdbeb0 commit faaef83

File tree

450 files changed

+5438
-757
lines changed

Some content is hidden

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

450 files changed

+5438
-757
lines changed

‎.changes/2.17.101.json

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{
2+
"version": "2.17.101",
3+
"date": "2021-12-20",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Location Service",
8+
"contributor": "",
9+
"description": "Making PricingPlan optional as part of create resource API."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS DataSync",
14+
"contributor": "",
15+
"description": "AWS DataSync now supports FSx Lustre Locations."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS SecurityHub",
20+
"contributor": "",
21+
"description": "Added new resource details objects to ASFF, including resources for Firewall, and RuleGroup, FirewallPolicy Added additional details for AutoScalingGroup, LaunchConfiguration, and S3 buckets."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Netty NIO HTTP Client",
26+
"contributor": "",
27+
"description": "If `tlsNegotiationTimeout` is not configured, it will be set to the resolved `connectionTimeout`. By default, `tlsNegotiationTimeout` is now 2s instead of 10s"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS SDK for Java v2",
32+
"contributor": "",
33+
"description": "Updated SDK default configurations."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon DevOps Guru",
38+
"contributor": "",
39+
"description": "Adds Tags support to DescribeOrganizationResourceCollectionHealth"
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Amazon SageMaker Service",
44+
"contributor": "",
45+
"description": "This release adds a new ContentType field in AutoMLChannel for SageMaker CreateAutoMLJob InputDataConfig."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon Redshift",
50+
"contributor": "",
51+
"description": "This release adds API support for managed Redshift datashares. Customers can now interact with a Redshift datashare that is managed by a different service, such as AWS Data Exchange."
52+
},
53+
{
54+
"type": "feature",
55+
"category": "Metrics",
56+
"contributor": "",
57+
"description": "Add pretty-format support to LoggingMetricPublisher"
58+
},
59+
{
60+
"type": "feature",
61+
"category": "AWS SDK for Java v2",
62+
"contributor": "",
63+
"description": "Updated service endpoint metadata."
64+
},
65+
{
66+
"type": "feature",
67+
"category": "EC2 Image Builder",
68+
"contributor": "",
69+
"description": "This release adds support for importing and exporting VM Images as part of the Image Creation workflow via EC2 VM Import/Export."
70+
},
71+
{
72+
"type": "feature",
73+
"category": "Amazon API Gateway",
74+
"contributor": "",
75+
"description": "Documentation updates for Amazon API Gateway"
76+
},
77+
{
78+
"type": "feature",
79+
"category": "Amazon Connect Customer Profiles",
80+
"contributor": "",
81+
"description": "This release adds an optional parameter, ObjectTypeNames to the PutIntegration API to support multiple object types per integration option. Besides, this release introduces Standard Order Objects which contain data from third party systems and each order object belongs to a specific profile."
82+
},
83+
{
84+
"type": "feature",
85+
"category": "Amazon Forecast Service",
86+
"contributor": "",
87+
"description": "Adds ForecastDimensions field to the DescribeAutoPredictorResponse"
88+
},
89+
{
90+
"type": "feature",
91+
"category": "FinSpace Public API",
92+
"contributor": "",
93+
"description": "Make dataset description optional and allow s3 export for dataviews"
94+
},
95+
{
96+
"type": "bugfix",
97+
"category": "Netty NIO HTTP Client",
98+
"contributor": "",
99+
"description": "Ensure in-use channels are not incorrectly closed"
100+
},
101+
{
102+
"type": "feature",
103+
"category": "AWS SDK for Java v2",
104+
"contributor": "",
105+
"description": "Introduce a defaults mode configuration that determines how certain default configuration options are resolved in the SDK. See `DefaultsMode` for more information."
106+
},
107+
{
108+
"type": "feature",
109+
"category": "Apache HTTP Client",
110+
"contributor": "",
111+
"description": "Add \"ConcurrencyAcquireDuration\" metric for apache-client"
112+
}
113+
]
114+
}

‎.idea/codeStyles/Project.xml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md

+66
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,69 @@
1+
# __2.17.101__ __2021-12-20__
2+
## __AWS DataSync__
3+
- ### Features
4+
- AWS DataSync now supports FSx Lustre Locations.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Introduce a defaults mode configuration that determines how certain default configuration options are resolved in the SDK. See `DefaultsMode` for more information.
9+
- Updated SDK default configurations.
10+
- Updated service endpoint metadata.
11+
12+
## __AWS SecurityHub__
13+
- ### Features
14+
- Added new resource details objects to ASFF, including resources for Firewall, and RuleGroup, FirewallPolicy Added additional details for AutoScalingGroup, LaunchConfiguration, and S3 buckets.
15+
16+
## __Amazon API Gateway__
17+
- ### Features
18+
- Documentation updates for Amazon API Gateway
19+
20+
## __Amazon Connect Customer Profiles__
21+
- ### Features
22+
- This release adds an optional parameter, ObjectTypeNames to the PutIntegration API to support multiple object types per integration option. Besides, this release introduces Standard Order Objects which contain data from third party systems and each order object belongs to a specific profile.
23+
24+
## __Amazon DevOps Guru__
25+
- ### Features
26+
- Adds Tags support to DescribeOrganizationResourceCollectionHealth
27+
28+
## __Amazon Forecast Service__
29+
- ### Features
30+
- Adds ForecastDimensions field to the DescribeAutoPredictorResponse
31+
32+
## __Amazon Location Service__
33+
- ### Features
34+
- Making PricingPlan optional as part of create resource API.
35+
36+
## __Amazon Redshift__
37+
- ### Features
38+
- This release adds API support for managed Redshift datashares. Customers can now interact with a Redshift datashare that is managed by a different service, such as AWS Data Exchange.
39+
40+
## __Amazon SageMaker Service__
41+
- ### Features
42+
- This release adds a new ContentType field in AutoMLChannel for SageMaker CreateAutoMLJob InputDataConfig.
43+
44+
## __Apache HTTP Client__
45+
- ### Features
46+
- Add "ConcurrencyAcquireDuration" metric for apache-client
47+
48+
## __EC2 Image Builder__
49+
- ### Features
50+
- This release adds support for importing and exporting VM Images as part of the Image Creation workflow via EC2 VM Import/Export.
51+
52+
## __FinSpace Public API__
53+
- ### Features
54+
- Make dataset description optional and allow s3 export for dataviews
55+
56+
## __Metrics__
57+
- ### Features
58+
- Add pretty-format support to LoggingMetricPublisher
59+
60+
## __Netty NIO HTTP Client__
61+
- ### Features
62+
- If `tlsNegotiationTimeout` is not configured, it will be set to the resolved `connectionTimeout`. By default, `tlsNegotiationTimeout` is now 2s instead of 10s
63+
64+
- ### Bugfixes
65+
- Ensure in-use channels are not incorrectly closed
66+
167
# __2.17.100__ __2021-12-13__
268
## __AWS SDK for Java v2__
369
- ### Features

‎README.md

+4-4
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.100</version>
55+
<version>2.17.101</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.100</version>
89+
<version>2.17.101</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.100</version>
94+
<version>2.17.101</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.100</version>
106+
<version>2.17.101</version>
107107
</dependency>
108108
```
109109

‎archetypes/archetype-app-quickstart/pom.xml

+1-1
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.100</version>
23+
<version>2.17.101</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/archetype-lambda/pom.xml

+1-1
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.100</version>
23+
<version>2.17.101</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/pom.xml

+1-1
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.100</version>
23+
<version>2.17.101</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/pom.xml

+1-1
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.100</version>
23+
<version>2.17.101</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

+1-1
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.100</version>
20+
<version>2.17.101</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

+1-1
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.100</version>
23+
<version>2.17.101</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

+1-1
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.100</version>
20+
<version>2.17.101</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎bundle/pom.xml

+1-1
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.100</version>
24+
<version>2.17.101</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

+1-1
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.100</version>
25+
<version>2.17.101</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

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

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
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.lite.maven.plugin;
17+
18+
import java.io.File;
19+
import java.nio.file.Path;
20+
import java.nio.file.Paths;
21+
import org.apache.maven.plugin.AbstractMojo;
22+
import org.apache.maven.plugins.annotations.Mojo;
23+
import org.apache.maven.plugins.annotations.Parameter;
24+
import org.apache.maven.project.MavenProject;
25+
import software.amazon.awssdk.codegen.lite.CodeGenerator;
26+
import software.amazon.awssdk.codegen.lite.defaultsmode.DefaultConfiguration;
27+
import software.amazon.awssdk.codegen.lite.defaultsmode.DefaultsLoader;
28+
import software.amazon.awssdk.codegen.lite.defaultsmode.DefaultsModeConfigurationGenerator;
29+
import software.amazon.awssdk.codegen.lite.defaultsmode.DefaultsModeGenerator;
30+
31+
/**
32+
* The Maven mojo to generate defaults mode related classes.
33+
*/
34+
@Mojo(name = "generate-defaults-mode")
35+
public class DefaultsModeGenerationMojo extends AbstractMojo {
36+
37+
private static final String DEFAULTS_MODE_BASE = "software.amazon.awssdk.awscore.defaultsmode";
38+
private static final String DEFAULTS_MODE_CONFIGURATION_BASE = "software.amazon.awssdk.awscore.internal.defaultsmode";
39+
40+
@Parameter(property = "outputDirectory", defaultValue = "${project.build.directory}")
41+
private String outputDirectory;
42+
43+
@Parameter(defaultValue = "${project}", readonly = true)
44+
private MavenProject project;
45+
46+
@Parameter(property = "defaultConfigurationFile", defaultValue =
47+
"${basedir}/src/main/resources/software/amazon/awssdk/awscore/internal/defaults/sdk-default-configuration.json")
48+
private File defaultConfigurationFile;
49+
50+
public void execute() {
51+
Path baseSourcesDirectory = Paths.get(outputDirectory).resolve("generated-sources").resolve("sdk");
52+
Path testsDirectory = Paths.get(outputDirectory).resolve("generated-test-sources").resolve("sdk-tests");
53+
54+
DefaultConfiguration configuration = DefaultsLoader.load(defaultConfigurationFile);
55+
56+
generateDefaultsModeClass(baseSourcesDirectory, configuration);
57+
generateDefaultsModeConfiguartionClass(baseSourcesDirectory, configuration);
58+
59+
project.addCompileSourceRoot(baseSourcesDirectory.toFile().getAbsolutePath());
60+
project.addTestCompileSourceRoot(testsDirectory.toFile().getAbsolutePath());
61+
}
62+
63+
public void generateDefaultsModeClass(Path baseSourcesDirectory, DefaultConfiguration configuration) {
64+
Path sourcesDirectory = baseSourcesDirectory.resolve(DEFAULTS_MODE_BASE.replace(".", "/"));
65+
new CodeGenerator(sourcesDirectory.toString(), new DefaultsModeGenerator(DEFAULTS_MODE_BASE, configuration)).generate();
66+
}
67+
68+
public void generateDefaultsModeConfiguartionClass(Path baseSourcesDirectory, DefaultConfiguration configuration) {
69+
Path sourcesDirectory = baseSourcesDirectory.resolve(DEFAULTS_MODE_CONFIGURATION_BASE.replace(".", "/"));
70+
new CodeGenerator(sourcesDirectory.toString(), new DefaultsModeConfigurationGenerator(DEFAULTS_MODE_CONFIGURATION_BASE,
71+
DEFAULTS_MODE_BASE,
72+
configuration)).generate();
73+
}
74+
}

0 commit comments

Comments
 (0)