@gradientedge/cdk-utils 8.66.0 → 8.68.0

package/dist/src/lib/manager/aws/lambda-manager.js

@@ -27,6 +27,7 @@ exports.LambdaManager = void 0;
 const cdk = __importStar(require("aws-cdk-lib"));
 const iam = __importStar(require("aws-cdk-lib/aws-iam"));
 const lambda = __importStar(require("aws-cdk-lib/aws-lambda"));
+const eventSources = __importStar(require("aws-cdk-lib/aws-lambda-event-sources"));
 const common_1 = require("../../common");
 const utils = __importStar(require("../../utils"));
 const cloudfront_manager_1 = require("./cloudfront-manager");
@@ -126,6 +127,12 @@ class LambdaManager {
                 insightsVersion: props.insightsVersion,
             },
         });
+        if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
+            lambdaFunction.addEventSource(new eventSources.SqsEventSource(lambdaFunction.deadLetterQueue, {
+                reportBatchItemFailures: true,
+                batchSize: props.dlq.retryBatchSize ?? 1,
+            }));
+        }
         if (props.lambdaAliases && props.lambdaAliases.length > 0) {
             props.lambdaAliases.forEach(alias => {
                 const aliasId = alias.id ?? `${id}-${alias.aliasName}`;
@@ -218,6 +225,12 @@ class LambdaManager {
                 insightsVersion: props.insightsVersion,
             },
         });
+        if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
+            lambdaFunction.addEventSource(new eventSources.SqsEventSource(lambdaFunction.deadLetterQueue, {
+                reportBatchItemFailures: true,
+                batchSize: props.dlq.retryBatchSize ?? 1,
+            }));
+        }
         utils.createCfnOutput(`${id}-lambdaArn`, scope, lambdaFunction.functionArn);
         utils.createCfnOutput(`${id}-lambdaName`, scope, lambdaFunction.functionName);
         return lambdaFunction;

package/dist/src/lib/types/aws/index.d.ts

@@ -845,5 +845,7 @@ export interface QueueProps extends sqs.QueueProps {
     deliveryDelayInSecs?: number;
     retentionInDays?: number;
     tags?: TagProps[];
+    retriesEnabled?: boolean;
+    retryBatchSize?: number;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "8.66.0",
+  "version": "8.68.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -46,13 +46,13 @@
     }
   },
   "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.338.0",
+    "@aws-sdk/client-secrets-manager": "^3.341.0",
     "@types/lodash": "^4.14.195",
-    "@types/node": "^20.2.4",
+    "@types/node": "^20.2.5",
     "@types/uuid": "^9.0.1",
     "app-root-path": "^3.1.0",
     "aws-cdk-lib": "^2.81.0",
-    "constructs": "^10.2.33",
+    "constructs": "^10.2.37",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nconf": "^0.12.0",
@@ -61,12 +61,12 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.8",
+    "@babel/core": "^7.22.1",
     "@babel/eslint-parser": "^7.21.8",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@types/jest": "^29.5.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "@typescript-eslint/parser": "^5.59.8",
     "aws-cdk": "^2.81.0",
     "better-docs": "^2.7.2",
     "codecov": "^3.8.3",
@@ -76,7 +76,7 @@
     "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^44.2.5",
+    "eslint-plugin-jsdoc": "^45.0.0",
     "husky": "^8.0.3",
     "jest": "^29.5.0",
     "jest-extended": "^3.2.4",

package/src/lib/manager/aws/lambda-manager.ts

@@ -3,6 +3,7 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'
 import * as efs from 'aws-cdk-lib/aws-efs'
 import * as iam from 'aws-cdk-lib/aws-iam'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
+import * as eventSources from 'aws-cdk-lib/aws-lambda-event-sources'
 import * as common from '../../common'
 import { CommonStack } from '../../common'
 import * as types from '../../types'
@@ -130,6 +131,15 @@ export class LambdaManager {
       },
     })
 
+    if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
+      lambdaFunction.addEventSource(
+        new eventSources.SqsEventSource(lambdaFunction.deadLetterQueue, {
+          reportBatchItemFailures: true,
+          batchSize: props.dlq.retryBatchSize ?? 1,
+        })
+      )
+    }
+
     if (props.lambdaAliases && props.lambdaAliases.length > 0) {
       props.lambdaAliases.forEach(alias => {
         const aliasId = alias.id ?? `${id}-${alias.aliasName}`
@@ -271,6 +281,15 @@ export class LambdaManager {
       },
     })
 
+    if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
+      lambdaFunction.addEventSource(
+        new eventSources.SqsEventSource(lambdaFunction.deadLetterQueue, {
+          reportBatchItemFailures: true,
+          batchSize: props.dlq.retryBatchSize ?? 1,
+        })
+      )
+    }
+
     utils.createCfnOutput(`${id}-lambdaArn`, scope, lambdaFunction.functionArn)
     utils.createCfnOutput(`${id}-lambdaName`, scope, lambdaFunction.functionName)
 

package/src/lib/types/aws/index.ts

@@ -906,4 +906,6 @@ export interface QueueProps extends sqs.QueueProps {
   deliveryDelayInSecs?: number
   retentionInDays?: number
   tags?: TagProps[]
+  retriesEnabled?: boolean
+  retryBatchSize?: number
 }