Merge branch 'main' into modules

Author: SentryMan

.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 }}

.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 }}

.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
-

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>
 ```
 

aws-lambda-java-events/README.md

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

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))

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>

aws-lambda-java-events/src/main/java/com/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;
     }
 }

aws-lambda-java-events/src/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;
 
 }

aws-lambda-java-runtime-interface-client/pom.xml

@@ -87,6 +87,12 @@
             <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>4.11.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>