Merge branch 'main' into dependabot/maven/org.apache.logging.log4j-log4j-transform-maven-shade-plugin-extensions-0.2.0

Author: anafalcao

.github/workflows/check-build.yml

@@ -87,11 +87,19 @@ jobs:
           mvn -B -q install --file pom.xml
 
   graalvm-build:
-    runs-on: ubuntu-latest
+    runs-on: aws-powertools_ubuntu-latest_8-core
     steps:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
+        with:
+          files: |
+            powertools-*/**
       - name: Setup GraalVM
         uses: graalvm/setup-graalvm@7f488cf82a3629ee755e4e97342c01d6bed318fa # v1.3.5
         with:
@@ -100,18 +108,36 @@ jobs:
           cache: maven
       - id: graalvm-native-test
         name: GraalVM Native Test
+        if: steps.changed-files.outputs.any_changed == 'true'
+        env:
+          CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
         run: |
           # Build the entire project first to ensure test-jar dependencies are available
+          echo "::group::Building project dependencies"
           mvn -B -q install -DskipTests
+          echo "::endgroup::"
+          
+          echo "Changes detected in powertools modules: $CHANGED_FILES"
           
-          # Find modules with graalvm-native profile and run tests recursively.
-          # This will make sure to discover new GraalVM supported modules automatically in the future.
+          # Find modules with graalvm-native profile and run tests
           find . -name "pom.xml" -path "./powertools-*" | while read module; do
             if grep -q "<id>graalvm-native</id>" "$module"; then
               module_dir=$(dirname "$module")
-              echo "Regenerating GraalVM metadata for $module_dir"
-              mvn -B -q -f "$module" -Pgenerate-graalvm-files clean test
-              echo "Running GraalVM native tests for $module_dir"
-              mvn -B -q -f "$module" -Pgraalvm-native test
+              module_name=$(basename "$module_dir")
+              
+              # Check if this specific module or common dependencies changed
+              if echo "$CHANGED_FILES" | grep -q "$module_name/" || \
+                 echo " $CHANGED_FILES " | grep -q " pom.xml " || \
+                 echo "$CHANGED_FILES" | grep -q "powertools-common/"; then
+                echo "::group::Building $module_name with GraalVM"
+                echo "Changes detected in $module_name - running GraalVM tests"
+                echo "Regenerating GraalVM metadata for $module_dir"
+                mvn -B -q -f "$module" -Pgenerate-graalvm-files clean test
+                echo "Running GraalVM native tests for $module_dir"
+                mvn -B -q -f "$module" -Pgraalvm-native test
+                echo "::endgroup::"
+              else
+                echo "No changes detected in $module_name - skipping GraalVM tests"
+              fi
             fi
           done

.github/workflows/security-dependencies-check.yml

@@ -26,6 +26,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Verify Contents
-        uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2
+        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
         with:
           config-file: './.github/dependency-review-config.yml'

GraalVM.md

@@ -56,5 +56,31 @@ java.lang.InternalError: com.oracle.svm.core.jdk.UnsupportedFeatureError: Defini
 ```
    - This has been [fixed](https://github.com/apache/logging-log4j2/discussions/2364#discussioncomment-8950077) in Log4j 2.24.x. PT has been updated to use this version of Log4j 
 
+3. **Test Class Organization**
+   - **Issue**: Anonymous inner classes and lambda expressions in Mockito matchers cause `NoSuchMethodError` in GraalVM native tests
+   - **Solution**: 
+     - Extract static inner test classes to separate concrete classes in the same package as the class under test
+     - Replace lambda expressions in `ArgumentMatcher` with concrete implementations
+     - Use `mockito-subclass` dependency in GraalVM profiles
+   - **Example**: Replace `argThat(resp -> resp.getStatus() != expectedStatus)` with:
+   ```java
+   argThat(new ArgumentMatcher<Response>() {
+       @Override
+       public boolean matches(Response resp) {
+           return resp != null && resp.getStatus() != expectedStatus;
+       }
+   })
+   ```
+
+4. **Package Visibility Issues**
+   - **Issue**: Test handler classes cannot access package-private methods when placed in subpackages
+   - **Solution**: Place test handler classes in the same package as the class under test, not in subpackages like `handlers/`
+   - **Example**: Use `software.amazon.lambda.powertools.cloudformation` instead of `software.amazon.lambda.powertools.cloudformation.handlers`
+
+5. **Test Stubs Best Practice**
+   - **Best Practice**: Avoid mocking where possible and use concrete test stubs provided by `powertools-common` package
+   - **Solution**: Use `TestLambdaContext` and other test stubs from `powertools-common` test-jar instead of Mockito mocks
+   - **Implementation**: Add `powertools-common` test-jar dependency and replace `mock(Context.class)` with `new TestLambdaContext()`
+
 ## Reference Implementation
 Working example is available in the [examples](examples/powertools-examples-core-utilities/sam-graalvm). 

docs/utilities/validation.md

@@ -292,3 +292,53 @@ If you need to configure the Jackson ObjectMapper, you can use the `ValidationCo
        }
     }
     ```
+
+## Advanced
+
+### Lambda SnapStart priming
+
+The Validation utility integrates with AWS Lambda SnapStart to improve restore durations. To make sure the SnapStart priming logic of this utility runs correctly, you need an explicit reference to `ValidationConfig` in your code to allow the library to register before SnapStart takes a memory snapshot. Learn more about what priming is in this [blog post](https://aws.amazon.com/blogs/compute/optimizing-cold-start-performance-of-aws-lambda-using-advanced-priming-strategies-with-snapstart/){target="_blank"}.
+
+If you don't set a custom `ValidationConfig` in your code yet, make sure to reference `ValidationConfig` in your Lambda handler initialization code. This can be done by adding one of the following lines to your handler class:
+
+=== "Constructor"
+
+    ```java hl_lines="7"
+    import software.amazon.lambda.powertools.validation.Validation;
+    import software.amazon.lambda.powertools.validation.ValidationConfig;
+
+    public class MyFunctionHandler implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+
+        public MyFunctionHandler() {
+            ValidationConfig.get(); // Ensure ValidationConfig is loaded for SnapStart
+        }
+
+        @Override
+        @Validation(inboundSchema = "classpath:/schema_in.json", outboundSchema = "classpath:/schema_out.json")
+        public APIGatewayProxyResponseEvent handleRequest(APIGatewayProxyRequestEvent input, Context context) {
+            // ...
+            return something;
+        }
+    }
+    ```
+
+=== "Static Initializer"
+
+    ```java hl_lines="7"
+    import software.amazon.lambda.powertools.validation.Validation;
+    import software.amazon.lambda.powertools.validation.ValidationConfig;
+
+    public class MyFunctionHandler implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+
+        static {
+            ValidationConfig.get(); // Ensure ValidationConfig is loaded for SnapStart
+        }
+
+        @Override
+        @Validation(inboundSchema = "classpath:/schema_in.json", outboundSchema = "classpath:/schema_out.json")
+        public APIGatewayProxyResponseEvent handleRequest(APIGatewayProxyRequestEvent input, Context context) {
+            // ...
+            return something;
+        }
+    }
+    ```

examples/README.md

@@ -1,26 +1,35 @@
 #  Powertools for AWS Lambda (Java) Examples 
 
 This directory holds example projects demoing different components of the Powertools for AWS Lambda (Java).
+
 Each example can be copied from its subdirectory and used independently of the rest of this repository.
 
 ## Examples
 
 * [powertools-examples-core-utilities](powertools-examples-core-utilities) - Demonstrates the core logging, tracing, and metrics modules with different build tools and languages 
   * [CDK](./powertools-examples-core-utilities/cdk)
-  * [Gradle](./powertools-examples-core-utilities/gradle)
   * [SAM](./powertools-examples-core-utilities/sam) 
+  * [SAM GraalVM](./powertools-examples-core-utilities/sam-graalvm)
   * [Serverless](./powertools-examples-core-utilities/serverless)
+  * [Terraform](./powertools-examples-core-utilities/terraform)
+  * [Gradle](./powertools-examples-core-utilities/gradle)
   * [Kotlin](./powertools-examples-core-utilities/kotlin)
 * [powertools-examples-idempotency](powertools-examples-idempotency) - An idempotent HTTP API
+  * [SAM](./powertools-examples-idempotency/sam)
+  * [SAM GraalVM](./powertools-examples-idempotency/sam-graalvm)
 * [powertools-examples-parameters](powertools-examples-parameters) - Uses the parameters module to provide runtime parameters to a function
+  * [SAM](./powertools-examples-parameters/sam)
+  * [SAM GraalVM](./powertools-examples-parameters/sam-graalvm)
 * [powertools-examples-serialization](powertools-examples-serialization) - Uses the serialization module to serialize and deserialize API Gateway & SQS payloads
+  * [SAM](./powertools-examples-serialization/sam)
+  * [SAM GraalVM](./powertools-examples-serialization/sam-graalvm)
 * [powertools-examples-validation](powertools-examples-validation) - Uses the validation module to validate user requests received via API Gateway
 * [powertools-examples-cloudformation](powertools-examples-cloudformation) - Deploys a Cloudformation custom resource
 * [powertools-examples-batch](powertools-examples-batch) - Examples for each of the different batch processing deployments
+* [powertools-examples-kafka](powertools-examples-kafka) - Examples for Kafka event processing
 
 ## Working with AWS Serverless Application Model (SAM) Examples
-Many of the examples use [AWS Serverless Application Model](https://aws.amazon.com/serverless/sam/) (SAM). To get started
-with them, you can use the SAM Command Line Interface (SAM CLI) to build it and deploy an example to AWS. 
+Many of the examples use [AWS Serverless Application Model](https://aws.amazon.com/serverless/sam/) (SAM). To get started with them, you can use the SAM Command Line Interface (SAM CLI) to build it and deploy an example to AWS. 
 
 To use the SAM CLI, you need the following tools.
 
@@ -29,17 +38,13 @@ To use the SAM CLI, you need the following tools.
 * Maven - [Install Maven](https://maven.apache.org/install.html)
 * Docker - [Install Docker community edition](https://hub.docker.com/search/?type=edition&offering=community)
 
-To learn more about SAM, 
-[check out the developer guide](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/using-sam-cli.html).
-You can use the CLI to [test events locally](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/using-sam-cli-local-invoke.html),
-and [run the application locally](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/using-sam-cli-local-start-api.html),
-amongst other things.
+To learn more about SAM, [check out the developer guide](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/using-sam-cli.html). You can use the CLI to [test events locally](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/using-sam-cli-local-invoke.html), and [run the application locally](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/using-sam-cli-local-start-api.html), amongst other things.
 
 To build and deploy an example application for the first time, run the following in your shell:
 
 ```bash
 # Switch to the directory containing an example for the powertools-idempotency module
-$ cd powertools-examples-idempotency
+$ cd powertools-examples-idempotency/sam
 
 # Build and deploy the example
 $ sam build
@@ -56,7 +61,7 @@ The first command will build the source of your application. The second command
 
 You can find your API Gateway Endpoint URL in the output values displayed after deployment.
 
-If you're not using SAM, you can look for examples for other tools under [powertools-examples-core](./powertools-examples-core)
+If you're not using SAM, you can look for examples for other tools under [powertools-examples-core-utilities](./powertools-examples-core-utilities)
 
 ### External examples
 
@@ -69,10 +74,9 @@ You can find more examples in the https://github.com/aws/aws-sam-cli-app-templat
 
 ### SAM - Other Tools 
 
-If you prefer to use an integrated development environment (IDE) to build and test your application, you can use the AWS Toolkit.  
-The AWS Toolkit is an open source plug-in for popular IDEs that uses the SAM CLI to build and deploy serverless applications on AWS. The AWS Toolkit also adds a simplified step-through debugging experience for Lambda function code. See the following links to get started.
+If you prefer to use an integrated development environment (IDE) to build and test your application, you can use the AWS Toolkit. The AWS Toolkit is an open source plug-in for popular IDEs that uses the SAM CLI to build and deploy serverless applications on AWS. The AWS Toolkit also adds a simplified step-through debugging experience for Lambda function code. See the following links to get started.
 
 * [PyCharm](https://docs.aws.amazon.com/toolkit-for-jetbrains/latest/userguide/welcome.html)
 * [IntelliJ](https://docs.aws.amazon.com/toolkit-for-jetbrains/latest/userguide/welcome.html)
 * [VS Code](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/welcome.html)
-* [Visual Studio](https://docs.aws.amazon.com/toolkit-for-visual-studio/latest/user-guide/welcome.html)
+* [Visual Studio](https://docs.aws.amazon.com/toolkit-for-visual-studio/latest/user-guide/welcome.html)

examples/pom.xml

@@ -35,7 +35,8 @@
         <module>powertools-examples-core-utilities/cdk/infra</module>
         <module>powertools-examples-core-utilities/serverless</module>
         <module>powertools-examples-core-utilities/terraform</module>
-        <module>powertools-examples-idempotency</module>
+        <module>powertools-examples-idempotency/sam</module>
+        <module>powertools-examples-idempotency/sam-graalvm</module>
         <module>powertools-examples-parameters/sam</module>
         <module>powertools-examples-parameters/sam-graalvm</module>
         <module>powertools-examples-serialization/sam</module>

examples/powertools-examples-cloudformation/Makefile

@@ -0,0 +1,5 @@
+build-HelloWorldFunction:
+	chmod +x target/hello-world
+	cp target/hello-world $(ARTIFACTS_DIR) # (ARTIFACTS_DIR --> https://github.com/aws/aws-lambda-builders/blob/develop/aws_lambda_builders/workflows/custom_make/DESIGN.md#implementation)
+	chmod +x src/main/config/bootstrap
+	cp src/main/config/bootstrap $(ARTIFACTS_DIR)

examples/powertools-examples-cloudformation/infra/sam-graalvm/Dockerfile

@@ -0,0 +1,14 @@
+# Use the official AWS SAM base image for Java 21
+FROM public.ecr.aws/sam/build-java21@sha256:a5554d68374e19450c6c88448516ac95a9acedc779f318040f5c230134b4e461
+
+# Install GraalVM dependencies
+RUN curl -4 -L curl 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
+
+# Make native image and mvn available on CLI
+RUN ln -s /usr/lib/graalvm/bin/native-image /usr/bin/native-image
+RUN ln -s /usr/lib/maven/bin/mvn /usr/bin/mvn
+
+# Set GraalVM as default
+ENV JAVA_HOME=/usr/lib/graalvm
+ENV PATH=/usr/lib/graalvm/bin:$PATH

examples/powertools-examples-cloudformation/infra/sam-graalvm/README.md

@@ -0,0 +1,52 @@
+# Powertools for AWS Lambda (Java) - CloudFormation Custom Resource Example with SAM on GraalVM
+
+This project contains an example of a Lambda function using the CloudFormation module of Powertools for AWS Lambda (Java). For more information on this module, please refer to the [documentation](https://docs.powertools.aws.dev/lambda-java/utilities/custom_resources/).
+
+In this example you pass in a bucket name as a parameter and upon CloudFormation events a call is made to a lambda. That lambda attempts to create the bucket on CREATE events, create a new bucket if the name changes with an UPDATE event and delete the bucket upon DELETE events.
+
+Have a look at [App.java](../../src/main/java/helloworld/App.java) for the full details.
+
+## Build the sample application
+
+> [!NOTE]
+> Building AWS Lambda packages on macOS (ARM64/Intel) for deployment on AWS Lambda (Linux x86_64 or ARM64) will result in incompatible binary dependencies that cause import errors at runtime.
+
+Choose the appropriate build method based on your operating system:
+
+### Build locally using Docker
+
+Recommended for macOS and Windows users: Cross-compile using Docker to match target platform of Lambda:
+
+```shell
+docker build --platform linux/amd64 . -t powertools-examples-cloudformation-sam-graalvm
+docker run --platform linux/amd64 -it -v `pwd`/../..:`pwd`/../.. -w `pwd`/../.. -v ~/.m2:/root/.m2 powertools-examples-cloudformation-sam-graalvm mvn clean -Pnative-image package -DskipTests
+sam build --use-container --build-image powertools-examples-cloudformation-sam-graalvm
+```
+
+**Note**: The Docker run command mounts your local Maven cache (`~/.m2`) and builds the native binary with SNAPSHOT support, then SAM packages the pre-built binary.
+
+### Build on native OS
+
+For Linux users with GraalVM installed:
+
+```shell
+export JAVA_HOME=<path to GraalVM>
+cd ../..
+mvn clean -Pnative-image package -DskipTests
+cd infra/sam-graalvm
+sam build
+```
+
+## Deploy the sample application
+
+```shell
+sam deploy --guided --parameter-overrides BucketNameParam=my-unique-bucket-2.3.0718
+```
+
+This sample is based on Serverless Application Model (SAM). To deploy it, check out the instructions for getting started with SAM in [the examples directory](../../../README.md)
+
+## Test the application
+
+The CloudFormation custom resource will be triggered automatically during stack deployment. You can monitor the Lambda function execution in CloudWatch Logs to see the custom resource handling CREATE, UPDATE, and DELETE events for the S3 bucket.
+
+Check out [App.java](../../src/main/java/helloworld/App.java) to see how it works!

examples/powertools-examples-cloudformation/infra/sam-graalvm/template.yaml

@@ -0,0 +1,49 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+  powertools-examples-cloudformation-graalvm
+
+  Sample SAM Template for powertools-examples-cloudformation with GraalVM native image
+
+Globals:
+  Function:
+    Timeout: 20
+
+Parameters:
+  BucketNameParam:
+    Type: String
+
+Resources:
+  HelloWorldCustomResource:
+    Type: AWS::CloudFormation::CustomResource
+    Properties:
+      ServiceToken: !GetAtt HelloWorldFunction.Arn
+      BucketName: !Ref BucketNameParam
+
+  HelloWorldFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: ../../
+      Handler: helloworld.App::handleRequest
+      Runtime: provided.al2023
+      Architectures:
+        - x86_64
+      MemorySize: 512
+      Policies:
+        - Statement:
+            - Sid: bucketaccess1
+              Effect: Allow
+              Action:
+                - s3:GetLifecycleConfiguration
+                - s3:PutLifecycleConfiguration
+                - s3:CreateBucket
+                - s3:ListBucket
+                - s3:DeleteBucket
+              Resource: '*'
+    Metadata:
+      BuildMethod: makefile
+
+Outputs:
+  HelloWorldFunction:
+    Description: "Hello World Lambda Function ARN"
+    Value: !GetAtt HelloWorldFunction.Arn