Merge pull request #3370 from aws/staging/3e3448e0-0743-482a-901f-376…

…1ddec952f

Pull request: release <- staging/3e3448e0-0743-482a-901f-3761ddec952f

.changes/2.28.28.json

@@ -0,0 +1,54 @@
+{
+    "version": "2.28.28",
+    "date": "2024-10-22",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon Kinesis",
+            "contributor": "",
+            "description": "Fix an issue where errors that should be `400` are incorrectly classified as `500`."
+        },
+        {
+            "type": "feature",
+            "category": "AWSMainframeModernization",
+            "contributor": "",
+            "description": "Add AuthSecretsManagerArn optional parameter to batch job APIs, expand batch parameter limits, and introduce clientToken constraints."
+        },
+        {
+            "type": "feature",
+            "category": "AWS re:Post Private",
+            "contributor": "",
+            "description": "Adds the BatchAddRole and BatchRemoveRole APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Bedrock Runtime",
+            "contributor": "",
+            "description": "Updating invoke regex to support imported models for converse API"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "contributor": "",
+            "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."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Timestream Query",
+            "contributor": "",
+            "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."
+        },
+        {
+            "type": "feature",
+            "category": "EC2 Image Builder",
+            "contributor": "",
+            "description": "Add macOS platform and instance placement options"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,4 +1,37 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.28.28__ __2024-10-22__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __AWS re:Post Private__
+  - ### Features
+    - Adds the BatchAddRole and BatchRemoveRole APIs.
+
+## __AWSMainframeModernization__
+  - ### Features
+    - Add AuthSecretsManagerArn optional parameter to batch job APIs, expand batch parameter limits, and introduce clientToken constraints.
+
+## __Amazon Bedrock Runtime__
+  - ### Features
+    - Updating invoke regex to support imported models for converse API
+
+## __Amazon Kinesis__
+  - ### Bugfixes
+    - Fix an issue where errors that should be `400` are incorrectly classified as `500`.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - 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.
+
+## __Amazon Timestream Query__
+  - ### Features
+    - 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.
+
+## __EC2 Image Builder__
+  - ### Features
+    - Add macOS platform and instance placement options
+
 # __2.28.27__ __2024-10-21__
 ## __AWS Database Migration Service__
   - ### Features

README.md

@@ -51,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.28.27</version>
+      <version>2.28.28</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -85,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.28.27</version>
+  <version>2.28.28</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.28.27</version>
+  <version>2.28.28</version>
 </dependency>
 ```
 
@@ -102,7 +102,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.28.27</version>
+  <version>2.28.28</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-tools/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

aws-sdk-java/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle-logging-bridge/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <artifactId>bundle-logging-bridge</artifactId>
     <packaging>jar</packaging>

bundle-sdk/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <artifactId>bundle-sdk</artifactId>
     <packaging>jar</packaging>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.27</version>
+        <version>2.28.28</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

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

@@ -90,7 +90,10 @@ default List<CodeBlock> registerModeledExceptions(IntermediateModel model, PoetE
     default String populateHttpStatusCode(ShapeModel shapeModel, IntermediateModel model) {
         Integer statusCode = shapeModel.getHttpStatusCode();
 
-        if (statusCode == null && model.getMetadata().getProtocol() == Protocol.AWS_JSON) {
+        Protocol protocol = model.getMetadata().getProtocol();
+
+        if (statusCode == null
+            && (protocol == Protocol.AWS_JSON || protocol == Protocol.CBOR)) {
             if (shapeModel.isFault()) {
                 statusCode = 500;
             } else {

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

@@ -47,6 +47,19 @@ public static IntermediateModel awsJsonServiceModels() {
         return new IntermediateModelBuilder(models).build();
     }
 
+    public static IntermediateModel cborServiceModels() {
+        File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/json/service-2.json").getFile());
+        File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/cbor/customization.config").getFile());
+        File paginatorsModel = new File(ClientTestModels.class.getResource("client/c2j/json/paginators.json").getFile());
+        C2jModels models = C2jModels.builder()
+                                    .serviceModel(getServiceModel(serviceModel))
+                                    .customizationConfig(getCustomizationConfig(customizationModel))
+                                    .paginatorsModel(getPaginatorsModel(paginatorsModel))
+                                    .build();
+
+        return new IntermediateModelBuilder(models).build();
+    }
+
     public static IntermediateModel awsQueryCompatibleJsonServiceModels() {
         File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/query-to-json-errorcode/service-2.json").getFile());
         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

@@ -19,6 +19,7 @@
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.awsJsonServiceModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.awsQueryCompatibleJsonServiceModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.batchManagerModels;
+import static software.amazon.awssdk.codegen.poet.ClientTestModels.cborServiceModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.customContentTypeModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.customPackageModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.endpointDiscoveryModels;
@@ -61,6 +62,15 @@ public void asyncClientClassAwsJson() {
         assertThat(sraAsyncClientClass, generatesTo("sra/test-aws-json-async-client-class.java"));
     }
 
+    @Test
+    public void asyncClientClassCbor() {
+        AsyncClientClass asyncClientClass = createAsyncClientClass(cborServiceModels(), false);
+        assertThat(asyncClientClass, generatesTo("test-cbor-async-client-class.java"));
+
+        AsyncClientClass sraAsyncClientClass = createAsyncClientClass(cborServiceModels(), true);
+        assertThat(sraAsyncClientClass, generatesTo("sra/test-cbor-async-client-class.java"));
+    }
+
     @Test
     public void asyncClientClassAwsQueryCompatibleJson() {
         AsyncClientClass asyncClientClass = createAsyncClientClass(awsQueryCompatibleJsonServiceModels());

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

@@ -17,6 +17,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.awsQueryCompatibleJsonServiceModels;
+import static software.amazon.awssdk.codegen.poet.ClientTestModels.cborServiceModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.customContentTypeModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.customPackageModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.endpointDiscoveryModels;
@@ -89,6 +90,12 @@ public void syncClientClassRpcV2() {
         assertThat(syncClientCustomServiceMetaData, generatesTo("test-rpcv2-sync.java"));
     }
 
+    @Test
+    public void syncClientClassCbor() {
+        ClassSpec syncClientCustomServiceMetaData = createSyncClientClass(cborServiceModels(), true);
+        assertThat(syncClientCustomServiceMetaData, generatesTo("test-cbor-client-class.java"));
+    }
+
     private SyncClientClass createSyncClientClass(IntermediateModel model) {
         return new SyncClientClass(GeneratorTaskParams.create(model, "sources/", "tests/", "resources/"));
     }

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

@@ -0,0 +1,28 @@
+{
+    "authPolicyActions" : {
+        "skip" : true
+    },
+    "presignersFqcn": "software.amazon.awssdk.services.acm.presign.AcmClientPresigners",
+    "serviceSpecificHttpConfig": "software.amazon.MyServiceHttpConfig",
+    "serviceConfig": {
+      "className": "ServiceConfiguration",
+      "hasDualstackProperty": true,
+      "hasFipsProperty": true
+    },
+    "customRetryPolicy": "software.amazon.MyServiceRetryPolicy",
+    "customRetryStrategy": "software.amazon.MyServiceRetryStrategy",
+    "verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
+    "excludedSimpleMethods" : [
+        "eventStreamOperation"
+    ],
+  "utilitiesMethod": {
+    "returnType": "software.amazon.awssdk.services.json.JsonUtilities",
+    "createMethodParams": ["param1", "param2", "param3"]
+  },
+  "useLegacyEventGenerationScheme": {
+    "EventStream": ["EventOne", "event-two", "eventThree"]
+  },
+  "customServiceMetadata": {
+    "protocol": "cbor"
+  }
+}