Skip to content

Commit af50c71

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #3370 from aws/staging/3e3448e0-0743-482a-901f-3761ddec952f
Pull request: release <- staging/3e3448e0-0743-482a-901f-3761ddec952f
2 parents 98b50e9 + 1e12858 commit af50c71

File tree

500 files changed

+5896
-910
lines changed

Some content is hidden

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

500 files changed

+5896
-910
lines changed

‎.changes/2.28.28.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"version": "2.28.28",
3+
"date": "2024-10-22",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "Amazon Kinesis",
8+
"contributor": "",
9+
"description": "Fix an issue where errors that should be `400` are incorrectly classified as `500`."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWSMainframeModernization",
14+
"contributor": "",
15+
"description": "Add AuthSecretsManagerArn optional parameter to batch job APIs, expand batch parameter limits, and introduce clientToken constraints."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS re:Post Private",
20+
"contributor": "",
21+
"description": "Adds the BatchAddRole and BatchRemoveRole APIs."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Bedrock Runtime",
26+
"contributor": "",
27+
"description": "Updating invoke regex to support imported models for converse API"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Relational Database Service",
32+
"contributor": "",
33+
"description": "Global clusters now expose the Endpoint attribute as one of its fields. It is a Read/Write endpoint for the global cluster which resolves to the Global Cluster writer instance."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon Timestream Query",
38+
"contributor": "",
39+
"description": "This release adds support for Query Insights, a feature that provides details of query execution, enabling users to identify areas for improvement to optimize their queries, resulting in improved query performance and lower query costs."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "EC2 Image Builder",
44+
"contributor": "",
45+
"description": "Add macOS platform and instance placement options"
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,4 +1,37 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.28.28__ __2024-10-22__
3+
## __AWS SDK for Java v2__
4+
- ### Features
5+
- Updated endpoint and partition metadata.
6+
7+
## __AWS re:Post Private__
8+
- ### Features
9+
- Adds the BatchAddRole and BatchRemoveRole APIs.
10+
11+
## __AWSMainframeModernization__
12+
- ### Features
13+
- Add AuthSecretsManagerArn optional parameter to batch job APIs, expand batch parameter limits, and introduce clientToken constraints.
14+
15+
## __Amazon Bedrock Runtime__
16+
- ### Features
17+
- Updating invoke regex to support imported models for converse API
18+
19+
## __Amazon Kinesis__
20+
- ### Bugfixes
21+
- Fix an issue where errors that should be `400` are incorrectly classified as `500`.
22+
23+
## __Amazon Relational Database Service__
24+
- ### Features
25+
- Global clusters now expose the Endpoint attribute as one of its fields. It is a Read/Write endpoint for the global cluster which resolves to the Global Cluster writer instance.
26+
27+
## __Amazon Timestream Query__
28+
- ### Features
29+
- This release adds support for Query Insights, a feature that provides details of query execution, enabling users to identify areas for improvement to optimize their queries, resulting in improved query performance and lower query costs.
30+
31+
## __EC2 Image Builder__
32+
- ### Features
33+
- Add macOS platform and instance placement options
34+
235
# __2.28.27__ __2024-10-21__
336
## __AWS Database Migration Service__
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.28.27</version>
54+
<version>2.28.28</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.28.27</version>
88+
<version>2.28.28</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>software.amazon.awssdk</groupId>
9292
<artifactId>s3</artifactId>
93-
<version>2.28.27</version>
93+
<version>2.28.28</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.28.27</version>
105+
<version>2.28.28</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.28.27</version>
23+
<version>2.28.28</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.28.27</version>
23+
<version>2.28.28</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.28.27</version>
23+
<version>2.28.28</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.28.27</version>
23+
<version>2.28.28</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.28.27</version>
20+
<version>2.28.28</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.28.27</version>
23+
<version>2.28.28</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.28.27</version>
20+
<version>2.28.28</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.28.27</version>
24+
<version>2.28.28</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.28.27</version>
24+
<version>2.28.28</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.28.27</version>
24+
<version>2.28.28</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.28.27</version>
25+
<version>2.28.28</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.28.27</version>
24+
<version>2.28.28</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.28.27</version>
25+
<version>2.28.28</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.28.27</version>
24+
<version>2.28.28</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/specs/ProtocolSpec.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,10 @@ default List<CodeBlock> registerModeledExceptions(IntermediateModel model, PoetE
9090
default String populateHttpStatusCode(ShapeModel shapeModel, IntermediateModel model) {
9191
Integer statusCode = shapeModel.getHttpStatusCode();
9292

93-
if (statusCode == null && model.getMetadata().getProtocol() == Protocol.AWS_JSON) {
93+
Protocol protocol = model.getMetadata().getProtocol();
94+
95+
if (statusCode == null
96+
&& (protocol == Protocol.AWS_JSON || protocol == Protocol.CBOR)) {
9497
if (shapeModel.isFault()) {
9598
statusCode = 500;
9699
} else {

‎codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,19 @@ public static IntermediateModel awsJsonServiceModels() {
4747
return new IntermediateModelBuilder(models).build();
4848
}
4949

50+
public static IntermediateModel cborServiceModels() {
51+
File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/json/service-2.json").getFile());
52+
File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/cbor/customization.config").getFile());
53+
File paginatorsModel = new File(ClientTestModels.class.getResource("client/c2j/json/paginators.json").getFile());
54+
C2jModels models = C2jModels.builder()
55+
.serviceModel(getServiceModel(serviceModel))
56+
.customizationConfig(getCustomizationConfig(customizationModel))
57+
.paginatorsModel(getPaginatorsModel(paginatorsModel))
58+
.build();
59+
60+
return new IntermediateModelBuilder(models).build();
61+
}
62+
5063
public static IntermediateModel awsQueryCompatibleJsonServiceModels() {
5164
File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/query-to-json-errorcode/service-2.json").getFile());
5265
File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/query-to-json-errorcode/customization.config").getFile());

‎codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClassTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static software.amazon.awssdk.codegen.poet.ClientTestModels.awsJsonServiceModels;
2020
import static software.amazon.awssdk.codegen.poet.ClientTestModels.awsQueryCompatibleJsonServiceModels;
2121
import static software.amazon.awssdk.codegen.poet.ClientTestModels.batchManagerModels;
22+
import static software.amazon.awssdk.codegen.poet.ClientTestModels.cborServiceModels;
2223
import static software.amazon.awssdk.codegen.poet.ClientTestModels.customContentTypeModels;
2324
import static software.amazon.awssdk.codegen.poet.ClientTestModels.customPackageModels;
2425
import static software.amazon.awssdk.codegen.poet.ClientTestModels.endpointDiscoveryModels;
@@ -61,6 +62,15 @@ public void asyncClientClassAwsJson() {
6162
assertThat(sraAsyncClientClass, generatesTo("sra/test-aws-json-async-client-class.java"));
6263
}
6364

65+
@Test
66+
public void asyncClientClassCbor() {
67+
AsyncClientClass asyncClientClass = createAsyncClientClass(cborServiceModels(), false);
68+
assertThat(asyncClientClass, generatesTo("test-cbor-async-client-class.java"));
69+
70+
AsyncClientClass sraAsyncClientClass = createAsyncClientClass(cborServiceModels(), true);
71+
assertThat(sraAsyncClientClass, generatesTo("sra/test-cbor-async-client-class.java"));
72+
}
73+
6474
@Test
6575
public void asyncClientClassAwsQueryCompatibleJson() {
6676
AsyncClientClass asyncClientClass = createAsyncClientClass(awsQueryCompatibleJsonServiceModels());

‎codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/SyncClientClassTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static org.hamcrest.MatcherAssert.assertThat;
1919
import static software.amazon.awssdk.codegen.poet.ClientTestModels.awsQueryCompatibleJsonServiceModels;
20+
import static software.amazon.awssdk.codegen.poet.ClientTestModels.cborServiceModels;
2021
import static software.amazon.awssdk.codegen.poet.ClientTestModels.customContentTypeModels;
2122
import static software.amazon.awssdk.codegen.poet.ClientTestModels.customPackageModels;
2223
import static software.amazon.awssdk.codegen.poet.ClientTestModels.endpointDiscoveryModels;
@@ -89,6 +90,12 @@ public void syncClientClassRpcV2() {
8990
assertThat(syncClientCustomServiceMetaData, generatesTo("test-rpcv2-sync.java"));
9091
}
9192

93+
@Test
94+
public void syncClientClassCbor() {
95+
ClassSpec syncClientCustomServiceMetaData = createSyncClientClass(cborServiceModels(), true);
96+
assertThat(syncClientCustomServiceMetaData, generatesTo("test-cbor-client-class.java"));
97+
}
98+
9299
private SyncClientClass createSyncClientClass(IntermediateModel model) {
93100
return new SyncClientClass(GeneratorTaskParams.create(model, "sources/", "tests/", "resources/"));
94101
}

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/cbor/customization.config

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"authPolicyActions" : {
3+
"skip" : true
4+
},
5+
"presignersFqcn": "software.amazon.awssdk.services.acm.presign.AcmClientPresigners",
6+
"serviceSpecificHttpConfig": "software.amazon.MyServiceHttpConfig",
7+
"serviceConfig": {
8+
"className": "ServiceConfiguration",
9+
"hasDualstackProperty": true,
10+
"hasFipsProperty": true
11+
},
12+
"customRetryPolicy": "software.amazon.MyServiceRetryPolicy",
13+
"customRetryStrategy": "software.amazon.MyServiceRetryStrategy",
14+
"verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
15+
"excludedSimpleMethods" : [
16+
"eventStreamOperation"
17+
],
18+
"utilitiesMethod": {
19+
"returnType": "software.amazon.awssdk.services.json.JsonUtilities",
20+
"createMethodParams": ["param1", "param2", "param3"]
21+
},
22+
"useLegacyEventGenerationScheme": {
23+
"EventStream": ["EventOne", "event-two", "eventThree"]
24+
},
25+
"customServiceMetadata": {
26+
"protocol": "cbor"
27+
}
28+
}

0 commit comments

Comments
 (0)