Skip to content

Commit b59d7c2

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1604 from aws/staging/affd8226-2205-4691-9df6-309c4e09658a
Pull request: release <- staging/affd8226-2205-4691-9df6-309c4e09658a
2 parents 1656150 + 969746f commit b59d7c2

File tree

354 files changed

+873
-486
lines changed

Some content is hidden

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

354 files changed

+873
-486
lines changed

‎.changes/2.17.18.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"version": "2.17.18",
3+
"date": "2021-08-12",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "",
9+
"description": "Fixed an issue where request-level overrides (e.g. credentials) were not applied to endpoint discovery calls."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS SDK for Java v2",
14+
"contributor": "",
15+
"description": "Updated service endpoint metadata."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Lambda",
20+
"contributor": "",
21+
"description": "Lambda Python 3.9 runtime launch"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS Glue DataBrew",
26+
"contributor": "",
27+
"description": "This SDK release adds support for the output of a recipe job results to Tableau Hyper format."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AmazonApiGatewayV2",
32+
"contributor": "",
33+
"description": "Adding support for ACM imported or private CA certificates for mTLS enabled domain names"
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon API Gateway",
38+
"contributor": "",
39+
"description": "Adding support for ACM imported or private CA certificates for mTLS enabled domain names"
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Amazon SageMaker Service",
44+
"contributor": "",
45+
"description": "Amazon SageMaker Autopilot adds new metrics for all candidate models generated by Autopilot experiments."
46+
}
47+
]
48+
}

‎CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
# __2.17.18__ __2021-08-12__
2+
## __AWS Glue DataBrew__
3+
- ### Features
4+
- This SDK release adds support for the output of a recipe job results to Tableau Hyper format.
5+
6+
## __AWS Lambda__
7+
- ### Features
8+
- Lambda Python 3.9 runtime launch
9+
10+
## __AWS SDK for Java v2__
11+
- ### Features
12+
- Updated service endpoint metadata.
13+
14+
- ### Bugfixes
15+
- Fixed an issue where request-level overrides (e.g. credentials) were not applied to endpoint discovery calls.
16+
17+
## __Amazon API Gateway__
18+
- ### Features
19+
- Adding support for ACM imported or private CA certificates for mTLS enabled domain names
20+
21+
## __Amazon SageMaker Service__
22+
- ### Features
23+
- Amazon SageMaker Autopilot adds new metrics for all candidate models generated by Autopilot experiments.
24+
25+
## __AmazonApiGatewayV2__
26+
- ### Features
27+
- Adding support for ACM imported or private CA certificates for mTLS enabled domain names
28+
129
# __2.17.17__ __2021-08-11__
230
## __AWS CodeBuild__
331
- ### 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.17</version>
55+
<version>2.17.18</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.17</version>
89+
<version>2.17.18</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.17</version>
94+
<version>2.17.18</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.17</version>
106+
<version>2.17.18</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.17</version>
23+
<version>2.17.18</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.17</version>
23+
<version>2.17.18</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.17</version>
23+
<version>2.17.18</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.17</version>
23+
<version>2.17.18</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.17.17</version>
20+
<version>2.17.18</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.17.17</version>
23+
<version>2.17.18</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.17.17</version>
20+
<version>2.17.18</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.17.17</version>
24+
<version>2.17.18</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.17</version>
25+
<version>2.17.18</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.17</version>
24+
<version>2.17.18</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.17</version>
25+
<version>2.17.18</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.17</version>
24+
<version>2.17.18</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.slf4j.LoggerFactory;
4646
import software.amazon.awssdk.annotations.SdkInternalApi;
4747
import software.amazon.awssdk.auth.signer.AsyncAws4Signer;
48+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
4849
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
4950
import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
5051
import software.amazon.awssdk.awscore.client.handler.AwsClientHandlerUtils;
@@ -286,15 +287,20 @@ protected MethodSpec.Builder operationBody(MethodSpec.Builder builder, Operation
286287

287288
builder.addStatement("$T cachedEndpoint = null", URI.class);
288289
builder.beginControlFlow("if (endpointDiscoveryEnabled)");
289-
builder.addStatement("\n\nString key = clientConfiguration.option($T.CREDENTIALS_PROVIDER).resolveCredentials()" +
290-
".accessKeyId()", AwsClientOption.class);
291-
builder.addStatement("EndpointDiscoveryRequest endpointDiscoveryRequest = $T.builder().required($L)" +
292-
".defaultEndpoint(clientConfiguration.option($T.ENDPOINT)).build()",
293-
EndpointDiscoveryRequest.class,
294-
opModel.getInputShape().getEndpointDiscovery().isRequired(),
295-
SdkClientOption.class);
296-
builder.addStatement("cachedEndpoint = $L.get(key, endpointDiscoveryRequest)",
297-
"endpointDiscoveryCache");
290+
291+
builder.addCode("$T key = $N.overrideConfiguration()", String.class, opModel.getInput().getVariableName())
292+
.addCode(" .flatMap($T::credentialsProvider)", AwsRequestOverrideConfiguration.class)
293+
.addCode(" .orElseGet(() -> clientConfiguration.option($T.CREDENTIALS_PROVIDER))", AwsClientOption.class)
294+
.addCode(" .resolveCredentials().accessKeyId();");
295+
296+
builder.addCode("$1T endpointDiscoveryRequest = $1T.builder()", EndpointDiscoveryRequest.class)
297+
.addCode(" .required($L)", opModel.getInputShape().getEndpointDiscovery().isRequired())
298+
.addCode(" .defaultEndpoint(clientConfiguration.option($T.ENDPOINT))", SdkClientOption.class)
299+
.addCode(" .overrideConfiguration($N.overrideConfiguration().orElse(null))",
300+
opModel.getInput().getVariableName())
301+
.addCode(" .build();");
302+
303+
builder.addStatement("cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest)");
298304
builder.endControlFlow();
299305
}
300306

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.util.stream.Collectors;
3636
import javax.lang.model.element.Modifier;
3737
import software.amazon.awssdk.annotations.SdkInternalApi;
38+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
3839
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
3940
import software.amazon.awssdk.codegen.docs.SimpleMethodOverload;
4041
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
@@ -235,15 +236,20 @@ private List<MethodSpec> operationMethodSpecs(OperationModel opModel) {
235236

236237
method.addStatement("$T cachedEndpoint = null", URI.class);
237238
method.beginControlFlow("if (endpointDiscoveryEnabled)");
238-
method.addStatement("\n\nString key = clientConfiguration.option($T.CREDENTIALS_PROVIDER)." +
239-
"resolveCredentials().accessKeyId()", AwsClientOption.class);
240-
method.addStatement("EndpointDiscoveryRequest endpointDiscoveryRequest = $T.builder().required($L)" +
241-
".defaultEndpoint(clientConfiguration.option($T.ENDPOINT)).build()",
242-
EndpointDiscoveryRequest.class,
243-
opModel.getInputShape().getEndpointDiscovery().isRequired(),
244-
SdkClientOption.class);
245-
method.addStatement("cachedEndpoint = $L.get(key, endpointDiscoveryRequest)",
246-
"endpointDiscoveryCache");
239+
240+
method.addCode("$T key = $N.overrideConfiguration()", String.class, opModel.getInput().getVariableName())
241+
.addCode(" .flatMap($T::credentialsProvider)", AwsRequestOverrideConfiguration.class)
242+
.addCode(" .orElseGet(() -> clientConfiguration.option($T.CREDENTIALS_PROVIDER))", AwsClientOption.class)
243+
.addCode(" .resolveCredentials().accessKeyId();");
244+
245+
method.addCode("$1T endpointDiscoveryRequest = $1T.builder()", EndpointDiscoveryRequest.class)
246+
.addCode(" .required($L)", opModel.getInputShape().getEndpointDiscovery().isRequired())
247+
.addCode(" .defaultEndpoint(clientConfiguration.option($T.ENDPOINT))", SdkClientOption.class)
248+
.addCode(" .overrideConfiguration($N.overrideConfiguration().orElse(null))",
249+
opModel.getInput().getVariableName())
250+
.addCode(" .build();");
251+
252+
method.addStatement("cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest)");
247253
method.endControlFlow();
248254
}
249255

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.List;
3131
import java.util.concurrent.CompletableFuture;
3232
import software.amazon.awssdk.annotations.SdkInternalApi;
33+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
3334
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
3435
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
3536
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
@@ -103,7 +104,9 @@ private MethodSpec discoverEndpoint(OperationModel opModel) {
103104

104105
if (!opModel.getInputShape().isHasHeaderMember()) {
105106
ClassName endpointClass = poetExtensions.getModelClass("Endpoint");
106-
methodBuilder.addCode("return $L.$L($L.builder().build()).thenApply(r -> {",
107+
methodBuilder.addStatement("$1T requestConfig = $1T.from(endpointDiscoveryRequest.overrideConfiguration()"
108+
+ ".orElse(null))", AwsRequestOverrideConfiguration.class)
109+
.addCode("return $L.$L($L.builder().overrideConfiguration(requestConfig).build()).thenApply(r -> {",
107110
CLIENT_FIELD,
108111
opModel.getMethodName(),
109112
poetExtensions.getModelClass(opModel.getInputShape().getC2jName()))

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.List;
3131
import java.util.concurrent.CompletableFuture;
3232
import software.amazon.awssdk.annotations.SdkInternalApi;
33+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
3334
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
3435
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
3536
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
@@ -105,7 +106,9 @@ private MethodSpec discoverEndpoint(OperationModel opModel) {
105106
if (!opModel.getInputShape().isHasHeaderMember()) {
106107
ClassName endpointClass = poetExtensions.getModelClass("Endpoint");
107108
methodBuilder.addCode("return $T.supplyAsync(() -> {", CompletableFuture.class)
108-
.addStatement("$T response = $L.$L($L.builder().build())",
109+
.addStatement("$1T requestConfig = $1T.from(endpointDiscoveryRequest.overrideConfiguration()"
110+
+ ".orElse(null))", AwsRequestOverrideConfiguration.class)
111+
.addStatement("$T response = $L.$L($L.builder().overrideConfiguration(requestConfig).build())",
109112
poetExtensions.getModelClass(opModel.getOutputShape().getC2jName()),
110113
CLIENT_FIELD,
111114
opModel.getMethodName(),

0 commit comments

Comments
 (0)