Skip to content

Commit 0ee7e00

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #4015 from aws/staging/225d8435-14a0-41a0-a451-c4c48c245d6f
Pull request: release <- staging/225d8435-14a0-41a0-a451-c4c48c245d6f
2 parents 83ec481 + 85b92a6 commit 0ee7e00

File tree

515 files changed

+1100
-701
lines changed

Some content is hidden

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

515 files changed

+1100
-701
lines changed

‎.changes/2.31.59.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"version": "2.31.59",
3+
"date": "2025-06-06",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "",
9+
"description": "Fix expiration in past warning during profile credential loading."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Key Management Service",
14+
"contributor": "",
15+
"description": "Remove unpopulated KeyMaterialId from Encrypt Response"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS SDK for Java v2",
20+
"contributor": "",
21+
"description": "Add support for protocols field in service model"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Agents for Amazon Bedrock Runtime",
26+
"contributor": "",
27+
"description": "This release introduces the `PromptCreationConfigurations` input parameter, which includes fields to control prompt population for `InvokeAgent` or `InvokeInlineAgent` requests."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Rekognition",
32+
"contributor": "",
33+
"description": "Adds support for defining an ordered preference list of different Rekognition Face Liveness challenge types when calling CreateFaceLivenessSession."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon Relational Database Service",
38+
"contributor": "",
39+
"description": "Include Global Cluster Identifier in DBCluster if the DBCluster is a Global Cluster Member."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Amazon Route 53",
44+
"contributor": "",
45+
"description": "Amazon Route 53 now supports the Asia Pacific (Taipei) Region (ap-east-2) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon S3 Tables",
50+
"contributor": "",
51+
"description": "S3 Tables now supports getting details about a table via its table ARN."
52+
},
53+
{
54+
"type": "feature",
55+
"category": "AWS SDK for Java v2",
56+
"contributor": "",
57+
"description": "Updated endpoint and partition metadata."
58+
}
59+
]
60+
}

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,37 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.31.59__ __2025-06-06__
3+
## __AWS Key Management Service__
4+
- ### Features
5+
- Remove unpopulated KeyMaterialId from Encrypt Response
6+
7+
## __AWS SDK for Java v2__
8+
- ### Features
9+
- Add support for protocols field in service model
10+
- Updated endpoint and partition metadata.
11+
12+
- ### Bugfixes
13+
- Fix expiration in past warning during profile credential loading.
14+
15+
## __Agents for Amazon Bedrock Runtime__
16+
- ### Features
17+
- This release introduces the `PromptCreationConfigurations` input parameter, which includes fields to control prompt population for `InvokeAgent` or `InvokeInlineAgent` requests.
18+
19+
## __Amazon Rekognition__
20+
- ### Features
21+
- Adds support for defining an ordered preference list of different Rekognition Face Liveness challenge types when calling CreateFaceLivenessSession.
22+
23+
## __Amazon Relational Database Service__
24+
- ### Features
25+
- Include Global Cluster Identifier in DBCluster if the DBCluster is a Global Cluster Member.
26+
27+
## __Amazon Route 53__
28+
- ### Features
29+
- Amazon Route 53 now supports the Asia Pacific (Taipei) Region (ap-east-2) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region.
30+
31+
## __Amazon S3 Tables__
32+
- ### Features
33+
- S3 Tables now supports getting details about a table via its table ARN.
34+
235
# __2.31.58__ __2025-06-05__
336
## __AWS Billing and Cost Management Pricing Calculator__
437
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
5151
<dependency>
5252
<groupId>software.amazon.awssdk</groupId>
5353
<artifactId>bom</artifactId>
54-
<version>2.31.58</version>
54+
<version>2.31.59</version>
5555
<type>pom</type>
5656
<scope>import</scope>
5757
</dependency>
@@ -85,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
8585
<dependency>
8686
<groupId>software.amazon.awssdk</groupId>
8787
<artifactId>ec2</artifactId>
88-
<version>2.31.58</version>
88+
<version>2.31.59</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>software.amazon.awssdk</groupId>
9292
<artifactId>s3</artifactId>
93-
<version>2.31.58</version>
93+
<version>2.31.59</version>
9494
</dependency>
9595
```
9696

@@ -102,7 +102,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
102102
<dependency>
103103
<groupId>software.amazon.awssdk</groupId>
104104
<artifactId>aws-sdk-java</artifactId>
105-
<version>2.31.58</version>
105+
<version>2.31.59</version>
106106
</dependency>
107107
```
108108

‎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.31.58</version>
23+
<version>2.31.59</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.31.58</version>
23+
<version>2.31.59</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.31.58</version>
23+
<version>2.31.59</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.31.58</version>
23+
<version>2.31.59</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.31.58</version>
20+
<version>2.31.59</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.31.58</version>
23+
<version>2.31.59</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.31.58</version>
20+
<version>2.31.59</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎bundle-logging-bridge/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.31.58</version>
24+
<version>2.31.59</version>
2525
</parent>
2626
<artifactId>bundle-logging-bridge</artifactId>
2727
<packaging>jar</packaging>

‎bundle-sdk/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.31.58</version>
24+
<version>2.31.59</version>
2525
</parent>
2626
<artifactId>bundle-sdk</artifactId>
2727
<packaging>jar</packaging>

‎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.31.58</version>
24+
<version>2.31.59</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.31.58</version>
25+
<version>2.31.59</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.31.58</version>
24+
<version>2.31.59</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.31.58</version>
25+
<version>2.31.59</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.31.58</version>
24+
<version>2.31.59</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import software.amazon.awssdk.codegen.model.service.ServiceModel;
2929
import software.amazon.awssdk.codegen.naming.DefaultNamingStrategy;
3030
import software.amazon.awssdk.codegen.naming.NamingStrategy;
31+
import software.amazon.awssdk.codegen.utils.ProtocolUtils;
3132
import software.amazon.awssdk.utils.Pair;
3233
import software.amazon.awssdk.utils.StringUtils;
3334

@@ -70,7 +71,7 @@ public static Metadata constructMetadata(ServiceModel serviceModel,
7071
.withBaseExceptionName(String.format(Constant.BASE_EXCEPTION_NAME_PATTERN, serviceName))
7172
.withBaseRequestName(String.format(Constant.BASE_REQUEST_NAME_PATTERN, serviceName))
7273
.withBaseResponseName(String.format(Constant.BASE_RESPONSE_NAME_PATTERN, serviceName))
73-
.withProtocol(Protocol.fromValue(serviceMetadata.getProtocol()))
74+
.withProtocol(Protocol.fromValue(ProtocolUtils.resolveProtocol(serviceMetadata)))
7475
.withJsonVersion(serviceMetadata.getJsonVersion())
7576
.withEndpointPrefix(serviceMetadata.getEndpointPrefix())
7677
.withSigningName(serviceMetadata.getSigningName())

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import software.amazon.awssdk.codegen.model.service.ServiceModel;
3838
import software.amazon.awssdk.codegen.model.service.Shape;
3939
import software.amazon.awssdk.codegen.naming.NamingStrategy;
40+
import software.amazon.awssdk.codegen.utils.ProtocolUtils;
4041

4142
/**
4243
* Constructs the operation model for every operation defined by the service.
@@ -164,7 +165,7 @@ public Map<String, OperationModel> constructOperations() {
164165
OperationModel operationModel = new OperationModel();
165166

166167
operationModel.setOperationName(operationName);
167-
operationModel.setServiceProtocol(serviceModel.getMetadata().getProtocol());
168+
operationModel.setServiceProtocol(ProtocolUtils.resolveProtocol(serviceModel.getMetadata()));
168169
operationModel.setDeprecated(op.isDeprecated());
169170
operationModel.setDeprecatedMessage(op.getDeprecatedMessage());
170171
operationModel.setDocumentation(op.getDocumentation());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import software.amazon.awssdk.codegen.model.service.ServiceModel;
4141
import software.amazon.awssdk.codegen.model.service.Shape;
4242
import software.amazon.awssdk.codegen.naming.NamingStrategy;
43+
import software.amazon.awssdk.codegen.utils.ProtocolUtils;
4344
import software.amazon.awssdk.utils.StringUtils;
4445
import software.amazon.awssdk.utils.Validate;
4546

@@ -464,6 +465,6 @@ private void fillContainerTypeMemberMetadata(Map<String, Shape> c2jShapes,
464465
}
465466

466467
protected String getProtocol() {
467-
return getServiceModel().getMetadata().getProtocol();
468+
return ProtocolUtils.resolveProtocol(getServiceModel().getMetadata());
468469
}
469470
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ExplicitStringPayloadQueryProtocolProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import software.amazon.awssdk.codegen.model.service.Output;
2424
import software.amazon.awssdk.codegen.model.service.ServiceModel;
2525
import software.amazon.awssdk.codegen.model.service.Shape;
26+
import software.amazon.awssdk.codegen.utils.ProtocolUtils;
2627

2728
/**
2829
* Operations with explicit String payloads are not supported for services with Query protocol. We fail the codegen if the
@@ -31,7 +32,7 @@
3132
public class ExplicitStringPayloadQueryProtocolProcessor implements CodegenCustomizationProcessor {
3233
@Override
3334
public void preprocess(ServiceModel serviceModel) {
34-
String protocol = serviceModel.getMetadata().getProtocol();
35+
String protocol = ProtocolUtils.resolveProtocol(serviceModel.getMetadata());
3536
if (!"ec2".equals(protocol) && !"query".equals(protocol)) {
3637
return;
3738
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/MetadataModifiersProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
package software.amazon.awssdk.codegen.customization.processors;
1717

18+
import java.util.Collections;
1819
import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
1920
import software.amazon.awssdk.codegen.model.config.customization.MetadataConfig;
2021
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -44,7 +45,7 @@ public void preprocess(ServiceModel serviceModel) {
4445

4546
String customProtocol = metadataConfig.getProtocol();
4647
if (customProtocol != null) {
47-
serviceMetadata.setProtocol(customProtocol);
48+
serviceMetadata.setProtocols(Collections.singletonList(customProtocol));
4849
}
4950

5051
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/SmithyRpcV2CborProtocolProcessor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import software.amazon.awssdk.codegen.model.service.Http;
2121
import software.amazon.awssdk.codegen.model.service.Operation;
2222
import software.amazon.awssdk.codegen.model.service.ServiceModel;
23+
import software.amazon.awssdk.codegen.utils.ProtocolUtils;
2324

2425
/**
2526
* This processor only runs for services using the <code>smithy-rpc-v2-cbor</code> protocol.
@@ -29,7 +30,8 @@
2930
public class SmithyRpcV2CborProtocolProcessor implements CodegenCustomizationProcessor {
3031
@Override
3132
public void preprocess(ServiceModel serviceModel) {
32-
if (!"smithy-rpc-v2-cbor".equals(serviceModel.getMetadata().getProtocol())) {
33+
String protocol = ProtocolUtils.resolveProtocol(serviceModel.getMetadata());
34+
if (!"smithy-rpc-v2-cbor".equals(protocol)) {
3335
return;
3436
}
3537
serviceModel.getOperations().forEach((name, op) -> setRequestUri(serviceModel, name, op));

‎codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import software.amazon.awssdk.codegen.model.service.ServiceModel;
4040
import software.amazon.awssdk.codegen.model.service.Shape;
4141
import software.amazon.awssdk.codegen.model.service.XmlNamespace;
42+
import software.amazon.awssdk.codegen.utils.ProtocolUtils;
4243
import software.amazon.awssdk.utils.IoUtils;
4344
import software.amazon.awssdk.utils.StringUtils;
4445

@@ -331,11 +332,13 @@ public static ShapeMarshaller createInputShapeMarshaller(ServiceMetadata service
331332
"The operation parameter must be specified!");
332333
}
333334

335+
String protocol = ProtocolUtils.resolveProtocol(service);
336+
334337
ShapeMarshaller marshaller = new ShapeMarshaller()
335338
.withAction(operation.getName())
336339
.withVerb(operation.getHttp().getMethod())
337340
.withRequestUri(operation.getHttp().getRequestUri())
338-
.withProtocol(service.getProtocol());
341+
.withProtocol(protocol);
339342
Input input = operation.getInput();
340343
if (input != null) {
341344
marshaller.setLocationName(input.getLocationName());
@@ -345,7 +348,7 @@ public static ShapeMarshaller createInputShapeMarshaller(ServiceMetadata service
345348
marshaller.setXmlNameSpaceUri(xmlNamespace.getUri());
346349
}
347350
}
348-
if (Metadata.usesOperationIdentifier(service.getProtocol())) {
351+
if (Metadata.usesOperationIdentifier(protocol)) {
349352
marshaller.setTarget(StringUtils.isEmpty(service.getTargetPrefix()) ?
350353
operation.getName() :
351354
service.getTargetPrefix() + "." + operation.getName());

0 commit comments

Comments
 (0)