Created infrastructure for java21 (#53)

* Initial Java 21 changes

* Updating workflows

* Fixing tests. Commenting out right now "allowAllOutbound" as this should be configured in the provided securityGroups

* Created infrastructure for java21

* Run CDK in java 21 with image `ghcr.io/muhamadto/spring-native-amazonlinux2-builder:21-amazonlinux2`
* Replaced `com.coffeebeans.springnativeawslambda.infra.lambda.CustomRuntime2Function` with `com.coffeebeans.springnativeawslambda.infra.lambda.CustomRuntime2023FunctionJava21` and updated tests.
* `docker-compose.yml` now adopting `apigateway` functions from `ghcr.io/muhamadto/spring-native-amazonlinux2-builder:21-amazonlinux2-awscliv2`. However, the lambda is not loading and need some more work.
* Reinstated `native:compile` in `prepare-package` phase. This is to ensure the `spring-native-aws-lambda-function-native-zip.zip` include would include the `spring-native-aws-lambda-function` native executable.

Signed-off-by: matto <muhamadto@gmail.com>

* Updated README.md

Signed-off-by: matto <muhamadto@gmail.com>

* Fixed apigateway to lambda integration

Signed-off-by: matto <muhamadto@gmail.com>

---------

Signed-off-by: matto <muhamadto@gmail.com>
Co-authored-by: Andres <andresoviedo00@gmail.com>

Author: muhamadto

.dockerignore

@@ -2,6 +2,8 @@
 .idea/
 badges/
 **/target/
+cdk.out/
+volume/
 .gitignore
 CODE_OF_CONDUCT.md
 HELP.md

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/muhamadto/spring-native-amazonlinux2-builder:20-amazonlinux2
+      image: ghcr.io/muhamadto/spring-native-amazonlinux2-builder:21-amazonlinux2
       options: --user=worker:ci
     permissions:
       id-token: write
@@ -42,6 +42,7 @@ jobs:
           duration_seconds: 3600
           role-session-name: github-actions-example-lambda
           aws-region: ap-southeast-2
+          mask-aws-account-id: 'true'
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Cache Maven packages
@@ -56,14 +57,16 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           ENV: ${{ env.ENV }}
           COST_CENTRE: ${{ env.COST_CENTRE }}
-        run: ./mvnw -ntp -Pnative clean package -DskipTests=true
+        run: |
+          ./mvnw -ntp clean verify -DskipTests -pl spring-native-aws-lambda-infra
+          ./mvnw -ntp clean -Pnative -DskipTests native:compile package -pl spring-native-aws-lambda-function
       - name: cdk diff
-        uses: muhamadto/aws-cdk-github-actions@v3
+        uses: muhamadto/aws-cdk-github-actions@v5
         with:
           cdk_subcommand: 'diff'
           actions_comment: false
       - name: cdk deploy
-        uses: muhamadto/aws-cdk-github-actions@v3
+        uses: muhamadto/aws-cdk-github-actions@v5
         with:
           cdk_subcommand: 'deploy'
           cdk_args: '--require-approval never'

.gitignore

@@ -1,7 +1,7 @@
-target/
-!spring-native-aws-lambda-function/.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
+**/target/
+cdk.out/
+volume/
+**/maven-wrapper.jar
 
 ### STS ###
 .apt_generated
@@ -30,5 +30,3 @@ build/
 
 ### VS Code ###
 .vscode/
-
-**/maven-wrapper.jar

README.md

@@ -11,17 +11,17 @@
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=muhamadto_spring-native-aws-lambda&metric=bugs)](https://sonarcloud.io/summary/new_code?id=muhamadto_spring-native-aws-lambda)
 [![SonarCloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=muhamadto_spring-native-aws-lambda&metric=coverage)](https://sonarcloud.io/component_measures?id=muhamadto_spring-native-aws-lambda&metric=new_coverage&view=list)
 
-| Component     | Version  |
-|---------------|----------|
-| JDK           | 20       |
-| Spring Cloud  | 2022.0.1 |
-| Spring Boot   | 3.1.2    |
+| Component    | Version  |
+|--------------|----------|
+| JDK          | 21       |
+| Spring Cloud | 2023.0.0 |
+| Spring Boot  | 3.2.1    |
 
 ## Test
 
 ```bash
-$ sdk use java 22.2.r17-grl
-$ ./mvnw -ntp clean verify -U --settings ./settings-spring.xml
+$ sdk use java 21.0.1-graal
+$ ./mvnw -ntp clean verify -U
 ```
 
 ## Building and Running
@@ -33,12 +33,30 @@ $ ./mvnw -ntp clean verify -U --settings ./settings-spring.xml
    ```shell
    $ docker-compose up
    ```
+2. Make a call
+    ```shell
+   $ curl --location --request POST 'http://localhost:4566/restapis/<restApiId>/compose/_user_request_/somePathId' \
+   --header 'Content-Type: application/json' \
+   --data-raw '{
+        "body": "{ \"name\": \"CoffeeBeans\" }"
+      }'
+    ```
+   The service responds
+   ```json
+   [
+       {
+           "name": "CoffeeBeans",
+           "saved": true
+       }
+   ]
+   ```
 
 #### Using `mvnw`
-1. Set `spring.main.web-application-type` to `servlet` for local development
-2. Run the following commands
+
+1. Run the following commands
     ```shell
-    $ ./mvnw -ntp clean -Pnative -DskipTests native:compile package -pl spring-native-aws-lambda-function  --settings ./settings-spring.xml
+    $ export SPRING_PROFILES_ACTIVE=local
+    $ ./mvnw -ntp clean -Pnative -DskipTests native:compile package -pl spring-native-aws-lambda-function
     $ ./spring-native-aws-lambda-function/target/spring-native-aws-lambda-function
     ```
    The service starts in less than 100 ms
@@ -54,12 +72,12 @@ $ ./mvnw -ntp clean verify -U --settings ./settings-spring.xml
    2022-12-07 02:56:51.763  INFO 42417 --- [           main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 8080 (http) with context path ''
    2022-12-07 02:56:51.763  INFO 42417 --- [           main] c.c.s.Application   : Started Application in 0.084 seconds (JVM running for 0.087)
    ```
-3. Make a call
+2. Make a call
     ```shell
    $ curl --location --request POST 'http://localhost:8080' \
    --header 'Content-Type: application/json' \
    --data-raw '{
-        "name": "CoffeeBeans"
+        "body": "{ \"name\": \"CoffeeBeans\" }"
       }'
     ```
    The service responds
@@ -339,43 +357,4 @@ Now that the setup is done you can deploy to AWS.
         "name": "CoffeeBeans"
       }'
     ```
-3. Et voila! It runs with 500 ms for cold start.
-
-## Maven Repository
-
-This project uses experimental dependencies from Spring.
-
-* One way to pul them is to add `repositories` and `pluginRepositories` elements to `pom.xml`.
-
-* An alternative add them to `settings.xml` as following
-
-```xml
-
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <profiles>
-    <profile>
-      <id>spring-native-demo</id>
-      <repositories>
-        <repository>
-          <id>spring-releases</id>
-          <name>Spring Releases</name>
-          <url>https://repo.spring.io/release</url>
-        </repository>
-      </repositories>
-
-      <pluginRepositories>
-        <pluginRepository>
-          <id>spring-releases</id>
-          <name>Spring Releases</name>
-          <url>https://repo.spring.io/release</url>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <activeProfile>spring-native-demo</activeProfile>
-  </activeProfiles>
-</settings>
-```
+3. Et voila! It runs with 500 ms for cold start.

docker-compose.yml

@@ -15,23 +15,22 @@
 
 version: "3.9"
 services:
-  spring-native-aws-lambda-function:
-    image: ghcr.io/muhamadto/spring-native-amazonlinux2-builder:20-amazonlinux2-awscliv2
-    ports:
-      - "8080:8080"
-      - "5005:5005"
+  spring-native-aws-lambda-function-infra:
+    image: muhamadto/spring-native-amazonlinux2-builder:21-amazonlinux2-awscliv2
     volumes:
       - ./:/app
       - ${M2_REPO}:/home/worker/.m2
     working_dir: /app
     user: worker
     environment:
-      SPRING_MAIN_WEBAPPLICATIONTYPE: servlet
       AWS_DEFAULT_REGION: ap-southeast-2
       AWS_REGION: ap-southeast-2
       AWS_ACCESS_KEY_ID: local
       AWS_SECRET_ACCESS_KEY: local
       AWS_ENDPOINT_URL: http://localstack:4566
+      BUILD_ARTIFACT: 'true'
+      FUNCTION_NAME: spring-native-aws-lambda-function
+      STAGE: compose
       MAVEN_OPTS: |
         -DskipTests=true
         -Dcheckstyle.skip=true
@@ -46,23 +45,41 @@ services:
       - -c
     command: |
       '
+      function package_spring_native_lambda() {
+          if [ "$$BUILD_ARTIFACT" = "true" ]; then
+            ./mvnw -ntp clean -Pnative -DskipTests native:compile package -pl "$$FUNCTION_NAME"
+          else
+            print_info_message "plain" "BUILD_ARTIFACT environment variable is not set. Skipping Maven build."
+          fi
+      }
+      
       aws --version &&
 
       source /usr/local/bin/awscliv2-util/aws &&
 
-      print_info_message "block" "Creating 'spring-native-aws-lambda-function'" &&
+      print_info_message "block" "Creating '"$$FUNCTION_NAME"'" &&
 
       print_info_message "divider" "Package GraalVM function" &&
+      
+      package_spring_native_lambda &&
 
-      ./mvnw -ntp clean package -U -Pnative -pl spring-native-aws-lambda-function  --settings ./settings-spring.xml &&
-
-      lambda_create_function lambda-FUNCTION provided.al2023 512 ./spring-native-aws-lambda-function/target/spring-native-aws-lambda-function-native-zip.zip spring-native-aws-lambda-function &&
-      lambda_wait_for_function lambda-FUNCTION &&
+      print_info_message "divider" "Creating LAMBDA function" &&
+      lambda_create_function "$$FUNCTION_NAME" provided.al2023 512 ./"$$FUNCTION_NAME"/target/"$$FUNCTION_NAME"-native-zip.zip "$$FUNCTION_NAME" &&
+      lambda_wait_for_function "$$FUNCTION_NAME" &&
       lambda_list_functions &&
+      LAMBDA_ARN="$(lambda_get_function_arn "$$FUNCTION_NAME")" &&
 
-      print_info_message "block" "Successfully creating 'spring-native-aws-lambda-function'" &&
-
-      exit 0
+      print_info_message "divider" "Creating API Gateway" &&
+      REST_API_ID="$(apigateway_create_restApi "somerestapiname")" &&
+      RESOURCE_ID="$(apigateway_create_resource "$$REST_API_ID" "somePathId")"      
+      apigateway_create_method "$$REST_API_ID" "$$RESOURCE_ID" "POST" &&
+      apigateway_create_lambda_integration "$$REST_API_ID" "$$RESOURCE_ID" "POST" "$$LAMBDA_ARN" "ap-southeast-2" &&
+      apigateway_create_deployment "$$REST_API_ID" "$$STAGE" &&
+      apigateway_list_restapis &&
+      
+      print_info_message "plain" "Endpoint available at: http://localhost:4566/restapis/$$REST_API_ID/$$STAGE/_user_request_/somePathId" &&
+      
+      print_info_message "block" "Successfully creating '"$$FUNCTION_NAME"'"
       '
     depends_on:
       - localstack

settings-spring.xml

@@ -118,4 +118,18 @@
     </dependency>
     <!-- TEST ENDS -->
   </dependencies>
+
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>3.1.1</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>