@gradientedge/cdk-utils 7.16.1 → 7.18.0

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

@@ -89,7 +89,7 @@ class LambdaManager {
             throw `Lambda props undefined for ${id}`;
         const functionName = `${props.functionName}-${scope.props.stage}`;
         let deadLetterQueue;
-        if (props.deadLetterQueueEnabled && props.dlq) {
+        if (props.deadLetterQueueEnabled) {
             const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props);
             deadLetterQueue = scope.sqsManager.createDeadLetterQueueForLambda(`${id}-dlq`, scope, props, redriveQueue);
         }
@@ -164,7 +164,7 @@ class LambdaManager {
             throw `Lambda props undefined for ${id}`;
         const functionName = `${props.functionName}-${scope.props.stage}`;
         let deadLetterQueue;
-        if (props.deadLetterQueueEnabled && props.dlq) {
+        if (props.deadLetterQueueEnabled) {
             const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props);
             deadLetterQueue = scope.sqsManager.createDeadLetterQueueForLambda(`${id}-dlq`, scope, props, redriveQueue);
         }

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

@@ -62,17 +62,17 @@ class SqsManager {
             queueName: props.queueName,
             visibilityTimeout: props.visibilityTimeoutInSecs
                 ? cdk.Duration.seconds(props.visibilityTimeoutInSecs)
-                : undefined,
+                : props.visibilityTimeout,
             receiveMessageWaitTime: props.receiveMessageWaitTimeInSecs
                 ? cdk.Duration.seconds(props.receiveMessageWaitTimeInSecs)
-                : undefined,
+                : props.receiveMessageWaitTime,
             contentBasedDeduplication: props.contentBasedDeduplication,
-            dataKeyReuse: props.dataKeyReuseInSecs ? cdk.Duration.seconds(props.dataKeyReuseInSecs) : undefined,
+            dataKeyReuse: props.dataKeyReuseInSecs ? cdk.Duration.seconds(props.dataKeyReuseInSecs) : props.dataKeyReuse,
             deadLetterQueue: !deadLetterQueue
                 ? undefined
                 : {
                     queue: deadLetterQueue,
-                    maxReceiveCount: props.maxReceiveCount,
+                    maxReceiveCount: props.maxReceiveCount ?? 5,
                 },
             deduplicationScope: props.deduplicationScope,
             deliveryDelay: props.deliveryDelayInSecs ? cdk.Duration.seconds(props.deliveryDelayInSecs) : undefined,
@@ -82,7 +82,7 @@ class SqsManager {
             fifoThroughputLimit: props.fifoThroughputLimit,
             maxMessageSizeBytes: props.maxMessageSizeBytes,
             removalPolicy: props.removalPolicy ?? cdk.RemovalPolicy.DESTROY,
-            retentionPeriod: cdk.Duration.days(props.retentionInDays),
+            retentionPeriod: props.retentionInDays ? cdk.Duration.days(props.retentionInDays) : cdk.Duration.days(7),
         });
         utils.createCfnOutput(`${id}-queueArn`, scope, queue.queueArn);
         utils.createCfnOutput(`${id}-queueName`, scope, queue.queueName);
@@ -96,8 +96,6 @@ class SqsManager {
      * @param {types.LambdaProps} props the lambda properties
      */
     createRedriveQueueForLambda(id, scope, props) {
-        if (!props.redriveq)
-            throw `Redrive queue props for Lambda undefined`;
         return this.createQueue(`${id}`, scope, {
             ...props.redriveq,
             ...{
@@ -113,14 +111,21 @@ class SqsManager {
      * @param {sqs.IQueue} deadLetterQueue
      */
     createDeadLetterQueueForLambda(id, scope, props, deadLetterQueue) {
-        if (!props.dlq)
-            throw `Dead letter queue props for Lambda undefined`;
-        return this.createQueue(`${id}`, scope, {
-            ...props.dlq,
-            ...{
+        let queueProps;
+        if (props.dlq) {
+            queueProps = {
+                ...props.dlq,
+                ...{
+                    queueName: `${props.functionName}-dlq-${scope.props.stage}`,
+                },
+            };
+        }
+        else {
+            queueProps = {
                 queueName: `${props.functionName}-dlq-${scope.props.stage}`,
-            },
-        }, deadLetterQueue);
+            };
+        }
+        return this.createQueue(`${id}`, scope, queueProps, deadLetterQueue);
     }
 }
 exports.SqsManager = SqsManager;

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

@@ -678,11 +678,11 @@ export interface ElastiCacheProps extends elasticache.CfnCacheClusterProps {
  * @subcategory Properties
  */
 export interface QueueProps extends sqs.QueueProps {
-    maxReceiveCount: number;
-    visibilityTimeoutInSecs: number;
-    receiveMessageWaitTimeInSecs: number;
-    dataKeyReuseInSecs: number;
-    deliveryDelayInSecs: number;
-    retentionInDays: number;
+    maxReceiveCount?: number;
+    visibilityTimeoutInSecs?: number;
+    receiveMessageWaitTimeInSecs?: number;
+    dataKeyReuseInSecs?: number;
+    deliveryDelayInSecs?: number;
+    retentionInDays?: number;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "7.16.1",
+  "version": "7.18.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -37,7 +37,7 @@
     "postinstall": "npx lerna run init",
     "prettier": "npx prettier --check \"**/*.{ts,json,md}\"",
     "prettify": "npx prettier --write \"**/*.{ts,json,md}\"",
-    "test": "rimraf coverage && npx jest --ci --runInBand",
+    "test": "rimraf coverage && npx jest --ci --maxWorkers=100%",
     "update:deps": "ncu -u -x lerna",
     "validate": "yarn prettier && yarn test"
   },

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

@@ -87,7 +87,7 @@ export class LambdaManager {
     const functionName = `${props.functionName}-${scope.props.stage}`
 
     let deadLetterQueue
-    if (props.deadLetterQueueEnabled && props.dlq) {
+    if (props.deadLetterQueueEnabled) {
       const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props)
       deadLetterQueue = scope.sqsManager.createDeadLetterQueueForLambda(`${id}-dlq`, scope, props, redriveQueue)
     }
@@ -206,7 +206,7 @@ export class LambdaManager {
     const functionName = `${props.functionName}-${scope.props.stage}`
 
     let deadLetterQueue
-    if (props.deadLetterQueueEnabled && props.dlq) {
+    if (props.deadLetterQueueEnabled) {
       const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props)
       deadLetterQueue = scope.sqsManager.createDeadLetterQueueForLambda(`${id}-dlq`, scope, props, redriveQueue)
     }

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

@@ -39,17 +39,17 @@ export class SqsManager {
       queueName: props.queueName,
       visibilityTimeout: props.visibilityTimeoutInSecs
         ? cdk.Duration.seconds(props.visibilityTimeoutInSecs)
-        : undefined,
+        : props.visibilityTimeout,
       receiveMessageWaitTime: props.receiveMessageWaitTimeInSecs
         ? cdk.Duration.seconds(props.receiveMessageWaitTimeInSecs)
-        : undefined,
+        : props.receiveMessageWaitTime,
       contentBasedDeduplication: props.contentBasedDeduplication,
-      dataKeyReuse: props.dataKeyReuseInSecs ? cdk.Duration.seconds(props.dataKeyReuseInSecs) : undefined,
+      dataKeyReuse: props.dataKeyReuseInSecs ? cdk.Duration.seconds(props.dataKeyReuseInSecs) : props.dataKeyReuse,
       deadLetterQueue: !deadLetterQueue
         ? undefined
         : {
             queue: deadLetterQueue,
-            maxReceiveCount: props.maxReceiveCount,
+            maxReceiveCount: props.maxReceiveCount ?? 5,
           },
       deduplicationScope: props.deduplicationScope,
       deliveryDelay: props.deliveryDelayInSecs ? cdk.Duration.seconds(props.deliveryDelayInSecs) : undefined,
@@ -59,7 +59,7 @@ export class SqsManager {
       fifoThroughputLimit: props.fifoThroughputLimit,
       maxMessageSizeBytes: props.maxMessageSizeBytes,
       removalPolicy: props.removalPolicy ?? cdk.RemovalPolicy.DESTROY,
-      retentionPeriod: cdk.Duration.days(props.retentionInDays),
+      retentionPeriod: props.retentionInDays ? cdk.Duration.days(props.retentionInDays) : cdk.Duration.days(7),
     })
 
     utils.createCfnOutput(`${id}-queueArn`, scope, queue.queueArn)
@@ -76,8 +76,6 @@ export class SqsManager {
    * @param {types.LambdaProps} props the lambda properties
    */
   public createRedriveQueueForLambda(id: string, scope: common.CommonConstruct, props: types.LambdaProps) {
-    if (!props.redriveq) throw `Redrive queue props for Lambda undefined`
-
     return this.createQueue(`${id}`, scope, {
       ...props.redriveq,
       ...{
@@ -99,18 +97,20 @@ export class SqsManager {
     props: types.LambdaProps,
     deadLetterQueue: sqs.IQueue
   ) {
-    if (!props.dlq) throw `Dead letter queue props for Lambda undefined`
-
-    return this.createQueue(
-      `${id}`,
-      scope,
-      {
+    let queueProps
+    if (props.dlq) {
+      queueProps = {
         ...props.dlq,
         ...{
           queueName: `${props.functionName}-dlq-${scope.props.stage}`,
         },
-      },
-      deadLetterQueue
-    )
+      }
+    } else {
+      queueProps = {
+        queueName: `${props.functionName}-dlq-${scope.props.stage}`,
+      }
+    }
+
+    return this.createQueue(`${id}`, scope, queueProps, deadLetterQueue)
   }
 }

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

@@ -721,10 +721,10 @@ export interface ElastiCacheProps extends elasticache.CfnCacheClusterProps {}
  * @subcategory Properties
  */
 export interface QueueProps extends sqs.QueueProps {
-  maxReceiveCount: number
-  visibilityTimeoutInSecs: number
-  receiveMessageWaitTimeInSecs: number
-  dataKeyReuseInSecs: number
-  deliveryDelayInSecs: number
-  retentionInDays: number
+  maxReceiveCount?: number
+  visibilityTimeoutInSecs?: number
+  receiveMessageWaitTimeInSecs?: number
+  dataKeyReuseInSecs?: number
+  deliveryDelayInSecs?: number
+  retentionInDays?: number
 }