Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/check-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@ jobs:
environment: E2E
strategy:
fail-fast: false
max-parallel: 3
max-parallel: 4
matrix:
java:
- 11
- 17
- 21
- 25

steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
Expand Down Expand Up @@ -81,12 +82,10 @@ jobs:
environment: E2E
strategy:
fail-fast: false
max-parallel: 3
max-parallel: 1
matrix:
java:
- 11
- 17
- 21
- 25

steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,18 @@
"fields":[{"name":"theUnsafe"}]
},
{
"name":"com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name": "tenantId"}, {"name":"content"}],
"allPublicMethods":true
"name": "com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields": [
{ "name": "id" },
{ "name": "invokedFunctionArn" },
{ "name": "deadlineTimeInMs" },
{ "name": "xrayTraceId" },
{ "name": "clientContext" },
{ "name": "cognitoIdentity" },
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true,
"unsafeAllocated": true
}
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,18 @@
"fields":[{"name":"theUnsafe"}]
},
{
"name":"com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name": "tenantId"}, {"name":"content"}],
"allPublicMethods":true
"name": "com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields": [
{ "name": "id" },
{ "name": "invokedFunctionArn" },
{ "name": "deadlineTimeInMs" },
{ "name": "xrayTraceId" },
{ "name": "clientContext" },
{ "name": "cognitoIdentity" },
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true,
"unsafeAllocated": true
}
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,18 @@
"fields":[{"name":"theUnsafe"}]
},
{
"name":"com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name": "tenantId"}, {"name":"content"}],
"allPublicMethods":true
"name": "com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields": [
{ "name": "id" },
{ "name": "invokedFunctionArn" },
{ "name": "deadlineTimeInMs" },
{ "name": "xrayTraceId" },
{ "name": "clientContext" },
{ "name": "cognitoIdentity" },
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true,
"unsafeAllocated": true
}
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,18 @@
"fields":[{"name":"theUnsafe"}]
},
{
"name":"com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name": "tenantId"}, {"name":"content"}],
"allPublicMethods":true
"name": "com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields": [
{ "name": "id" },
{ "name": "invokedFunctionArn" },
{ "name": "deadlineTimeInMs" },
{ "name": "xrayTraceId" },
{ "name": "clientContext" },
{ "name": "cognitoIdentity" },
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true,
"unsafeAllocated": true
}
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,19 @@
"fields":[{"name":"theUnsafe"}]
},
{
"name":"com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields":[{"name":"id"}, {"name":"invokedFunctionArn"}, {"name":"deadlineTimeInMs"}, {"name":"xrayTraceId"}, {"name":"clientContext"}, {"name":"cognitoIdentity"}, {"name": "tenantId"}, {"name":"content"}],
"allPublicMethods":true
"name": "com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto.InvocationRequest",
"fields": [
{ "name": "id" },
{ "name": "invokedFunctionArn" },
{ "name": "deadlineTimeInMs" },
{ "name": "xrayTraceId" },
{ "name": "clientContext" },
{ "name": "cognitoIdentity" },
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true,
"unsafeAllocated": true
},
{
"name":"software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true
"allPublicMethods": true,
"unsafeAllocated": true
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true
"allPublicMethods": true,
"unsafeAllocated": true
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true
"allPublicMethods": true,
"unsafeAllocated": true
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true
"allPublicMethods": true,
"unsafeAllocated": true
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true
"allPublicMethods": true,
"unsafeAllocated": true
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true
"allPublicMethods": true,
"unsafeAllocated": true
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true
"allPublicMethods": true,
"unsafeAllocated": true
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true
"allPublicMethods": true,
"unsafeAllocated": true
}
]
9 changes: 9 additions & 0 deletions powertools-e2e-tests/handlers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,15 @@
<aspectj.version>1.9.21</aspectj.version>
</properties>
</profile>
<profile>
<id>jdk25</id>
<activation>
<jdk>[25,)</jdk>
</activation>
<properties>
<aspectj.version>1.9.25</aspectj.version>
</properties>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
{ "name": "tenantId" },
{ "name": "content" }
],
"allPublicMethods": true
"allPublicMethods": true,
"unsafeAllocated": true
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ private Stack createStackWithLambda() {
.create(e2eStack, functionName + "-logs")
.logGroupName("/aws/lambda/" + functionName)
.retention(RetentionDays.ONE_DAY)
.removalPolicy(RemovalPolicy.DESTROY)
.removalPolicy(RemovalPolicy.RETAIN)
.build();

if (!StringUtils.isEmpty(idempotencyTable)) {
Expand Down Expand Up @@ -522,6 +522,8 @@ private JavaRuntime mapRuntimeVersion(String environmentVariableName) {
ret = JavaRuntime.JAVA17;
} else if (javaVersion.startsWith("21")) {
ret = JavaRuntime.JAVA21;
} else if (javaVersion.startsWith("25")) {
ret = JavaRuntime.JAVA25;
} else {
throw new IllegalArgumentException("Unsupported Java version " + javaVersion);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
public enum JavaRuntime {
JAVA11("java11", Runtime.JAVA_11, "11"),
JAVA17("java17", Runtime.JAVA_17, "17"),
JAVA21("java21", Runtime.JAVA_21, "21");
JAVA21("java21", Runtime.JAVA_21, "21"),
JAVA25("java25", Runtime.JAVA_25, "25");

private final String runtime;
private final Runtime cdkRuntime;
Expand Down
8 changes: 4 additions & 4 deletions powertools-e2e-tests/src/test/resources/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Use the official AWS SAM base image for Java 21
FROM public.ecr.aws/sam/build-java21@sha256:ced538830c78a0f45f91abe5f7963cb73005ad933aee7dd1160bd77d9fd3c4f3
# Use the official AWS SAM base image for Java 25
FROM public.ecr.aws/sam/build-java25@sha256:2ef9e5b950cc79489691be16c7edff904bf196955633dc7fbbc282a1ea421ba8

# Install GraalVM dependencies
RUN curl -4 -L https://download.oracle.com/graalvm/21/latest/graalvm-jdk-21_linux-x64_bin.tar.gz | tar -xvz
RUN mv graalvm-jdk-21.* /usr/lib/graalvm
RUN curl -4 -L https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_linux-x64_bin.tar.gz | tar -xvz
RUN mv graalvm-jdk-25.* /usr/lib/graalvm

# Make native image and mvn available on CLI
RUN ln -s /usr/lib/graalvm/bin/native-image /usr/bin/native-image
Expand Down
Loading