Skip to content

Commit befa67d

Browse files
godcrampygodcrampy
authored
fix: update CognitoUserPoolPreTokenGenerationEventV2 response model (#519)
1 parent 0fe7f67 commit befa67d

File tree

14 files changed

+51
-16
lines changed

14 files changed

+51
-16
lines changed

‎.github/workflows/samples.yml

+16-3
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,24 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- uses: actions/checkout@v4
43-
- uses: actions/setup-java@v4
43+
# Set up both Java 8 and 21
44+
- name: Set up Java 8 and 21
45+
uses: actions/setup-java@v4
4446
with:
45-
java-version: 21
47+
java-version: |
48+
8
49+
21
4650
distribution: corretto
51+
52+
# Install events module using Java 8
53+
- name: Install events with Maven
54+
run: |
55+
export JAVA_HOME=$JAVA_HOME_8_X64
56+
mvn -B clean install \
57+
-Dmaven.compiler.source=1.8 \
58+
-Dmaven.compiler.target=1.8 \
59+
--file aws-lambda-java-events/pom.xml
60+
4761
# Build custom-serialization samples
4862
- name: install sam
4963
uses: aws-actions/setup-sam@v2
@@ -57,4 +71,3 @@ jobs:
5771
run: cd samples/custom-serialization/moshi && sam build && sam local invoke -e events/event.json | grep 200
5872
- name: test request-stream-handler
5973
run: cd samples/custom-serialization/request-stream-handler && sam build && sam local invoke -e events/event.json | grep 200
60-

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class SqsHandler implements RequestHandler<SQSEvent, String> {
7575
<dependency>
7676
<groupId>com.amazonaws</groupId>
7777
<artifactId>aws-lambda-java-events</artifactId>
78-
<version>3.14.0</version>
78+
<version>3.15.0</version>
7979
</dependency>
8080
```
8181

‎aws-lambda-java-events/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
* `CognitoUserPoolPreAuthenticationEvent`
3232
* `CognitoUserPoolPreSignUpEvent`
3333
* `CognitoUserPoolPreTokenGenerationEvent`
34+
* `CognitoUserPoolPreTokenGenerationEventV2`
3435
* `CognitoUserPoolVerifyAuthChallengeResponseEvent`
3536
* `ConfigEvent`
3637
* `ConnectEvent`
@@ -73,7 +74,7 @@
7374
<dependency>
7475
<groupId>com.amazonaws</groupId>
7576
<artifactId>aws-lambda-java-events</artifactId>
76-
<version>3.14.0</version>
77+
<version>3.15.0</version>
7778
</dependency>
7879
...
7980
</dependencies>

‎aws-lambda-java-events/RELEASE.CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### January 31, 2025
2+
`3.15.0`:
3+
- Fix `CognitoUserPoolPreTokenGenerationEventV2` model ([#519](https://github.com/aws/aws-lambda-java-libs/pull/519))
4+
15
### September 13, 2024
26
`3.14.0`:
37
- 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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.amazonaws</groupId>
77
<artifactId>aws-lambda-java-events</artifactId>
8-
<version>3.14.0</version>
8+
<version>3.15.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>AWS Lambda Java Events Library</name>

‎aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolPreTokenGenerationEventV2.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ public static class AccessTokenGeneration {
127127
@Builder(setterPrefix = "with")
128128
@NoArgsConstructor
129129
public static class GroupOverrideDetails {
130-
private Map<String, String> groupsToOverride;
131-
private Map<String, String> iamRolesToOverride;
130+
private String[] groupsToOverride;
131+
private String[] iamRolesToOverride;
132132
private String preferredRole;
133133
}
134134
}

‎aws-lambda-java-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.amazonaws</groupId>
4747
<artifactId>aws-lambda-java-events</artifactId>
48-
<version>3.14.0</version>
48+
<version>3.15.0</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.junit.jupiter</groupId>

‎aws-lambda-java-tests/src/test/java/com/amazonaws/services/lambda/runtime/tests/EventLoaderTest.java

+11
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,17 @@ public void testLoadCognitoUserPoolPreTokenGenerationEventV2() {
418418
CognitoUserPoolPreTokenGenerationEventV2.Request request = event.getRequest();
419419
String[] requestScopes = request.getScopes();
420420
assertThat("aws.cognito.signin.user.admin").isEqualTo(requestScopes[0]);
421+
422+
CognitoUserPoolPreTokenGenerationEventV2.Response response = event.getResponse();
423+
String[] groupsToOverride = response.getClaimsAndScopeOverrideDetails().getGroupOverrideDetails().getGroupsToOverride();
424+
String[] iamRolesToOverride = response.getClaimsAndScopeOverrideDetails().getGroupOverrideDetails().getIamRolesToOverride();
425+
String preferredRole = response.getClaimsAndScopeOverrideDetails().getGroupOverrideDetails().getPreferredRole();
426+
427+
assertThat("group-99").isEqualTo(groupsToOverride[0]);
428+
assertThat("group-98").isEqualTo(groupsToOverride[1]);
429+
assertThat("arn:aws:iam::123456789012:role/sns_caller99").isEqualTo(iamRolesToOverride[0]);
430+
assertThat("arn:aws:iam::123456789012:role/sns_caller98").isEqualTo(iamRolesToOverride[1]);
431+
assertThat("arn:aws:iam::123456789012:role/sns_caller_99").isEqualTo(preferredRole);
421432
}
422433

423434
@Test

‎aws-lambda-java-tests/src/test/resources/cognito_user_pool_pre_token_generation_event_v2.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,19 @@
2121
"groupConfiguration": {
2222
"groupsToOverride": ["group-1", "group-2", "group-3"],
2323
"iamRolesToOverride": ["arn:aws:iam::123456789012:role/sns_caller1", "arn:aws:iam::123456789012:role/sns_caller2", "arn:aws:iam::123456789012:role/sns_caller3"],
24-
"preferredRole": ["arn:aws:iam::123456789012:role/sns_caller"]
24+
"preferredRole": "arn:aws:iam::123456789012:role/sns_caller"
2525
},
2626
"scopes": [
2727
"aws.cognito.signin.user.admin", "openid", "email", "phone"
2828
]
2929
},
3030
"response": {
31-
"claimsAndScopeOverrideDetails": []
31+
"claimsAndScopeOverrideDetails": {
32+
"groupOverrideDetails": {
33+
"groupsToOverride": ["group-99", "group-98"],
34+
"iamRolesToOverride": ["arn:aws:iam::123456789012:role/sns_caller99", "arn:aws:iam::123456789012:role/sns_caller98"],
35+
"preferredRole": "arn:aws:iam::123456789012:role/sns_caller_99"
36+
}
37+
}
3238
}
3339
}

‎samples/custom-serialization/fastJson/HelloWorldFunction/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>com.amazonaws</groupId>
2222
<artifactId>aws-lambda-java-events</artifactId>
23-
<version>3.14.0</version>
23+
<version>3.15.0</version>
2424
</dependency>
2525

2626
<dependency>

‎samples/custom-serialization/gson/HelloWorldFunction/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>com.amazonaws</groupId>
2222
<artifactId>aws-lambda-java-events</artifactId>
23-
<version>3.14.0</version>
23+
<version>3.15.0</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>com.google.code.gson</groupId>

‎samples/custom-serialization/moshi/HelloWorldFunction/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>com.amazonaws</groupId>
2222
<artifactId>aws-lambda-java-events</artifactId>
23-
<version>3.14.0</version>
23+
<version>3.15.0</version>
2424
</dependency>
2525

2626
<dependency>

‎samples/custom-serialization/request-stream-handler/HelloWorldFunction/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>com.amazonaws</groupId>
2222
<artifactId>aws-lambda-java-events</artifactId>
23-
<version>3.14.0</version>
23+
<version>3.15.0</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>com.google.code.gson</groupId>

‎samples/kinesis-firehose-event-handler/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>com.amazonaws</groupId>
4848
<artifactId>aws-lambda-java-events</artifactId>
49-
<version>3.14.0</version>
49+
<version>3.15.0</version>
5050
</dependency>
5151

5252
<dependency>

0 commit comments

Comments
 (0)