Skip to content

Commit f96efdf

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2722 from aws/staging/551e8b0f-552e-44c3-b432-14cae862680d
Pull request: release <- staging/551e8b0f-552e-44c3-b432-14cae862680d
2 parents 291442f + b43cd1b commit f96efdf

File tree

492 files changed

+2664
-1054
lines changed

Some content is hidden

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

492 files changed

+2664
-1054
lines changed

‎.changes/2.21.7.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"version": "2.21.7",
3+
"date": "2023-10-24",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS CodePipeline",
8+
"contributor": "",
9+
"description": "Add ability to trigger pipelines from git tags, define variables at pipeline level and new pipeline type V2."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Identity and Access Management",
14+
"contributor": "",
15+
"description": "Add the partitional endpoint for IAM in iso-f."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Migration Hub Config",
20+
"contributor": "",
21+
"description": "This release introduces DeleteHomeRegionControl API that customers can use to delete the Migration Hub Home Region configuration"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Elastic Compute Cloud",
26+
"contributor": "",
27+
"description": "This release updates the documentation for InstanceInterruptionBehavior and HibernationOptionsRequest to more accurately describe the behavior of these two parameters when using Spot hibernation."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Elastic Kubernetes Service",
32+
"contributor": "",
33+
"description": "Added support for Cluster Subnet and Security Group mutability."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Migration Hub Strategy Recommendations",
38+
"contributor": "",
39+
"description": "This release introduces multi-data-source feature in Migration Hub Strategy Recommendations. This feature now supports vCenter as a data source to fetch inventory in addition to ADS and Import from file workflow that is currently supported with MHSR collector."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "OpenSearch Service Serverless",
44+
"contributor": "",
45+
"description": "This release includes the following new APIs: CreateLifecyclePolicy, UpdateLifecyclePolicy, BatchGetLifecyclePolicy, DeleteLifecyclePolicy, ListLifecyclePolicies and BatchGetEffectiveLifecyclePolicy to support the data lifecycle management feature."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "AWS SDK for Java v2",
50+
"contributor": "",
51+
"description": "Updated endpoint and partition metadata."
52+
}
53+
]
54+
}

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
# __2.21.7__ __2023-10-24__
2+
## __AWS CodePipeline__
3+
- ### Features
4+
- Add ability to trigger pipelines from git tags, define variables at pipeline level and new pipeline type V2.
5+
6+
## __AWS Identity and Access Management__
7+
- ### Features
8+
- Add the partitional endpoint for IAM in iso-f.
9+
10+
## __AWS Migration Hub Config__
11+
- ### Features
12+
- This release introduces DeleteHomeRegionControl API that customers can use to delete the Migration Hub Home Region configuration
13+
14+
## __AWS SDK for Java v2__
15+
- ### Features
16+
- Updated endpoint and partition metadata.
17+
18+
## __Amazon Elastic Compute Cloud__
19+
- ### Features
20+
- This release updates the documentation for InstanceInterruptionBehavior and HibernationOptionsRequest to more accurately describe the behavior of these two parameters when using Spot hibernation.
21+
22+
## __Amazon Elastic Kubernetes Service__
23+
- ### Features
24+
- Added support for Cluster Subnet and Security Group mutability.
25+
26+
## __Migration Hub Strategy Recommendations__
27+
- ### Features
28+
- This release introduces multi-data-source feature in Migration Hub Strategy Recommendations. This feature now supports vCenter as a data source to fetch inventory in addition to ADS and Import from file workflow that is currently supported with MHSR collector.
29+
30+
## __OpenSearch Service Serverless__
31+
- ### Features
32+
- This release includes the following new APIs: CreateLifecyclePolicy, UpdateLifecyclePolicy, BatchGetLifecyclePolicy, DeleteLifecyclePolicy, ListLifecyclePolicies and BatchGetEffectiveLifecyclePolicy to support the data lifecycle management feature.
33+
134
# __2.21.6__ __2023-10-23__
235
## __AWS Marketplace Commerce Analytics__
336
- ### 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.21.6</version>
55+
<version>2.21.7</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.21.6</version>
89+
<version>2.21.7</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.21.6</version>
94+
<version>2.21.7</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.21.6</version>
106+
<version>2.21.7</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.21.6</version>
23+
<version>2.21.7</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.21.6</version>
23+
<version>2.21.7</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.21.6</version>
23+
<version>2.21.7</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.21.6</version>
23+
<version>2.21.7</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.21.6</version>
20+
<version>2.21.7</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.21.6</version>
23+
<version>2.21.7</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.21.6</version>
20+
<version>2.21.7</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.21.6</version>
24+
<version>2.21.7</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.21.6</version>
25+
<version>2.21.7</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.21.6</version>
24+
<version>2.21.7</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.21.6</version>
25+
<version>2.21.7</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.21.6</version>
24+
<version>2.21.7</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public Map<String, OperationModel> constructOperations() {
164164
OperationModel operationModel = new OperationModel();
165165

166166
operationModel.setOperationName(operationName);
167+
operationModel.setServiceProtocol(serviceModel.getMetadata().getProtocol());
167168
operationModel.setDeprecated(op.isDeprecated());
168169
operationModel.setDeprecatedMessage(op.getDeprecatedMessage());
169170
operationModel.setDocumentation(op.getDocumentation());

‎codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public class OperationModel extends DocumentationModel {
3434

3535
private String operationName;
3636

37+
private String serviceProtocol;
38+
3739
private boolean deprecated;
3840

3941
private String deprecatedMessage;
@@ -93,6 +95,14 @@ public String getMethodName() {
9395
return Utils.unCapitalize(operationName);
9496
}
9597

98+
public String getServiceProtocol() {
99+
return serviceProtocol;
100+
}
101+
102+
public void setServiceProtocol(String serviceProtocol) {
103+
this.serviceProtocol = serviceProtocol;
104+
}
105+
96106
public boolean isDeprecated() {
97107
return deprecated;
98108
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import software.amazon.awssdk.identity.spi.IdentityProvider;
7070
import software.amazon.awssdk.identity.spi.IdentityProviders;
7171
import software.amazon.awssdk.identity.spi.TokenIdentity;
72-
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
7372
import software.amazon.awssdk.utils.AttributeMap;
7473
import software.amazon.awssdk.utils.CollectionUtils;
7574
import software.amazon.awssdk.utils.StringUtils;
@@ -343,17 +342,6 @@ private MethodSpec finalizeServiceConfigurationMethod() {
343342

344343
builder.addCode("interceptors = $T.mergeLists(interceptors, config.option($T.EXECUTION_INTERCEPTORS));\n",
345344
CollectionUtils.class, SdkClientOption.class);
346-
347-
if (model.getMetadata().isQueryProtocol()) {
348-
TypeName listType = ParameterizedTypeName.get(List.class, ExecutionInterceptor.class);
349-
builder.addStatement("$T protocolInterceptors = $T.singletonList(new $T())",
350-
listType,
351-
Collections.class,
352-
QueryParametersToBodyInterceptor.class);
353-
builder.addStatement("interceptors = $T.mergeLists(interceptors, protocolInterceptors)",
354-
CollectionUtils.class);
355-
}
356-
357345
if (model.getEndpointOperation().isPresent()) {
358346
builder.beginControlFlow("if (!endpointDiscoveryEnabled)")
359347
.addStatement("$1T chain = new $1T(config)", DefaultEndpointDiscoveryProviderChain.class)

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
5757
import software.amazon.awssdk.awscore.client.handler.AwsClientHandlerUtils;
5858
import software.amazon.awssdk.awscore.eventstream.EventStreamTaggedUnionJsonMarshaller;
59+
import software.amazon.awssdk.awscore.internal.AwsProtocolMetadata;
60+
import software.amazon.awssdk.awscore.internal.AwsServiceProtocol;
5961
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
6062
import software.amazon.awssdk.codegen.model.config.customization.UtilitiesMethod;
6163
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -142,6 +144,7 @@ protected void addFields(TypeSpec.Builder type) {
142144
.initializer("$T.getLogger($T.class)", LoggerFactory.class,
143145
className)
144146
.build())
147+
.addField(protocolMetadata())
145148
.addField(AsyncClientHandler.class, "clientHandler", PRIVATE, FINAL)
146149
.addField(protocolSpec.protocolFactory(model))
147150
.addField(SdkClientConfiguration.class, "clientConfiguration", PRIVATE, FINAL)
@@ -206,6 +209,13 @@ private Stream<MethodSpec> operations(OperationModel opModel) {
206209
return methods.stream();
207210
}
208211

212+
private FieldSpec protocolMetadata() {
213+
return FieldSpec.builder(AwsProtocolMetadata.class, "protocolMetadata", PRIVATE, STATIC, FINAL)
214+
.initializer("$T.builder().serviceProtocol($T.$L).build()",
215+
AwsProtocolMetadata.class, AwsServiceProtocol.class, model.getMetadata().getProtocol())
216+
.build();
217+
}
218+
209219
private MethodSpec constructor(TypeSpec.Builder classBuilder) {
210220
MethodSpec.Builder builder
211221
= MethodSpec.constructorBuilder()

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import software.amazon.awssdk.annotations.SdkInternalApi;
4141
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
4242
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
43+
import software.amazon.awssdk.awscore.internal.AwsProtocolMetadata;
44+
import software.amazon.awssdk.awscore.internal.AwsServiceProtocol;
4345
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
4446
import software.amazon.awssdk.codegen.model.config.customization.UtilitiesMethod;
4547
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -114,6 +116,7 @@ protected void addModifiers(TypeSpec.Builder type) {
114116
@Override
115117
protected void addFields(TypeSpec.Builder type) {
116118
type.addField(logger())
119+
.addField(protocolMetadata())
117120
.addField(SyncClientHandler.class, "clientHandler", PRIVATE, FINAL)
118121
.addField(protocolSpec.protocolFactory(model))
119122
.addField(SdkClientConfiguration.class, "clientConfiguration", PRIVATE, FINAL)
@@ -147,6 +150,13 @@ private FieldSpec logger() {
147150
.build();
148151
}
149152

153+
private FieldSpec protocolMetadata() {
154+
return FieldSpec.builder(AwsProtocolMetadata.class, "protocolMetadata", PRIVATE, STATIC, FINAL)
155+
.initializer("$T.builder().serviceProtocol($T.$L).build()",
156+
AwsProtocolMetadata.class, AwsServiceProtocol.class, model.getMetadata().getProtocol())
157+
.build();
158+
}
159+
150160
private MethodSpec nameMethod() {
151161
return MethodSpec.methodBuilder("serviceName")
152162
.addAnnotation(Override.class)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ public CodeBlock executionHandler(OperationModel opModel) {
182182
.add("\n\nreturn clientHandler.execute(new $T<$T, $T>()\n",
183183
ClientExecutionParams.class, requestType, responseType)
184184
.add(".withOperationName(\"$N\")\n", opModel.getOperationName())
185+
.add(".withProtocolMetadata(protocolMetadata)\n")
185186
.add(".withResponseHandler(responseHandler)\n")
186187
.add(".withErrorResponseHandler(errorResponseHandler)\n")
187188
.add(hostPrefixExpression(opModel))
@@ -254,6 +255,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
254255
.add(opModel.getEndpointDiscovery() != null ? "endpointFuture.thenCompose(cachedEndpoint -> " : "")
255256
.add("clientHandler.execute(new $T<$T, $T>()\n", ClientExecutionParams.class, requestType, responseType)
256257
.add(".withOperationName(\"$N\")\n", opModel.getOperationName())
258+
.add(".withProtocolMetadata(protocolMetadata)\n")
257259
.add(".withMarshaller($L)\n", asyncMarshaller(model, opModel, marshaller, protocolFactory))
258260
.add(asyncRequestBody(opModel))
259261
.add(fullDuplex(opModel))

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public CodeBlock executionHandler(OperationModel opModel) {
111111
.add("\n\nreturn clientHandler.execute(new $T<$T, $T>()",
112112
ClientExecutionParams.class, requestType, responseType)
113113
.add(".withOperationName($S)\n", opModel.getOperationName())
114+
.add(".withProtocolMetadata(protocolMetadata)\n")
114115
.add(".withResponseHandler(responseHandler)\n")
115116
.add(".withErrorResponseHandler(errorResponseHandler)\n")
116117
.add(hostPrefixExpression(opModel))
@@ -152,6 +153,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
152153
CompletableFuture.class, executeFutureValueType, ClientExecutionParams.class,
153154
requestType, pojoResponseType)
154155
.add(".withOperationName(\"$N\")\n", opModel.getOperationName())
156+
.add(".withProtocolMetadata(protocolMetadata)\n")
155157
.add(".withMarshaller($L)\n",
156158
asyncMarshaller(intermediateModel, opModel, marshaller, "protocolFactory"))
157159
.add(".withResponseHandler(responseHandler)\n")

0 commit comments

Comments
 (0)