Merge pull request #3669 from aws/staging/a3a7dd7b-35af-458a-8dc6-76cfc877de00

Pull request: release <- staging/a3a7dd7b-35af-458a-8dc6-76cfc877de00

Author: aws-sdk-java-automation

.changes/2.30.23.json

@@ -0,0 +1,36 @@
+{
+    "version": "2.30.23",
+    "date": "2025-02-18",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon Cloudfront",
+            "contributor": "",
+            "description": "Decouple policy logic from resource url for getSignedUrlWithCustomPolicy"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Batch",
+            "contributor": "",
+            "description": "This documentation-only update corrects some typos."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaLive",
+            "contributor": "",
+            "description": "Adds support for creating CloudWatchAlarmTemplates for AWS Elemental MediaTailor Playback Configuration resources."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EMR Containers",
+            "contributor": "",
+            "description": "EMR on EKS StartJobRun Api will be supporting the configuration of log storage in AWS by using \"managedLogs\" under \"MonitoringConfiguration\"."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,4 +1,25 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.30.23__ __2025-02-18__
+## __AWS Batch__
+  - ### Features
+    - This documentation-only update corrects some typos.
+
+## __AWS Elemental MediaLive__
+  - ### Features
+    - Adds support for creating CloudWatchAlarmTemplates for AWS Elemental MediaTailor Playback Configuration resources.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __Amazon Cloudfront__
+  - ### Bugfixes
+    - Decouple policy logic from resource url for getSignedUrlWithCustomPolicy
+
+## __Amazon EMR Containers__
+  - ### Features
+    - EMR on EKS StartJobRun Api will be supporting the configuration of log storage in AWS by using "managedLogs" under "MonitoringConfiguration".
+
 # __2.30.22__ __2025-02-17__
 ## __AWS Amplify__
   - ### 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.30.22</version>
+      <version>2.30.23</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.30.22</version>
+  <version>2.30.23</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.30.22</version>
+  <version>2.30.23</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.30.22</version>
+  <version>2.30.23</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</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.30.22</version>
+        <version>2.30.23</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

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

@@ -74,13 +74,14 @@ public static Metadata constructMetadata(ServiceModel serviceModel,
                 .withJsonVersion(serviceMetadata.getJsonVersion())
                 .withEndpointPrefix(serviceMetadata.getEndpointPrefix())
                 .withSigningName(serviceMetadata.getSigningName())
-                .withAuthType(AuthType.fromValue(serviceMetadata.getSignatureVersion()))
+                .withAuthType(serviceMetadata.getSignatureVersion() != null ?
+                              AuthType.fromValue(serviceMetadata.getSignatureVersion()) : null)
                 .withUid(serviceMetadata.getUid())
                 .withServiceId(serviceMetadata.getServiceId())
                 .withSupportsH2(supportsH2(serviceMetadata))
                 .withJsonVersion(getJsonVersion(metadata, serviceMetadata))
                 .withAwsQueryCompatible(serviceMetadata.getAwsQueryCompatible())
-                .withAuth(getAuthFromServiceMetadata(serviceMetadata, customizationConfig.useMultiAuth()));
+                .withAuth(getAuthFromServiceMetadata(serviceMetadata));
 
         return metadata;
     }
@@ -136,18 +137,14 @@ private static String getJsonVersion(Metadata metadata, ServiceMetadata serviceM
     }
 
     /**
-     * Converts service metadata into a list of AuthTypes. If useMultiAuth is enabled, then
-     * {@code metadata.auth} will be used in the conversion if present. Otherwise, use
-     * {@code metadata.signatureVersion}.
+     * Converts a list of authentication type strings from the given {@link ServiceMetadata} into a list of
+     * {@link AuthType} objects.
      */
-    private static List<AuthType> getAuthFromServiceMetadata(ServiceMetadata serviceMetadata,
-                                                             boolean useMultiAuth) {
-        if (useMultiAuth) {
-            List<String> serviceAuth = serviceMetadata.getAuth();
-            if (serviceAuth != null) {
-                return serviceAuth.stream().map(AuthType::fromValue).collect(Collectors.toList());
-            }
+    private static List<AuthType> getAuthFromServiceMetadata(ServiceMetadata serviceMetadata) {
+        List<String> serviceAuth = serviceMetadata.getAuth();
+        if (serviceAuth != null) {
+            return serviceAuth.stream().map(AuthType::fromValue).collect(Collectors.toList());
         }
-        return Collections.singletonList(AuthType.fromValue(serviceMetadata.getSignatureVersion()));
+        return Collections.emptyList();
     }
 }

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

@@ -47,14 +47,12 @@ final class AddOperations {
     private final NamingStrategy namingStrategy;
     private final Map<String, PaginatorDefinition> paginators;
     private final List<String> deprecatedShapes;
-    private final boolean useMultiAuth;
 
     AddOperations(IntermediateModelBuilder builder) {
         this.serviceModel = builder.getService();
         this.namingStrategy = builder.getNamingStrategy();
         this.paginators = builder.getPaginators().getPagination();
         this.deprecatedShapes = builder.getCustomConfig().getDeprecatedShapes();
-        this.useMultiAuth = builder.getCustomConfig().useMultiAuth();
     }
 
     private static boolean isAuthenticated(Operation op) {
@@ -182,6 +180,7 @@ public Map<String, OperationModel> constructOperations() {
             operationModel.setStaticContextParams(op.getStaticContextParams());
             operationModel.setOperationContextParams(op.getOperationContextParams());
             operationModel.setAuth(getAuthFromOperation(op));
+            operationModel.setUnsignedPayload(op.isUnsignedPayload());
 
             Input input = op.getInput();
             if (input != null) {
@@ -237,21 +236,23 @@ public Map<String, OperationModel> constructOperations() {
     }
 
     /**
-     * Returns the list of authTypes defined for an operation. If useMultiAuth is enabled, then
-     * {@code operation.auth} will be used in the conversion if present. Otherwise, use
-     * {@code operation.authtype} if present.
+     * Retrieves the list of {@link AuthType} for the given operation.
+     * <p>
+     * If {@link Operation#getAuth()}is available, it is converted to a list of {@link AuthType}.
+     * Otherwise, {@link Operation#getAuthtype()} is returned as a single-element list if present.
+     * If neither is available, an empty list is returned.
      */
     private List<AuthType> getAuthFromOperation(Operation op) {
-        if (useMultiAuth) {
-            List<String> opAuth = op.getAuth();
-            if (opAuth != null) {
-                return opAuth.stream().map(AuthType::fromValue).collect(Collectors.toList());
-            }
-        }
+
+        // First we check for legacy AuthType to support backward compatibility
         AuthType legacyAuthType = op.getAuthtype();
         if (legacyAuthType != null) {
             return Collections.singletonList(legacyAuthType);
         }
+        List<String> opAuth = op.getAuth();
+        if (opAuth != null) {
+            return opAuth.stream().map(AuthType::fromValue).collect(Collectors.toList());
+        }
         return Collections.emptyList();
     }
 

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

@@ -324,13 +324,6 @@ public class CustomizationConfig {
      */
     private String rootPackageName;
 
-    /**
-     * Set to true to read from c2j multi-auth values. Currently defaults to false.
-     *
-     * TODO(multi-auth): full multi-auth support is not implemented
-     */
-    private boolean useMultiAuth;
-
     /**
      * Special case for a service where model changes for endpoint params were not updated .
      * This should be removed once the service updates its models
@@ -891,14 +884,6 @@ public CustomizationConfig withRootPackageName(String packageName) {
         return this;
     }
 
-    public void setUseMultiAuth(boolean useMultiAuth) {
-        this.useMultiAuth = useMultiAuth;
-    }
-
-    public boolean useMultiAuth() {
-        return useMultiAuth;
-    }
-
     public Map<String, ParameterModel> getEndpointParameters() {
         return endpointParameters;
     }

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

@@ -87,6 +87,8 @@ public class OperationModel extends DocumentationModel {
     @JsonIgnore
     private Map<String, OperationContextParam> operationContextParams;
 
+    private boolean unsignedPayload;
+
     public String getOperationName() {
         return operationName;
     }
@@ -369,4 +371,12 @@ public Map<String, OperationContextParam> getOperationContextParams() {
     public void setOperationContextParams(Map<String, OperationContextParam> operationContextParams) {
         this.operationContextParams = operationContextParams;
     }
+
+    public boolean isUnsignedPayload() {
+        return unsignedPayload;
+    }
+
+    public void setUnsignedPayload(boolean unsignedPayload) {
+        this.unsignedPayload = unsignedPayload;
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/model/service/AuthType.java

@@ -24,6 +24,7 @@ public enum AuthType {
     CUSTOM("custom"),
     IAM("iam"),
     V4("v4"),
+    V4A("v4a"),
     V4_UNSIGNED_BODY("v4-unsigned-body"),
     S3("s3"),
     S3V4("s3v4"),
@@ -49,6 +50,8 @@ public static AuthType fromValue(String value) {
                 return NONE;
             case "aws.auth#sigv4":
                 return V4;
+            case "aws.auth#sigv4a":
+                return V4A;
             default:
                 String normalizedValue = StringUtils.lowerCase(value);
                 return Arrays.stream(values())