@gradientedge/cdk-utils 8.91.0 → 8.92.0

package/src/lib/services/aws/lambda/main.ts

@@ -12,9 +12,6 @@ import { CloudFrontManager } from '../cloudfront'
 import { SsmManager } from '../systems-manager'
 
 /**
- * @stability stable
- * @category cdk-utils.lambda-manager
- * @subcategory Construct
  * @classdesc Provides operations on AWS Lambda.
  * - A new instance of this class is injected into {@link CommonConstruct} constructor.
  * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
@@ -28,20 +25,19 @@ import { SsmManager } from '../systems-manager'
  *     this.lambdaManager.createLambdaFunction('MyFunction', this, role, layers, code)
  *   }
  * }
- *
  * @see [CDK Lambda Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_lambda-readme.html}
  */
 export class LambdaManager {
   /**
    * @summary Method to create a lambda layer (nodejs)
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {lambda.AssetCode} code
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param code
    */
   public createLambdaLayer(id: string, scope: CommonConstruct, code: lambda.AssetCode) {
     const lambdaLayer = new lambda.LayerVersion(scope, `${id}`, {
-      compatibleRuntimes: [scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME],
       code: code,
+      compatibleRuntimes: [scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME],
       description: `${id}`,
       layerVersionName: `${id}-${scope.props.stage}`,
     })
@@ -53,19 +49,19 @@ export class LambdaManager {
 
   /**
    * @summary Method to create a lambda function (nodejs)
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {LambdaProps} props
-   * @param {iam.Role | iam.CfnRole} role
-   * @param {lambda.ILayerVersion[]} layers
-   * @param {lambda.AssetCode} code
-   * @param {string?} handler
-   * @param {Map<string, string>?} environment
-   * @param {ec2.IVpc?} vpc
-   * @param {ec2.ISecurityGroup[]?} securityGroups
-   * @param {efs.IAccessPoint?} accessPoint
-   * @param {string?} mountPath
-   * @param {ec2.SubnetSelection?} vpcSubnets
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props
+   * @param role
+   * @param layers
+   * @param code
+   * @param handler
+   * @param environment
+   * @param vpc
+   * @param securityGroups
+   * @param accessPoint
+   * @param mountPath
+   * @param vpcSubnets
    */
   public createLambdaFunction(
     id: string,
@@ -96,15 +92,10 @@ export class LambdaManager {
       ...props,
       ...{
         allowPublicSubnet: !!vpc,
-        functionName: functionName,
-        handler: handler || 'index.lambda_handler',
-        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
+        architecture: props.architecture ?? lambda.Architecture.ARM_64,
         code: code,
         deadLetterQueue: deadLetterQueue,
-        architecture: props.architecture ?? lambda.Architecture.ARM_64,
         environment: {
-          REGION: scope.props.region,
-          STAGE: scope.props.stage,
           LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
             ? ''
             : scope.ssmManager.readStringParameter(
@@ -112,30 +103,35 @@ export class LambdaManager {
                 scope,
                 `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
               ),
+          REGION: scope.props.region,
+          STAGE: scope.props.stage,
           ...environment,
         },
         filesystem: accessPoint
           ? lambda.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg')
           : undefined,
+        functionName: functionName,
+        handler: handler || 'index.lambda_handler',
+        insightsVersion: props.insightsVersion,
         layers: layers,
         logRetention: scope.props.logRetention ?? props.logRetention,
         reservedConcurrentExecutions:
           props.reservedConcurrentExecutions ?? scope.props.defaultReservedLambdaConcurrentExecutions,
         role: role instanceof iam.Role ? role : undefined,
+        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
         securityGroups: securityGroups,
         timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(15),
-        vpc: vpc,
-        vpcSubnets: vpcSubnets,
         tracing: scope.props.defaultTracing ?? props.tracing,
-        insightsVersion: props.insightsVersion,
+        vpc,
+        vpcSubnets,
       },
     })
 
     if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
       lambdaFunction.addEventSource(
         new eventSources.SqsEventSource(lambdaFunction.deadLetterQueue, {
-          reportBatchItemFailures: true,
           batchSize: props.dlq.retryBatchSize ?? 1,
+          reportBatchItemFailures: true,
         })
       )
     }
@@ -170,18 +166,17 @@ export class LambdaManager {
 
   /**
    * @summary Method to provision a Lambda@Edge function
-   *
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {LambdaEdgeProps} props lambda@edge properties
-   * @param {lambda.ILayerVersion[]} layers
-   * @param {lambda.AssetCode} code
-   * @param {iam.Role} role
-   * @param {Map<string, string>?} environment
-   * @param {ec2.IVpc?} vpc
-   * @param {ec2.ISecurityGroup[]?} securityGroups
-   * @param {efs.IAccessPoint?} accessPoint
-   * @param {string?} mountPath
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props lambda@edge properties
+   * @param layers
+   * @param code
+   * @param role
+   * @param environment
+   * @param vpc
+   * @param securityGroups
+   * @param accessPoint
+   * @param mountPath
    */
   public createEdgeFunction(
     id: string,
@@ -213,17 +208,17 @@ export class LambdaManager {
 
   /**
    * @summary Method to create a lambda function (nodejs) with docker image
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {LambdaProps} props
-   * @param {iam.Role | iam.CfnRole} role
-   * @param {lambda.DockerImageCode} code
-   * @param {Map<string, string>?} environment
-   * @param {ec2.IVpc?} vpc
-   * @param {ec2.ISecurityGroup[]?} securityGroups
-   * @param {efs.IAccessPoint?} accessPoint
-   * @param {string?} mountPath
-   * @param {ec2.SubnetSelection?} vpcSubnets
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props
+   * @param role
+   * @param code
+   * @param environment
+   * @param vpc
+   * @param securityGroups
+   * @param accessPoint
+   * @param mountPath
+   * @param vpcSubnets
    */
   public createLambdaDockerFunction(
     id: string,
@@ -252,14 +247,10 @@ export class LambdaManager {
       ...props,
       ...{
         allowPublicSubnet: !!vpc,
-        functionName: functionName,
-        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
+        architecture: props.architecture ?? lambda.Architecture.ARM_64,
         code: code,
         deadLetterQueue: deadLetterQueue,
-        architecture: props.architecture ?? lambda.Architecture.ARM_64,
         environment: {
-          REGION: scope.props.region,
-          STAGE: scope.props.stage,
           LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
             ? ''
             : scope.ssmManager.readStringParameter(
@@ -267,28 +258,32 @@ export class LambdaManager {
                 scope,
                 `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
               ),
+          REGION: scope.props.region,
+          STAGE: scope.props.stage,
           ...environment,
         },
         filesystem: accessPoint
           ? lambda.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg')
           : undefined,
+        functionName: functionName,
+        insightsVersion: props.insightsVersion,
         logRetention: scope.props.logRetention ?? props.logRetention,
         reservedConcurrentExecutions: props.reservedConcurrentExecutions,
         role: role instanceof iam.Role ? role : undefined,
+        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
         securityGroups: securityGroups,
         timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(1),
-        vpc: vpc,
-        vpcSubnets: vpcSubnets,
         tracing: props.tracing,
-        insightsVersion: props.insightsVersion,
+        vpc,
+        vpcSubnets,
       },
     })
 
     if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
       lambdaFunction.addEventSource(
         new eventSources.SqsEventSource(lambdaFunction.deadLetterQueue, {
-          reportBatchItemFailures: true,
           batchSize: props.dlq.retryBatchSize ?? 1,
+          reportBatchItemFailures: true,
         })
       )
     }
@@ -301,10 +296,10 @@ export class LambdaManager {
 
   /**
    * @summary Method to create a lambda function Alias
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {LambdaAliasProps} props
-   * @param {IVersion} lambdaVersion
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props
+   * @param lambdaVersion
    */
   public createLambdaFunctionAlias(
     id: string,
@@ -317,15 +312,15 @@ export class LambdaManager {
     const lambdaFunctionAlias = new lambda.Alias(scope, `${id}`, {
       ...props,
       ...{
-        aliasName: props.aliasName,
-        version: lambdaVersion,
         additionalVersions: props.additionalVersions,
+        aliasName: props.aliasName,
         description: props.description,
         maxEventAge: props.maxEventAge,
         onFailure: props.onFailure,
         onSuccess: props.onSuccess,
         provisionedConcurrentExecutions: props.provisionedConcurrentExecutions,
         retryAttempts: props.retryAttempts,
+        version: lambdaVersion,
       },
     })
 

package/src/lib/services/aws/lambda/types.ts

@@ -4,31 +4,25 @@ import { EdgeFunctionProps } from 'aws-cdk-lib/aws-cloudfront/lib/experimental'
 import { QueueProps } from '../simple-queue-service'
 
 /**
- * @category cdk-utils.lambda-manager
- * @subcategory Properties
  */
 export interface ProvisionedConcurrencyProps {
-  minCapacity: number
   maxCapacity: number
+  minCapacity: number
   utilizationTarget: number
 }
 
 /**
- * @category cdk-utils.lambda-manager
- * @subcategory Properties
  */
 export interface LambdaProps extends FunctionProps {
   dlq?: QueueProps
-  redriveq?: QueueProps
-  timeoutInSecs?: number
   excludeLastModifiedTimestamp?: boolean
-  tags?: TagProps[]
   lambdaAliases?: LambdaAliasProps[]
+  redriveq?: QueueProps
+  tags?: TagProps[]
+  timeoutInSecs?: number
 }
 
 /**
- * @category cdk-utils.lambda-manager
- * @subcategory Properties
  */
 export interface LambdaAliasProps extends AliasProps {
   id?: string
@@ -36,21 +30,17 @@ export interface LambdaAliasProps extends AliasProps {
 }
 
 /**
- * @category cdk-utils.lambda-manager
- * @subcategory Properties
  */
 export interface LambdaEdgeProps extends EdgeFunctionProps {
-  timeoutInSecs?: number
   tags?: TagProps[]
+  timeoutInSecs?: number
 }
 
 /**
- * @category cdk-utils.lambda-manager
- * @subcategory Types
  */
 export interface LambdaEnvironment {
-  NODE_ENV: string
   LOG_LEVEL: string
+  NODE_ENV: string
   REGION?: string
   STAGE?: string
   TZ: string

package/src/lib/services/aws/route53/main.ts

@@ -7,9 +7,6 @@ import { CommonConstruct } from '../../../common'
 import { Route53Props } from './types'
 
 /**
- * @stability stable
- * @category cdk-utils.route53-manager
- * @subcategory Construct
  * @classdesc Provides operations on AWS Route53.
  * - A new instance of this class is injected into {@link CommonConstruct} constructor.
  * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
@@ -23,15 +20,14 @@ import { Route53Props } from './types'
  *     this.route53Manager.createHostedZone('MyHostedZone', this)
  *   }
  * }
- *
  * @see [CDK Route53 Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_route53-readme.html}
  */
 export class Route53Manager {
   /**
    * @summary Method to create a hosted zone
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {Route53Props} props
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props
    */
   public createHostedZone(id: string, scope: CommonConstruct, props: Route53Props) {
     let hostedZone: route53.IHostedZone
@@ -44,8 +40,8 @@ export class Route53Manager {
       })
     } else {
       hostedZone = new route53.HostedZone(scope, `${id}`, {
-        zoneName: scope.props.domainName,
         comment: `Hosted zone for ${scope.props.domainName}`,
+        zoneName: scope.props.domainName,
       })
     }
 
@@ -57,8 +53,8 @@ export class Route53Manager {
 
   /**
    * @summary Method to create/lookup a hosted zone
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
    * @param useExistingHostedZone Flag to indicate whether to lookup vs create new hosted zone
    */
   public withHostedZoneFromFullyQualifiedDomainName(
@@ -74,8 +70,8 @@ export class Route53Manager {
       })
     } else {
       hostedZone = new route53.HostedZone(scope, `${id}`, {
-        zoneName: scope.fullyQualifiedDomainName,
         comment: `Hosted zone for ${scope.fullyQualifiedDomainName}`,
+        zoneName: scope.fullyQualifiedDomainName,
       })
     }
 
@@ -87,11 +83,11 @@ export class Route53Manager {
 
   /**
    * @summary Method to create a-record for cloudfront target
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {cloudfront.IDistribution} distribution
-   * @param {route53.IHostedZone} hostedZone
-   * @param {string} recordName
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param distribution
+   * @param hostedZone
+   * @param recordName
    * @param skipStageFromRecord
    */
   public createCloudFrontTargetARecord(
@@ -121,11 +117,11 @@ export class Route53Manager {
 
   /**
    * @summary Method to create a-record for cloudfront target
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {cloudfront.IDistribution} distribution
-   * @param {route53.IHostedZone} hostedZone
-   * @param {string} recordName
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param distribution
+   * @param hostedZone
+   * @param recordName
    */
   public createCloudFrontTargetARecordV2(
     id: string,
@@ -150,8 +146,8 @@ export class Route53Manager {
 
   /**
    * @summary Method to create a-record for restApi gateway target
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
    * @param recordName
    * @param apiDomain
    * @param hostedZone

package/src/lib/services/aws/route53/types.ts

@@ -1,8 +1,6 @@
 import { HostedZoneProps } from 'aws-cdk-lib/aws-route53'
 
 /**
- * @category cdk-utils.route53-manager
- * @subcategory Properties
  */
 export interface Route53Props extends HostedZoneProps {
   useExistingHostedZone?: boolean

package/src/lib/services/aws/secrets-manager/main.ts

@@ -5,9 +5,6 @@ import * as utils from '../../../utils'
 import { CommonConstruct } from '../../../common'
 
 /**
- * @stability experimental
- * @category cdk-utils.secrets-manager
- * @subcategory Construct
  * @classdesc Provides operations on AWS Secrets Manager.
  * - A new instance of this class is injected into {@link CommonConstruct} constructor.
  * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
@@ -21,48 +18,29 @@ import { CommonConstruct } from '../../../common'
  *     this.secretsManager.loadSecret('MySecretName', 'eu-west-1')
  *   }
  * }
- *
  * @see [CDK Secrets Manager Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_secretsmanager-readme.html}
  */
 export class SecretsManager {
   /**
    *
-   * @param {string} region
+   * @param region
    */
   public getAwsSecretsManager(region: string) {
     return new SM({ region: region })
   }
 
   /**
-   * @stability experimental
    * @summary Method to load a secret from secrets manager
-   * @param {string} secretName
-   * @param {string} region
+   * @param secretName
+   * @param region
    */
   public async loadSecret(secretName: string, region: string) {
     const secretsManager = this.getAwsSecretsManager(region)
     const secret: any = await Promise.all([secretsManager.getSecretValue({ SecretId: secretName })])
-
     return secret ? JSON.parse(secret[0].SecretString) : {}
   }
 
   /**
-   * @stability experimental
-   * @summary Method to load secrets from secrets manager
-   * @param {string} secretNames
-   * @param {string} region
-   */
-  public async loadSecrets(secretNames: string, region: string) {
-    let secrets = {}
-    for (const secretName of secretNames.split(',')) {
-      secrets = { ...secrets, ...(await this.loadSecret(secretName, region)) }
-    }
-
-    return secrets
-  }
-
-  /**
-   * @stability stable
    * @summary Method to retrieve a secret from secrets manager with a cloudformation export
    * @param id
    * @param scope
@@ -79,9 +57,9 @@ export class SecretsManager {
 
   /**
    * @summary Method to create a secret
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {secretsManager.SecretProps} props the secret properties
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props the secret properties
    */
   public createSecret(id: string, scope: CommonConstruct, props: secretsManager.SecretProps) {
     const secret = new secretsManager.Secret(scope, `${id}`, {

package/src/lib/services/aws/simple-notification-service/main.ts

@@ -6,9 +6,6 @@ import { CommonConstruct } from '../../../common'
 import { SubscriptionProps } from './types'
 
 /**
- * @stability stable
- * @category cdk-utils.sns-manager
- * @subcategory Construct
  * @classdesc Provides operations on AWS Simple Notification Service.
  * - A new instance of this class is injected into {@link CommonConstruct} constructor.
  * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
@@ -22,16 +19,15 @@ import { SubscriptionProps } from './types'
  *     this.snsManager.createEmailNotificationService('MySns', 'eu-west-1', ["test@example.com"])
  *   }
  * }
- *
  * @see [CDK Simple Notification Service Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_sns-readme.html}
  */
 export class SnsManager {
   /**
    * @summary Method to create an email notification service
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {SubscriptionProps} props
-   * @param {string[]} emails
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props
+   * @param emails
    */
   public createEmailNotificationService(
     id: string,
@@ -43,8 +39,8 @@ export class SnsManager {
 
     const topic = new sns.Topic(scope, id, {
       displayName: `${props.topicName}-${scope.props.stage}`,
-      topicName: `${props.topicName}-${scope.props.stage}`,
       fifo: props.fifo,
+      topicName: `${props.topicName}-${scope.props.stage}`,
     })
 
     if (emails && emails.length > 0) {
@@ -59,10 +55,10 @@ export class SnsManager {
 
   /**
    * @summary Method to create a lambda notification service
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {SubscriptionProps} props
-   * @param {lambda.IFunction} lambdaFunction
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props
+   * @param lambdaFunction
    */
   public createLambdaNotificationService(
     id: string,
@@ -74,8 +70,8 @@ export class SnsManager {
 
     const topic = new sns.Topic(scope, id, {
       displayName: `${props.topicName}-${scope.props.stage}`,
-      topicName: `${props.topicName}-${scope.props.stage}`,
       fifo: props.fifo,
+      topicName: `${props.topicName}-${scope.props.stage}`,
     })
 
     topic.addSubscription(new subs.LambdaSubscription(lambdaFunction))

package/src/lib/services/aws/simple-notification-service/types.ts

@@ -1,7 +1,5 @@
 import { TopicProps } from 'aws-cdk-lib/aws-sns'
 
 /**
- * @category cdk-utils.sns-manager
- * @subcategory Properties
  */
 export interface SubscriptionProps extends TopicProps {}

package/src/lib/services/aws/simple-queue-service/main.ts

@@ -6,9 +6,6 @@ import { QueueProps } from './types'
 import { LambdaProps } from '../lambda'
 
 /**
- * @stability stable
- * @category cdk-utils.sqs-manager
- * @subcategory Construct
  * @classdesc Provides operations on AWS Simple Queue Service.
  * - A new instance of this class is injected into {@link CommonConstruct} constructor.
  * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
@@ -22,35 +19,27 @@ import { LambdaProps } from '../lambda'
  *     this.sqsManager.createQueue('MySqs', this, {...})
  *   }
  * }
- *
  * @see [CDK Simple Queue Service Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_sqs-readme.html}
  */
 export class SqsManager {
   /**
    * @summary Method to create a lambda queue service
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {QueueProps} props
-   * @param {sqs.IQueue} deadLetterQueue
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props
+   * @param deadLetterQueue
    */
   public createQueue(id: string, scope: CommonConstruct, props: QueueProps, deadLetterQueue?: sqs.IQueue) {
     if (!props) throw `Queue props undefined for ${id}`
 
     const queue = new sqs.Queue(scope, id, {
-      queueName: props.queueName,
-      visibilityTimeout: props.visibilityTimeoutInSecs
-        ? cdk.Duration.seconds(props.visibilityTimeoutInSecs)
-        : props.visibilityTimeout,
-      receiveMessageWaitTime: props.receiveMessageWaitTimeInSecs
-        ? cdk.Duration.seconds(props.receiveMessageWaitTimeInSecs)
-        : props.receiveMessageWaitTime,
       contentBasedDeduplication: props.contentBasedDeduplication,
       dataKeyReuse: props.dataKeyReuseInSecs ? cdk.Duration.seconds(props.dataKeyReuseInSecs) : props.dataKeyReuse,
       deadLetterQueue: !deadLetterQueue
         ? undefined
         : {
-            queue: deadLetterQueue,
             maxReceiveCount: props.maxReceiveCount ?? 5,
+            queue: deadLetterQueue,
           },
       deduplicationScope: props.deduplicationScope,
       deliveryDelay: props.deliveryDelayInSecs ? cdk.Duration.seconds(props.deliveryDelayInSecs) : undefined,
@@ -59,8 +48,15 @@ export class SqsManager {
       fifo: props.fifo,
       fifoThroughputLimit: props.fifoThroughputLimit,
       maxMessageSizeBytes: props.maxMessageSizeBytes,
+      queueName: props.queueName,
+      receiveMessageWaitTime: props.receiveMessageWaitTimeInSecs
+        ? cdk.Duration.seconds(props.receiveMessageWaitTimeInSecs)
+        : props.receiveMessageWaitTime,
       removalPolicy: props.removalPolicy ?? cdk.RemovalPolicy.DESTROY,
       retentionPeriod: props.retentionInDays ? cdk.Duration.days(props.retentionInDays) : cdk.Duration.days(7),
+      visibilityTimeout: props.visibilityTimeoutInSecs
+        ? cdk.Duration.seconds(props.visibilityTimeoutInSecs)
+        : props.visibilityTimeout,
     })
 
     if (props.tags && props.tags.length > 0) {
@@ -78,9 +74,9 @@ export class SqsManager {
 
   /**
    * @summary Method to create a redrive queue for a lambda function
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {LambdaProps} props the lambda properties
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props the lambda properties
    */
   public createRedriveQueueForLambda(id: string, scope: CommonConstruct, props: LambdaProps) {
     return this.createQueue(`${id}`, scope, {
@@ -93,10 +89,10 @@ export class SqsManager {
 
   /**
    * @summary Method to create a dead letter queue for a lambda function
-   * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {LambdaProps} props the lambda properties
-   * @param {sqs.IQueue} deadLetterQueue
+   * @param id scoped id of the resource
+   * @param scope scope in which this resource is defined
+   * @param props the lambda properties
+   * @param deadLetterQueue
    */
   public createDeadLetterQueueForLambda(
     id: string,