Skip to content

Commit 0316a7a

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1263 from aws/staging/f10bfca3-9009-4e14-a8bd-c849953147b6
Pull request: release <- staging/f10bfca3-9009-4e14-a8bd-c849953147b6
2 parents 44d62b3 + eb417b5 commit 0316a7a

File tree

339 files changed

+1295
-340
lines changed

Some content is hidden

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

339 files changed

+1295
-340
lines changed

‎.changes/2.16.35.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.16.35",
3+
"date": "2021-04-05",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "",
9+
"description": "Expose the metadata key on SDK client interfaces for use with `ServiceMetadataProvider`"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Elemental MediaLive",
14+
"contributor": "",
15+
"description": "MediaLive now support HTML5 Motion Graphics overlay"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon Appflow",
20+
"contributor": "",
21+
"description": "Added destination properties for Zendesk."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": "ndejaco2",
27+
"description": "This feature adds client and request overrides of execution attributes prior to request invocation."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS Audit Manager",
32+
"contributor": "",
33+
"description": "AWS Audit Manager has updated the GetAssessment API operation to include a new response field called userRole. The userRole field indicates the role information and IAM ARN of the API caller."
34+
}
35+
]
36+
}

‎CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
# __2.16.35__ __2021-04-05__
2+
## __AWS Audit Manager__
3+
- ### Features
4+
- AWS Audit Manager has updated the GetAssessment API operation to include a new response field called userRole. The userRole field indicates the role information and IAM ARN of the API caller.
5+
6+
## __AWS Elemental MediaLive__
7+
- ### Features
8+
- MediaLive now support HTML5 Motion Graphics overlay
9+
10+
## __AWS SDK for Java v2__
11+
- ### Features
12+
- This feature adds client and request overrides of execution attributes prior to request invocation.
13+
- Contributed by: [@ndejaco2](https://github.com/ndejaco2)
14+
15+
- ### Bugfixes
16+
- Expose the metadata key on SDK client interfaces for use with `ServiceMetadataProvider`
17+
18+
## __Amazon Appflow__
19+
- ### Features
20+
- Added destination properties for Zendesk.
21+
22+
## __Contributors__
23+
Special thanks to the following contributors to this release:
24+
25+
[@ndejaco2](https://github.com/ndejaco2)
126
# __2.16.34__ __2021-04-02__
227
## __AWS Elemental MediaPackage__
328
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To automatically manage module versions (currently all modules have the same ver
4949
<dependency>
5050
<groupId>software.amazon.awssdk</groupId>
5151
<artifactId>bom</artifactId>
52-
<version>2.16.34</version>
52+
<version>2.16.35</version>
5353
<type>pom</type>
5454
<scope>import</scope>
5555
</dependency>
@@ -83,12 +83,12 @@ Alternatively you can add dependencies for the specific services you use only:
8383
<dependency>
8484
<groupId>software.amazon.awssdk</groupId>
8585
<artifactId>ec2</artifactId>
86-
<version>2.16.34</version>
86+
<version>2.16.35</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.16.34</version>
91+
<version>2.16.35</version>
9292
</dependency>
9393
```
9494

@@ -100,7 +100,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
100100
<dependency>
101101
<groupId>software.amazon.awssdk</groupId>
102102
<artifactId>aws-sdk-java</artifactId>
103-
<version>2.16.34</version>
103+
<version>2.16.35</version>
104104
</dependency>
105105
```
106106

‎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.16.34</version>
23+
<version>2.16.35</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.16.34</version>
23+
<version>2.16.35</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.16.34</version>
23+
<version>2.16.35</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.16.34</version>
23+
<version>2.16.35</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.16.34</version>
20+
<version>2.16.35</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.16.34</version>
23+
<version>2.16.35</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.16.34</version>
20+
<version>2.16.35</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.16.34</version>
24+
<version>2.16.35</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.16.34</version>
25+
<version>2.16.35</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.16.34</version>
24+
<version>2.16.35</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.16.34</version>
25+
<version>2.16.35</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.16.34</version>
24+
<version>2.16.35</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/AsyncClientInterface.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import software.amazon.awssdk.core.SdkClient;
4949
import software.amazon.awssdk.core.async.AsyncRequestBody;
5050
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
51+
import software.amazon.awssdk.regions.ServiceMetadataProvider;
5152
import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
5253

5354
public class AsyncClientInterface implements ClassSpec {
@@ -78,6 +79,12 @@ public TypeSpec poetSpec() {
7879
.addField(FieldSpec.builder(String.class, "SERVICE_NAME")
7980
.addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
8081
.initializer("$S", model.getMetadata().getSigningName())
82+
.build())
83+
.addField(FieldSpec.builder(String.class, "SERVICE_METADATA_ID")
84+
.addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
85+
.initializer("$S", model.getMetadata().getEndpointPrefix())
86+
.addJavadoc("Value for looking up the service's metadata from the {@link $T}.",
87+
ServiceMetadataProvider.class)
8188
.build());
8289

8390
PoetUtils.addJavadoc(result::addJavadoc, getJavadoc());

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import software.amazon.awssdk.core.sync.RequestBody;
5555
import software.amazon.awssdk.core.sync.ResponseTransformer;
5656
import software.amazon.awssdk.regions.ServiceMetadata;
57+
import software.amazon.awssdk.regions.ServiceMetadataProvider;
5758
import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
5859

5960
public final class SyncClientInterface implements ClassSpec {
@@ -78,7 +79,13 @@ public TypeSpec poetSpec() {
7879
.addField(FieldSpec.builder(String.class, "SERVICE_NAME")
7980
.addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
8081
.initializer("$S", model.getMetadata().getSigningName())
81-
.build());
82+
.build())
83+
.addField(FieldSpec.builder(String.class, "SERVICE_METADATA_ID")
84+
.addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
85+
.initializer("$S", model.getMetadata().getEndpointPrefix())
86+
.addJavadoc("Value for looking up the service's metadata from the {@link $T}.",
87+
ServiceMetadataProvider.class)
88+
.build());
8289

8390
PoetUtils.addJavadoc(result::addJavadoc, getJavadoc());
8491

@@ -148,7 +155,7 @@ private MethodSpec serviceMetadata() {
148155
return MethodSpec.methodBuilder("serviceMetadata")
149156
.returns(ServiceMetadata.class)
150157
.addModifiers(Modifier.STATIC, Modifier.PUBLIC)
151-
.addStatement("return $T.of($S)", ServiceMetadata.class, model.getMetadata().getEndpointPrefix())
158+
.addStatement("return $T.of(SERVICE_METADATA_ID)", ServiceMetadata.class)
152159
.build();
153160
}
154161

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
abstract class DefaultJsonBaseClientBuilder<B extends JsonBaseClientBuilder<B, C>, C> extends AwsDefaultClientBuilder<B, C> {
2525
@Override
2626
protected final String serviceEndpointPrefix() {
27-
return "json-service";
27+
return "json-service-endpoint";
2828
}
2929

3030
@Override

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/service-2.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
"version": "2.0",
33
"metadata": {
44
"apiVersion": "2010-05-08",
5-
"endpointPrefix": "json-service",
5+
"endpointPrefix": "json-service-endpoint",
66
"globalEndpoint": "json-service.amazonaws.com",
77
"protocol": "rest-json",
88
"serviceAbbreviation": "Json Service",
99
"serviceFullName": "Some Service That Uses Json Protocol",
10-
"serviceId":"Json Service",
10+
"serviceId": "Json Service",
11+
"signingName": "json-service",
1112
"signatureVersion": "v4",
1213
"uid": "json-service-2010-05-08",
1314
"xmlNamespace": "https://json-service.amazonaws.com/doc/2010-05-08/"

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-interface.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
public interface JsonAsyncClient extends SdkClient {
4848
String SERVICE_NAME = "json-service";
4949

50+
/**
51+
* Value for looking up the service's metadata from the
52+
* {@link software.amazon.awssdk.regions.ServiceMetadataProvider}.
53+
*/
54+
String SERVICE_METADATA_ID = "json-service-endpoint";
55+
5056
/**
5157
* Create a {@link JsonAsyncClient} with the region loaded from the
5258
* {@link software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain} and credentials loaded from the

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-interface.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
public interface JsonClient extends SdkClient {
4444
String SERVICE_NAME = "json-service";
4545

46+
/**
47+
* Value for looking up the service's metadata from the
48+
* {@link software.amazon.awssdk.regions.ServiceMetadataProvider}.
49+
*/
50+
String SERVICE_METADATA_ID = "json-service-endpoint";
51+
4652
/**
4753
* Create a {@link JsonClient} with the region loaded from the
4854
* {@link software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain} and credentials loaded from the
@@ -1358,7 +1364,7 @@ default ResponseBytes<StreamingOutputOperationResponse> streamingOutputOperation
13581364
}
13591365

13601366
static ServiceMetadata serviceMetadata() {
1361-
return ServiceMetadata.of("json-service");
1367+
return ServiceMetadata.of(SERVICE_METADATA_ID);
13621368
}
13631369

13641370
/**

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.16.34</version>
23+
<version>2.16.35</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/arns/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.16.34</version>
23+
<version>2.16.35</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth/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>core</artifactId>
25-
<version>2.16.34</version>
25+
<version>2.16.35</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>

‎core/aws-core/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>core</artifactId>
25-
<version>2.16.34</version>
25+
<version>2.16.35</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsClientHandlerUtils.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.nio.ByteBuffer;
2323
import java.time.Duration;
2424
import java.util.Map;
25+
import java.util.Optional;
2526
import java.util.stream.Collectors;
2627
import software.amazon.awssdk.annotations.SdkProtectedApi;
2728
import software.amazon.awssdk.auth.credentials.AwsCredentials;
@@ -100,6 +101,16 @@ static <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext
100101
.putAttribute(SdkInternalExecutionAttribute.DISABLE_HOST_PREFIX_INJECTION,
101102
clientConfig.option(SdkAdvancedClientOption.DISABLE_HOST_PREFIX_INJECTION));
102103

104+
ExecutionAttributes clientOverrideExecutionAttributes = clientConfig.option(SdkClientOption.EXECUTION_ATTRIBUTES);
105+
if (clientOverrideExecutionAttributes != null) {
106+
executionAttributes = clientOverrideExecutionAttributes.merge(executionAttributes);
107+
}
108+
109+
Optional<? extends RequestOverrideConfiguration> requestOverrideConfiguration = originalRequest.overrideConfiguration();
110+
if (requestOverrideConfiguration.isPresent()) {
111+
executionAttributes = requestOverrideConfiguration.get().executionAttributes().merge(executionAttributes);
112+
}
113+
103114
ExecutionInterceptorChain executionInterceptorChain =
104115
new ExecutionInterceptorChain(clientConfig.option(SdkClientOption.EXECUTION_INTERCEPTORS));
105116
return ExecutionContext.builder()

‎core/metrics-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.16.34</version>
8+
<version>2.16.35</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>aws-sdk-java-pom</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.16.34</version>
24+
<version>2.16.35</version>
2525
</parent>
2626

2727
<artifactId>core</artifactId>

0 commit comments

Comments
 (0)