New build image (#37)

Use new image from  `ghcr.io/muhamadto/spring-native-amazonlinux2-base:17-amazonlinux2`  instead of `ghcr.io/muhamadto/spring-native-amazonlinux2-base-java17:latest`

Author: muhamadto

.dockerignore

@@ -15,3 +15,6 @@ README.md
 # there is no need to copy it again if you want to use your own setting file, you can comment the
 # line below
 settings-spring.xml
+
+spring-native-aws-lambda-infra
+docker-compose.yml

.github/workflows/release.yml

@@ -24,8 +24,8 @@ jobs:
   release:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/muhamadto/spring-native-amazonlinux2-base-java17:latest
-      options: --user=ci:automation
+      image:  ghcr.io/muhamadto/spring-native-amazonlinux2-base:17-amazonlinux2
+      options: --user=worker:ci
     permissions:
       id-token: write
       contents: read

Dockerfile

@@ -1,5 +1,5 @@
-FROM ghcr.io/muhamadto/spring-native-amazonlinux2-base-java17:latest AS spring-native-aws-lambda-builder-java17
+FROM ghcr.io/muhamadto/spring-native-amazonlinux2-base:17-amazonlinux2
 
-COPY --chown=${USER_NAME}:${GROUP_NAME} . /opt/build
+COPY --chown=worker:ci . /home/worker/
 
 RUN ./mvnw -ntp -Pnative package -DskipTests --file spring-native-aws-lambda-function/pom.xml

README.md

@@ -232,10 +232,12 @@ and the following trust relationship
             "SNS:Subscribe",
             "SNS:GetTopicAttributes",
             "SNS:ListSubscriptionsByTopic",
-            "SNS:Unsubscribe"
+            "SNS:Unsubscribe",
+            "SNS:TagResource",
+            "SNS:UntagResource"
          ],
          "Resource": [
-            "arn:aws:sns:{aws-region}:{aws-account-number}:spring-native-aws-lambda-function-success-topic.fifo",
+            "arn:aws:sns:{aws-region}:{aws-account-number}:spring-native-aws-lambda-function-success-topic",
             "arn:aws:sns:{aws-region}:{aws-account-number}:spring-native-aws-lambda-function-failure-topic"
          ]
       },
@@ -252,9 +254,9 @@ and the following trust relationship
          ],
          "Resource": [
             "arn:aws:sqs:{aws-region}:{aws-account-number}:spring-native-aws-lambda-function-failure-queue-dlq",
-            "arn:aws:sqs:{aws-region}:{aws-account-number}:spring-native-aws-lambda-function-success-queue-dlq.fifo",
+            "arn:aws:sqs:{aws-region}:{aws-account-number}:spring-native-aws-lambda-function-success-queue-dlq",
             "arn:aws:sqs:{aws-region}:{aws-account-number}:spring-native-aws-lambda-function-failure-queue",
-            "arn:aws:sqs:{aws-region}:{aws-account-number}:spring-native-aws-lambda-function-success-queue.fifo"
+            "arn:aws:sqs:{aws-region}:{aws-account-number}:spring-native-aws-lambda-function-success-queue"
          ]
       },
       {

cdk.json

@@ -1,3 +1,3 @@
 {
-  "app": "mvn exec:java -pl spring-native-aws-lambda-cdk -Dexec.mainClass=com.coffeebeans.cdk.Application"
+  "app": "mvn exec:java -pl spring-native-aws-lambda-infra -Dexec.mainClass=com.coffeebeans.springnativeawslambda.infra.Application"
 }

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   spring-native-aws-lambda-function:
-    image: ghcr.io/muhamadto/spring-native-amazonlinux2-base-java17:latest
+    image: ghcr.io/muhamadto/spring-native-amazonlinux2-base:17-amazonlinux2
     ports:
       - 8080:8080
     networks:
@@ -40,17 +40,6 @@ services:
     depends_on:
       - localstack
 
-  spring-native-aws-lambda-function-infrastructure:
-    image: ghcr.io/muhamadto/spring-native-amazonlinux2-base-java17:latest
-    environment:
-      AWS_ACCESS_KEY_ID: local
-      AWS_SECRET_ACCESS_KEY: local
-      AWS_DEFAULT_REGION: ap-southeast-2
-    entrypoint:
-      - bash
-      - -c
-
-
   localstack:
     image: localstack/localstack:latest
     logging:

pom.xml

@@ -89,7 +89,7 @@
       </dependency>
       <dependency>
         <groupId>com.coffeebeans</groupId>
-        <artifactId>spring-native-aws-lambda-cdk</artifactId>
+        <artifactId>spring-native-aws-lambda-infra</artifactId>
         <version>${project.version}</version>
       </dependency>
       <!-- SPRING-NATIVE-AWS-LAMBDA ENDS -->

spring-native-aws-lambda-infra/src/main/java/com/coffeebeans/springnativeawslambda/infra/SpringNativeAwsLambdaStack.java

@@ -55,9 +55,9 @@ public SpringNativeAwsLambdaStack(@NotNull final Construct scope,
       @NotNull final StackProps props) {
     super(scope, id, props);
 
-    final Queue successQueue = createFifoQueue(SQS_SUCCESS_QUEUE_ID, true, MESSAGE_GROUP);
+    final Queue successQueue = createQueue(SQS_SUCCESS_QUEUE_ID);
     final SqsSubscription successQueueSubscription = createSqsSubscription(successQueue);
-    final Topic successTopic = createFifoTopic(SNS_SUCCESS_TOPIC_ID, true, true);
+    final Topic successTopic = createTopic(SNS_SUCCESS_TOPIC_ID);
     successTopic.addSubscription(successQueueSubscription);
 
     final Queue failureQueue = createQueue(SQS_FAILURE_QUEUE_ID);

spring-native-aws-lambda-infra/src/test/java/com/coffeebeans/springnativeawslambda/infra/ApiBaseStackTest.java

@@ -173,7 +173,7 @@ void should_create_and_return_lambda_function() {
 
     final Function actual = this.apiBaseStack.createFunction(vpc,
         "test-function",
-        "com.coffeebeans.cdk.lambda.CustomRuntime2Function::handleRequest",
+        "com.coffeebeans.springnativeawslambda.infra.lambda.CustomRuntime2Function::handleRequest",
         Code.fromAsset(this.lambdaCodePath.toString()),
         fromTopicArn(this.apiBaseStack, "success-topic", "arn:aws:sns:us-east-1:***:success-topic"),
         fromTopicArn(this.apiBaseStack, "failure-topic", "arn:aws:sns:us-east-1:***:failure-topic"),
@@ -201,7 +201,7 @@ void should_create_and_return_lambda_rest_api() {
 
     final Function function = this.apiBaseStack.createFunction(vpc,
         "test-function",
-        "com.coffeebeans.cdk.lambda.CustomRuntime2Function::handleRequest",
+        "com.coffeebeans.springnativeawslambda.infra.lambda.CustomRuntime2Function::handleRequest",
         Code.fromAsset(this.lambdaCodePath.toString()),
         fromTopicArn(this.apiBaseStack, "success-topic", "arn:aws:sns:us-east-1:***:success-topic"),
         fromTopicArn(this.apiBaseStack, "failure-topic", "arn:aws:sns:us-east-1:***:failure-topic"),

spring-native-aws-lambda-infra/src/test/java/com/coffeebeans/springnativeawslambda/infra/LambdaTest.java

@@ -139,7 +139,7 @@ void should_have_default_policy_to_allow_lambda_publish_to_sns() {
         .reference(stringLikeRegexp("springnativeawslambdafunctionrole(.*)"))
         .build();
 
-    final PolicyStatement successSNSPublishPolicyStatement = getAllowSnsPublishPolicyStatement("springnativeawslambdafunctionsuccesstopicfifo(.*)");
+    final PolicyStatement successSNSPublishPolicyStatement = getAllowSnsPublishPolicyStatement("springnativeawslambdafunctionsuccesstopic(.*)");
 
     final PolicyStatement failureSNSPublishPolicyStatement = getAllowSnsPublishPolicyStatement("springnativeawslambdafunctionfailuretopic(.*)");
 
@@ -166,7 +166,7 @@ void should_have_default_policy_to_allow_lambda_publish_to_sns() {
   void should_have_event_invoke_config_for_success_and_failure() {
 
     final LambdaDestinationReference onFailure = createDestinationReference("springnativeawslambdafunctionfailuretopic(.*)");
-    final LambdaDestinationReference onSuccess = createDestinationReference("springnativeawslambdafunctionsuccesstopicfifo(.*)");
+    final LambdaDestinationReference onSuccess = createDestinationReference("springnativeawslambdafunctionsuccesstopic(.*)");
 
     final LambdaEventInvokeConfigProperties lambdaEventInvokeConfigProperties = LambdaEventInvokeConfigProperties.builder()
         .functionName(ResourceReference.builder().reference(stringLikeRegexp("springnativeawslambdafunction(.*)")).build())