Merge branch 'main' into develop

aws · Feb 17, 2025 · a52db3a · a52db3a
2 parents e8852a0 + cfb3ece
commit a52db3a
Show file tree

Hide file tree

Showing 19 changed files with 65 additions and 20 deletions.
diff --git a/.github/workflows/runtime-interface-client_merge_to_main.yml b/.github/workflows/runtime-interface-client_merge_to_main.yml
@@ -86,6 +86,6 @@ jobs:
 
     - name: Upload coverage to Codecov
       if: env.CODECOV_TOKEN != null
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/runtime-interface-client_pr.yml b/.github/workflows/runtime-interface-client_pr.yml
@@ -65,6 +65,6 @@ jobs:
 
     - name: Upload coverage to Codecov
       if: env.CODECOV_TOKEN != null
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml
@@ -40,10 +40,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      # Set up both Java 8 and 21
+      - name: Set up Java 8 and 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: |
+            8
+            21
           distribution: corretto
+
+      # Install events module using Java 8
+      - name: Install events with Maven
+        run: |
+          export JAVA_HOME=$JAVA_HOME_8_X64
+          mvn -B clean install \
+          -Dmaven.compiler.source=1.8 \
+          -Dmaven.compiler.target=1.8 \
+          --file aws-lambda-java-events/pom.xml
+
       # Build custom-serialization samples
       - name: install sam
         uses: aws-actions/setup-sam@v2
@@ -57,4 +71,3 @@ jobs:
         run: cd samples/custom-serialization/moshi && sam build && sam local invoke -e events/event.json | grep 200
       - name: test request-stream-handler
         run: cd samples/custom-serialization/request-stream-handler && sam build && sam local invoke -e events/event.json | grep 200
-
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ public class SqsHandler implements RequestHandler<SQSEvent, String> {
 <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-lambda-java-events</artifactId>
- <version>3.14.0</version>
+ <version>3.15.0</version>
 </dependency>
 ```
 

diff --git a/aws-lambda-java-events/README.md b/aws-lambda-java-events/README.md
@@ -31,6 +31,7 @@
 * `CognitoUserPoolPreAuthenticationEvent`
 * `CognitoUserPoolPreSignUpEvent`
 * `CognitoUserPoolPreTokenGenerationEvent`
+* `CognitoUserPoolPreTokenGenerationEventV2`
 * `CognitoUserPoolVerifyAuthChallengeResponseEvent`
 * `ConfigEvent`
 * `ConnectEvent`
@@ -74,7 +75,7 @@
     <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-lambda-java-events</artifactId>
-        <version>3.14.0</version>
+        <version>3.15.0</version>
     </dependency>
     ...
 </dependencies>

diff --git a/aws-lambda-java-events/RELEASE.CHANGELOG.md b/aws-lambda-java-events/RELEASE.CHANGELOG.md
@@ -1,3 +1,9 @@
+### January 31, 2025
+`3.15.0`:
+- Fix `CognitoUserPoolPreTokenGenerationEventV2` model ([#519](https://github.com/aws/aws-lambda-java-libs/pull/519))
+- Add RotationToken to SecretsManagerRotationEvent ([#520](https://github.com/aws/aws-lambda-java-libs/pull/520))
+
+
 ### September 13, 2024
 `3.14.0`:
 - Fix name of s3Bucket field of Task class in S3BatchEventV2 ([#506](https://github.com/aws/aws-lambda-java-libs/pull/506))

diff --git a/aws-lambda-java-events/pom.xml b/aws-lambda-java-events/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-lambda-java-events</artifactId>
-    <version>3.14.0</version>
+    <version>3.15.0</version>
     <packaging>jar</packaging>
 
     <name>AWS Lambda Java Events Library</name>

diff --git a/...om/amazonaws/services/lambda/runtime/events/CognitoUserPoolPreTokenGenerationEventV2.java b/...om/amazonaws/services/lambda/runtime/events/CognitoUserPoolPreTokenGenerationEventV2.java
@@ -127,8 +127,8 @@ public static class AccessTokenGeneration {
     @Builder(setterPrefix = "with")
     @NoArgsConstructor
     public static class GroupOverrideDetails {
-        private Map<String, String> groupsToOverride;
-        private Map<String, String> iamRolesToOverride;
+        private String[] groupsToOverride;
+        private String[] iamRolesToOverride;
         private String preferredRole;
     }
 }
diff --git a/...c/main/java/com/amazonaws/services/lambda/runtime/events/SecretsManagerRotationEvent.java b/...c/main/java/com/amazonaws/services/lambda/runtime/events/SecretsManagerRotationEvent.java
@@ -35,5 +35,6 @@ public class SecretsManagerRotationEvent {
     private String step;
     private String secretId;
     private String clientRequestToken;
+    private String rotationToken;
 
 }
diff --git a/...services/lambda/runtime/serialization/events/mixins/SecretsManagerRotationEventMixin.java b/...services/lambda/runtime/serialization/events/mixins/SecretsManagerRotationEventMixin.java
@@ -21,4 +21,8 @@ public abstract class SecretsManagerRotationEventMixin {
     // needed because Jackson expects "clientRequestToken" instead of "ClientRequestToken"
     @JsonProperty("ClientRequestToken") abstract String getClientRequestToken();
     @JsonProperty("ClientRequestToken") abstract void setClientRequestToken(String clientRequestToken);
+
+    // needed because Jackson expects "rotationToken" instead of "RotationToken"
+    @JsonProperty("RotationToken") abstract String getRotationToken();
+    @JsonProperty("RotationToken") abstract void setRotationToken(String rotationToken);
 }
diff --git a/aws-lambda-java-tests/pom.xml b/aws-lambda-java-tests/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>3.14.0</version>
+            <version>3.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/...java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/EventLoaderTest.java b/...java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/EventLoaderTest.java
@@ -369,7 +369,9 @@ public void testLoadSecretsManagerRotationEvent() {
         assertThat(event)
                 .returns("123e4567-e89b-12d3-a456-426614174000", from(SecretsManagerRotationEvent::getClientRequestToken))
                 .returns("arn:aws:secretsmanager:eu-central-1:123456789012:secret:/powertools/secretparam-xBPaJ5", from(SecretsManagerRotationEvent::getSecretId))
-                .returns("CreateSecret", from(SecretsManagerRotationEvent::getStep));
+                .returns("CreateSecret", from(SecretsManagerRotationEvent::getStep))
+                .returns("8a4cc1ac-82ea-47c7-bd9f-aeb370b1b6a6", from(SecretsManagerRotationEvent::getRotationToken));
+;
     }
 
     @Test
@@ -435,6 +437,17 @@ public void testLoadCognitoUserPoolPreTokenGenerationEventV2() {
         CognitoUserPoolPreTokenGenerationEventV2.Request request = event.getRequest();
         String[] requestScopes = request.getScopes();
         assertThat("aws.cognito.signin.user.admin").isEqualTo(requestScopes[0]);
+
+        CognitoUserPoolPreTokenGenerationEventV2.Response response = event.getResponse();
+        String[] groupsToOverride = response.getClaimsAndScopeOverrideDetails().getGroupOverrideDetails().getGroupsToOverride();
+        String[] iamRolesToOverride = response.getClaimsAndScopeOverrideDetails().getGroupOverrideDetails().getIamRolesToOverride();
+        String preferredRole = response.getClaimsAndScopeOverrideDetails().getGroupOverrideDetails().getPreferredRole();
+
+        assertThat("group-99").isEqualTo(groupsToOverride[0]);
+        assertThat("group-98").isEqualTo(groupsToOverride[1]);
+        assertThat("arn:aws:iam::123456789012:role/sns_caller99").isEqualTo(iamRolesToOverride[0]);
+        assertThat("arn:aws:iam::123456789012:role/sns_caller98").isEqualTo(iamRolesToOverride[1]);
+        assertThat("arn:aws:iam::123456789012:role/sns_caller_99").isEqualTo(preferredRole);
     }
 
     @Test

diff --git a/...lambda-java-tests/src/test/resources/cognito_user_pool_pre_token_generation_event_v2.json b/...lambda-java-tests/src/test/resources/cognito_user_pool_pre_token_generation_event_v2.json
@@ -21,13 +21,19 @@
         "groupConfiguration": {
             "groupsToOverride": ["group-1", "group-2", "group-3"],
             "iamRolesToOverride": ["arn:aws:iam::123456789012:role/sns_caller1", "arn:aws:iam::123456789012:role/sns_caller2", "arn:aws:iam::123456789012:role/sns_caller3"],
-            "preferredRole": ["arn:aws:iam::123456789012:role/sns_caller"]
+            "preferredRole": "arn:aws:iam::123456789012:role/sns_caller"
         },
         "scopes": [
             "aws.cognito.signin.user.admin", "openid", "email", "phone"
         ]
     },
     "response": {
-        "claimsAndScopeOverrideDetails": []
+        "claimsAndScopeOverrideDetails": {
+            "groupOverrideDetails": {
+                "groupsToOverride": ["group-99", "group-98"],
+                "iamRolesToOverride": ["arn:aws:iam::123456789012:role/sns_caller99", "arn:aws:iam::123456789012:role/sns_caller98"],
+                "preferredRole": "arn:aws:iam::123456789012:role/sns_caller_99"
+            }
+        }
     }
 }
diff --git a/aws-lambda-java-tests/src/test/resources/secrets_rotation_event.json b/aws-lambda-java-tests/src/test/resources/secrets_rotation_event.json
@@ -1,5 +1,6 @@
 {
   "Step" : "CreateSecret",
   "SecretId" : "arn:aws:secretsmanager:eu-central-1:123456789012:secret:/powertools/secretparam-xBPaJ5",
-  "ClientRequestToken" : "123e4567-e89b-12d3-a456-426614174000"
+  "ClientRequestToken" : "123e4567-e89b-12d3-a456-426614174000",
+  "RotationToken": "8a4cc1ac-82ea-47c7-bd9f-aeb370b1b6a6"
 }
diff --git a/samples/custom-serialization/fastJson/HelloWorldFunction/pom.xml b/samples/custom-serialization/fastJson/HelloWorldFunction/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>3.14.0</version>
+            <version>3.15.0</version>
         </dependency>
 
         <dependency>

diff --git a/samples/custom-serialization/gson/HelloWorldFunction/pom.xml b/samples/custom-serialization/gson/HelloWorldFunction/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
           <groupId>com.amazonaws</groupId>
           <artifactId>aws-lambda-java-events</artifactId>
-          <version>3.14.0</version>
+          <version>3.15.0</version>
         </dependency>
         <dependency>
           <groupId>com.google.code.gson</groupId>

diff --git a/samples/custom-serialization/moshi/HelloWorldFunction/pom.xml b/samples/custom-serialization/moshi/HelloWorldFunction/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>3.14.0</version>
+            <version>3.15.0</version>
         </dependency>
 
         <dependency>

diff --git a/samples/custom-serialization/request-stream-handler/HelloWorldFunction/pom.xml b/samples/custom-serialization/request-stream-handler/HelloWorldFunction/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
           <groupId>com.amazonaws</groupId>
           <artifactId>aws-lambda-java-events</artifactId>
-          <version>3.14.0</version>
+          <version>3.15.0</version>
         </dependency>
         <dependency>
           <groupId>com.google.code.gson</groupId>

diff --git a/samples/kinesis-firehose-event-handler/pom.xml b/samples/kinesis-firehose-event-handler/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>3.14.0</version>
+            <version>3.15.0</version>
         </dependency>
 
         <dependency>