Replace lambda destinations (#39)

* Replaced Lambda destinations with dead letter topic.


Added assertj like Assertion for CDK
In this project, lambda is called synchronously which means destinations are not invoked. So, there were removed. Also added dead letter topic to receive failures executions.

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

Author: muhamadto

.github/workflows/release.yml

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

Dockerfile

@@ -0,0 +1 @@
+lombok.addLombokGeneratedAnnotation=true

lombok.config

@@ -72,6 +72,7 @@
     <sonar.organization>muhamadto</sonar.organization>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     <revision>1.0.0-SNAPSHOT</revision>
+    <jackson.version>2.13.0</jackson.version>
   </properties>
 
   <modules>
@@ -126,6 +127,33 @@
       </dependency>
       <!-- UTILS ENDS -->
 
+      <!-- JACKSON -->
+
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.fasterxml.jackson.module</groupId>
+        <artifactId>jackson-module-parameter-names</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.fasterxml.jackson.datatype</groupId>
+        <artifactId>jackson-datatype-jsr310</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.fasterxml.jackson.datatype</groupId>
+        <artifactId>jackson-datatype-jdk8</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <!-- JACKSON ENDS -->
+
       <!-- TEST -->
       <dependency>
         <groupId>org.assertj</groupId>

pom.xml

@@ -86,6 +86,16 @@
     </dependency>
     <!-- UTILS ENDS -->
 
+    <!-- JACKSON -->
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-parameter-names</artifactId>
+    </dependency>
+
+    <!-- JACKSON ENDS-->
+
+
     <!-- TEST -->
 
     <dependency>

spring-native-aws-lambda-infra/pom.xml

@@ -35,7 +35,6 @@
 import software.amazon.awscdk.services.iam.Role;
 import software.amazon.awscdk.services.lambda.Code;
 import software.amazon.awscdk.services.lambda.Function;
-import software.amazon.awscdk.services.lambda.destinations.SnsDestination;
 import software.amazon.awscdk.services.sns.ITopic;
 import software.amazon.awscdk.services.sns.Topic;
 import software.amazon.awscdk.services.sns.subscriptions.SqsSubscription;
@@ -61,7 +60,8 @@ public ApiBaseStack(
 
   @NotNull
   protected Queue createQueue(@NotBlank final String queueId) {
-    final DeadLetterQueue deadLetterQueue = createDeadLetterQueue(queueId + DEAD_LETTER_QUEUE_SUFFIX);
+    final DeadLetterQueue deadLetterQueue = createDeadLetterQueue(
+        queueId + DEAD_LETTER_QUEUE_SUFFIX);
 
     return Queue.Builder.create(this, queueId)
         .queueName(queueId)
@@ -153,16 +153,14 @@ protected Function createFunction(
       @NotBlank final String lambdaId,
       @NotBlank final String handler,
       @NotNull final Code code,
-      @NotNull final Topic successTopic,
-      @NotNull final Topic failureTopic,
+      @NotNull final Topic deadLetterTopic,
       @NotNull Role role,
       @NotEmpty final Map<String, String> environment) {
     return this.createFunction(null,
         lambdaId,
         handler,
         code,
-        successTopic,
-        failureTopic,
+        deadLetterTopic,
         role,
         environment);
   }
@@ -173,8 +171,7 @@ protected Function createFunction(
       @NotBlank final String lambdaId,
       @NotBlank final String handler,
       @NotNull final Code code,
-      @NotNull final ITopic successTopic,
-      @NotNull final ITopic failureTopic,
+      @NotNull final ITopic deadLetterTopic,
       @NotNull IRole role,
       @NotEmpty final Map<String, String> environment) {
     return CustomRuntime2Function.Builder.create(this, lambdaId)
@@ -185,8 +182,7 @@ protected Function createFunction(
         .role(role)
         .vpc(vpc)
         .environment(environment)
-        .onSuccess(new SnsDestination(successTopic))
-        .onFailure(new SnsDestination(failureTopic))
+        .deadLetterTopic(deadLetterTopic)
         .timeout(Duration.seconds(LAMBDA_FUNCTION_TIMEOUT_IN_SECONDS))
         .memorySize(LAMBDA_FUNCTION_MEMORY_SIZE)
         .retryAttempts(LAMBDA_FUNCTION_RETRY_ATTEMPTS)

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

@@ -39,7 +39,8 @@ public final class Application {
   private static final String ENVIRONMENT_NAME_DEV = "dev";
   private static final String ENVIRONMENT_NAME_PRD = "prd";
   private static final String LAMBDA_CODE_PATH =
-      SpringNativeAwsLambdaStack.LAMBDA_FUNCTION_ID + "/target/spring-native-aws-lambda-function-native-zip.zip";
+      SpringNativeAwsLambdaStack.LAMBDA_FUNCTION_ID
+          + "/target/spring-native-aws-lambda-function-native-zip.zip";
   private static final String QUALIFIER = "cbcore";
   private static final String FILE_ASSETS_BUCKET_NAME = "cbcore-cdk-bucket";
 
@@ -51,9 +52,14 @@ public static void main(final String... args) {
     final Map<String, String> tags = createTags(env, TAG_VALUE_COST_CENTRE);
 
     switch (env) {
-      case ENVIRONMENT_NAME_DEV -> createStack(app, DEV_STACK_NAME, LAMBDA_CODE_PATH, QUALIFIER, FILE_ASSETS_BUCKET_NAME, env);
-      case ENVIRONMENT_NAME_PRD -> createStack(app, PRD_STACK_NAME, LAMBDA_CODE_PATH, QUALIFIER, FILE_ASSETS_BUCKET_NAME, env);
-      default -> throw new IllegalArgumentException("Environment variable " + TAG_KEY_ENV + " is not set to a valid value. Set it to '[dev|prd]'");
+      case ENVIRONMENT_NAME_DEV ->
+          createStack(app, DEV_STACK_NAME, LAMBDA_CODE_PATH, QUALIFIER, FILE_ASSETS_BUCKET_NAME,
+              env);
+      case ENVIRONMENT_NAME_PRD ->
+          createStack(app, PRD_STACK_NAME, LAMBDA_CODE_PATH, QUALIFIER, FILE_ASSETS_BUCKET_NAME,
+              env);
+      default -> throw new IllegalArgumentException("Environment variable " + TAG_KEY_ENV
+          + " is not set to a valid value. Set it to '[dev|prd]'");
     }
 
     tags.entrySet().stream()

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

@@ -19,62 +19,61 @@
 package com.coffeebeans.springnativeawslambda.infra;
 
 import static com.coffeebeans.springnativeawslambda.infra.TagUtils.TAG_KEY_ENV;
+import static software.amazon.awscdk.services.iam.ManagedPolicy.fromAwsManagedPolicyName;
 import static software.amazon.awscdk.services.lambda.Code.fromAsset;
-import static software.amazon.awscdk.services.sqs.DeduplicationScope.MESSAGE_GROUP;
 
 import java.util.List;
 import java.util.Map;
 import javax.validation.constraints.NotBlank;
-import org.jetbrains.annotations.NotNull;
+import javax.validation.constraints.NotNull;
 import software.amazon.awscdk.StackProps;
-import software.amazon.awscdk.services.iam.ManagedPolicy;
+import software.amazon.awscdk.services.iam.IManagedPolicy;
 import software.amazon.awscdk.services.iam.Role;
 import software.amazon.awscdk.services.iam.ServicePrincipal;
 import software.amazon.awscdk.services.lambda.AssetCode;
 import software.amazon.awscdk.services.lambda.Function;
 import software.amazon.awscdk.services.sns.Topic;
-import software.amazon.awscdk.services.sns.subscriptions.SqsSubscription;
-import software.amazon.awscdk.services.sqs.Queue;
 import software.constructs.Construct;
 
 public class SpringNativeAwsLambdaStack extends ApiBaseStack {
 
   static final String LAMBDA_FUNCTION_ID = "spring-native-aws-lambda-function";
   private static final String REST_API_ID = LAMBDA_FUNCTION_ID + "-rest-api";
-  private static final String SNS_SUCCESS_TOPIC_ID = LAMBDA_FUNCTION_ID + "-success-topic";
-  private static final String SNS_FAILURE_TOPIC_ID = LAMBDA_FUNCTION_ID + "-failure-topic";
-  private static final String SQS_SUCCESS_QUEUE_ID = LAMBDA_FUNCTION_ID + "-success-queue";
-  private static final String SQS_FAILURE_QUEUE_ID = LAMBDA_FUNCTION_ID + "-failure-queue";
+  private static final String DEAD_LETTER_TOPIC_ID = LAMBDA_FUNCTION_ID + "-topic.dlq";
   private static final String LAMBDA_HANDLER = "org.springframework.cloud.function.adapter.aws.FunctionInvoker::handleRequest";
   private static final String ENVIRONMENT_VARIABLE_SPRING_PROFILES_ACTIVE = "SPRING_PROFILES_ACTIVE";
 
-  public SpringNativeAwsLambdaStack(@NotNull final Construct scope,
+  public SpringNativeAwsLambdaStack(
+      @NotNull final Construct scope,
       @NotBlank final String id,
       @NotBlank final String lambdaCodePath,
       @NotBlank final String stage,
       @NotNull final StackProps props) {
-    super(scope, id, props);
 
-    final Queue successQueue = createQueue(SQS_SUCCESS_QUEUE_ID);
-    final SqsSubscription successQueueSubscription = createSqsSubscription(successQueue);
-    final Topic successTopic = createTopic(SNS_SUCCESS_TOPIC_ID);
-    successTopic.addSubscription(successQueueSubscription);
+    super(scope, id, props);
 
-    final Queue failureQueue = createQueue(SQS_FAILURE_QUEUE_ID);
-    final SqsSubscription failureQueueSubscription = createSqsSubscription(failureQueue);
-    final Topic failureTopic = createTopic(SNS_FAILURE_TOPIC_ID);
-    failureTopic.addSubscription(failureQueueSubscription);
+    final Topic deadLetterTopic = createTopic(DEAD_LETTER_TOPIC_ID);
 
-    final Map<String, String> environment = Map.of(ENVIRONMENT_VARIABLE_SPRING_PROFILES_ACTIVE, stage, TAG_KEY_ENV, stage);
+    final List<IManagedPolicy> managedPolicies =
+        List.of(fromAwsManagedPolicyName("service-role/AWSLambdaBasicExecutionRole"));
 
     final Role role = Role.Builder.create(this, LAMBDA_FUNCTION_ID + "-role")
         .assumedBy(new ServicePrincipal("lambda.amazonaws.com"))
-        .managedPolicies(List.of(ManagedPolicy.fromAwsManagedPolicyName("service-role/AWSLambdaBasicExecutionRole")))
+        .managedPolicies(managedPolicies)
         .build();
 
     final AssetCode assetCode = fromAsset(lambdaCodePath);
 
-    final Function function = createFunction(LAMBDA_FUNCTION_ID, LAMBDA_HANDLER, assetCode, successTopic, failureTopic, role, environment);
+    final Map<String, String> environment =
+        Map.of(ENVIRONMENT_VARIABLE_SPRING_PROFILES_ACTIVE, stage, TAG_KEY_ENV, stage);
+
+    final Function function = createFunction(
+        LAMBDA_FUNCTION_ID,
+        LAMBDA_HANDLER,
+        assetCode,
+        deadLetterTopic,
+        role,
+        environment);
 
     createLambdaRestApi(stage, REST_API_ID, "name", "POST", function, true);
   }

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

@@ -53,7 +53,8 @@ private static StackProps createStackProps(@NotBlank final String stackName,
   }
 
   @NotNull
-  private static DefaultStackSynthesizer createDefaultStackSynthesizer(@NotBlank final String qualifier,
+  private static DefaultStackSynthesizer createDefaultStackSynthesizer(
+      @NotBlank final String qualifier,
       @NotBlank final String fileAssetsBucketName) {
     return DefaultStackSynthesizer.Builder.create()
         .qualifier(qualifier)

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

@@ -30,7 +30,8 @@ public final class TagUtils {
   public static final String TAG_KEY_COST_CENTRE = "COST_CENTRE";
   public static final String TAG_VALUE_COST_CENTRE = "coffeeBeans-core";
 
-  public static Map<String, String> createTags(@NotBlank final String env, @NotBlank final String costCentre) {
+  public static Map<String, String> createTags(@NotBlank final String env,
+      @NotBlank final String costCentre) {
     return Map.of(TAG_KEY_ENV, env, TAG_KEY_COST_CENTRE, costCentre);
   }
 }