@gradientedge/cdk-utils 5.12.0 → 5.13.0

package/dist/src/lib/construct/site-with-ecs-backend/main.d.ts

@@ -9,7 +9,6 @@ import * as logs from 'aws-cdk-lib/aws-logs';
 import * as route53 from 'aws-cdk-lib/aws-route53';
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
-import * as wafv2 from 'aws-cdk-lib/aws-wafv2';
 import { Construct } from 'constructs';
 import { CommonConstruct } from '../../common';
 import { SiteWithEcsBackendProps } from '../../types';
@@ -62,7 +61,6 @@ export declare class SiteWithEcsBackend extends CommonConstruct {
     siteDomainNames: string[];
     siteCloudfrontFunction: cloudfront.Function;
     siteFunctionAssociations: cloudfront.FunctionAssociation[];
-    siteWebAcl: wafv2.CfnWebACL;
     constructor(parent: Construct, id: string, props: SiteWithEcsBackendProps);
     /**
      * @summary Initialise and provision resources
@@ -151,11 +149,6 @@ export declare class SiteWithEcsBackend extends CommonConstruct {
      * @protected
      */
     protected resolveSiteFunctionAssociations(): void;
-    /**
-     * @summary Method to create WAF
-     * @protected
-     */
-    protected createSiteWebAcl(): void;
     /**
      * Method to create Site distribution
      * @protected

package/dist/src/lib/construct/site-with-ecs-backend/main.js

@@ -80,7 +80,6 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
     siteDomainNames;
     siteCloudfrontFunction;
     siteFunctionAssociations;
-    siteWebAcl;
     constructor(parent, id, props) {
         super(parent, id, props);
         this.props = props;
@@ -108,7 +107,6 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
         this.createSiteOrigin();
         this.createSiteCloudfrontFunction();
         this.resolveSiteFunctionAssociations();
-        this.createSiteWebAcl();
         this.createDistribution();
         this.createNetworkMappings();
         this.invalidateDistributionCache();
@@ -307,21 +305,12 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
             ];
         }
     }
-    /**
-     * @summary Method to create WAF
-     * @protected
-     */
-    createSiteWebAcl() {
-        if (!this.props.siteWebAcl)
-            throw 'SiteWebAcl props undefined';
-        this.siteWebAcl = this.wafManager.createWebAcl(`${this.id}-waf`, this, this.props.siteWebAcl);
-    }
     /**
      * Method to create Site distribution
      * @protected
      */
     createDistribution() {
-        this.siteDistribution = this.cloudFrontManager.createDistributionWithHttpOrigin(`${this.id}-distribution`, this, this.props.siteDistribution, this.siteOrigin, this.siteDomainNames, this.siteLogBucket, this.siteCertificate, this.siteFunctionAssociations, this.siteWebAcl.attrId);
+        this.siteDistribution = this.cloudFrontManager.createDistributionWithHttpOrigin(`${this.id}-distribution`, this, this.props.siteDistribution, this.siteOrigin, this.siteDomainNames, this.siteLogBucket, this.siteCertificate, this.siteFunctionAssociations);
     }
     /**
      * Method to create Route53 records for distribution

package/dist/src/lib/construct/static-site/main.d.ts

@@ -3,7 +3,6 @@ import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
 import * as origins from 'aws-cdk-lib/aws-cloudfront-origins';
 import * as route53 from 'aws-cdk-lib/aws-route53';
 import * as s3 from 'aws-cdk-lib/aws-s3';
-import * as wafv2 from 'aws-cdk-lib/aws-wafv2';
 import { Construct } from 'constructs';
 import { CommonConstruct } from '../../common';
 import { StaticSiteProps } from '../../types';
@@ -40,7 +39,6 @@ export declare class StaticSite extends CommonConstruct {
     siteOriginAccessIdentity: cloudfront.OriginAccessIdentity;
     siteCloudfrontFunction: cloudfront.Function;
     siteFunctionAssociations: cloudfront.FunctionAssociation[];
-    siteWebAcl: wafv2.CfnWebACL;
     constructor(parent: Construct, id: string, props: StaticSiteProps);
     /**
      * @summary Initialise and provision resources
@@ -78,11 +76,6 @@ export declare class StaticSite extends CommonConstruct {
      * @protected
      */
     protected resolveSiteFunctionAssociations(): void;
-    /**
-     * @summary Method to create WAF
-     * @protected
-     */
-    protected createSiteWebAcl(): void;
     /**
      * @summary Method to create a site cloudfront distribution
      * @protected

package/dist/src/lib/construct/static-site/main.js

@@ -62,7 +62,6 @@ class StaticSite extends common_1.CommonConstruct {
     siteOriginAccessIdentity;
     siteCloudfrontFunction;
     siteFunctionAssociations;
-    siteWebAcl;
     constructor(parent, id, props) {
         super(parent, id, props);
         this.props = props;
@@ -80,7 +79,6 @@ class StaticSite extends common_1.CommonConstruct {
         this.createSiteOrigin();
         this.createSiteCloudfrontFunction();
         this.resolveSiteFunctionAssociations();
-        this.createSiteWebAcl();
         this.createSiteDistribution();
         this.createSiteRouteAssets();
         this.deploySite();
@@ -144,15 +142,6 @@ class StaticSite extends common_1.CommonConstruct {
             ];
         }
     }
-    /**
-     * @summary Method to create WAF
-     * @protected
-     */
-    createSiteWebAcl() {
-        if (!this.props.siteWebAcl)
-            throw 'SiteWebAcl props undefined';
-        this.siteWebAcl = this.wafManager.createWebAcl(`${this.id}-waf`, this, this.props.siteWebAcl);
-    }
     /**
      * @summary Method to create a site cloudfront distribution
      * @protected
@@ -160,7 +149,7 @@ class StaticSite extends common_1.CommonConstruct {
     createSiteDistribution() {
         if (!this.props.siteDistribution)
             throw 'SiteDistribution props undefined';
-        this.siteDistribution = this.cloudFrontManager.createDistributionWithS3Origin(`${this.id}-distribution`, this, this.props.siteDistribution, this.siteOrigin, this.siteBucket, this.siteLogBucket, this.siteOriginAccessIdentity, this.siteCertificate, this.props.siteAliases, this.siteFunctionAssociations, this.siteWebAcl.attrId);
+        this.siteDistribution = this.cloudFrontManager.createDistributionWithS3Origin(`${this.id}-distribution`, this, this.props.siteDistribution, this.siteOrigin, this.siteBucket, this.siteLogBucket, this.siteOriginAccessIdentity, this.siteCertificate, this.props.siteAliases, this.siteFunctionAssociations);
     }
     /**
      * @summary Method to create route53 records for static site

package/dist/src/lib/manager/aws/cloudfront-manager.d.ts

@@ -49,9 +49,8 @@ export declare class CloudFrontManager {
      * @param {cloudfront.OriginAccessIdentity?} oai
      * @param {acm.ICertificate?} certificate
      * @param {string[]?} aliases
-     * @param {string?} webAclId
      */
-    createCloudFrontDistribution(id: string, scope: common.CommonConstruct, props: types.CloudFrontProps, siteBucket?: s3.IBucket, logBucket?: s3.IBucket, oai?: cloudfront.OriginAccessIdentity, certificate?: acm.ICertificate, aliases?: string[], webAclId?: string): cdk.aws_cloudfront.CloudFrontWebDistribution;
+    createCloudFrontDistribution(id: string, scope: common.CommonConstruct, props: types.CloudFrontProps, siteBucket?: s3.IBucket, logBucket?: s3.IBucket, oai?: cloudfront.OriginAccessIdentity, certificate?: acm.ICertificate, aliases?: string[]): cdk.aws_cloudfront.CloudFrontWebDistribution;
     /**
      * Method to create a CloudFront distribution with S3 Origin
      * @param {string} id scoped id of the resource
@@ -64,9 +63,8 @@ export declare class CloudFrontManager {
      * @param {acm.ICertificate?} certificate
      * @param {string[]?} aliases
      * @param {cloudfront.FunctionAssociation?} defaultFunctionAssociations
-     * @param {string?} webAclId
      */
-    createDistributionWithS3Origin(id: string, scope: common.CommonConstruct, props: types.DistributionProps, origin: origins.S3Origin, siteBucket: s3.IBucket, logBucket?: s3.IBucket, oai?: cloudfront.OriginAccessIdentity, certificate?: acm.ICertificate, aliases?: string[], defaultFunctionAssociations?: cloudfront.FunctionAssociation[], webAclId?: string): cdk.aws_cloudfront.Distribution;
+    createDistributionWithS3Origin(id: string, scope: common.CommonConstruct, props: types.DistributionProps, origin: origins.S3Origin, siteBucket: s3.IBucket, logBucket?: s3.IBucket, oai?: cloudfront.OriginAccessIdentity, certificate?: acm.ICertificate, aliases?: string[], defaultFunctionAssociations?: cloudfront.FunctionAssociation[]): cdk.aws_cloudfront.Distribution;
     /**
      * Method to create a CloudFront distribution with HTTP Origin
      * @param {string} id scoped id of the resource
@@ -77,9 +75,8 @@ export declare class CloudFrontManager {
      * @param {s3.IBucket?} logBucket
      * @param {acm.ICertificate?} certificate
      * @param {cloudfront.FunctionAssociation?} defaultFunctionAssociations
-     * @param {string?} webAclId
      */
-    createDistributionWithHttpOrigin(id: string, scope: common.CommonConstruct, props: types.DistributionProps, origin: origins.HttpOrigin, domainNames: string[], logBucket?: s3.IBucket, certificate?: acm.ICertificate, defaultFunctionAssociations?: cloudfront.FunctionAssociation[], webAclId?: string): cdk.aws_cloudfront.Distribution;
+    createDistributionWithHttpOrigin(id: string, scope: common.CommonConstruct, props: types.DistributionProps, origin: origins.HttpOrigin, domainNames: string[], logBucket?: s3.IBucket, certificate?: acm.ICertificate, defaultFunctionAssociations?: cloudfront.FunctionAssociation[]): cdk.aws_cloudfront.Distribution;
     /**
      * @summary Method to provision a Lambda@Edge function
      *

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

@@ -78,9 +78,8 @@ class CloudFrontManager {
      * @param {cloudfront.OriginAccessIdentity?} oai
      * @param {acm.ICertificate?} certificate
      * @param {string[]?} aliases
-     * @param {string?} webAclId
      */
-    createCloudFrontDistribution(id, scope, props, siteBucket, logBucket, oai, certificate, aliases, webAclId) {
+    createCloudFrontDistribution(id, scope, props, siteBucket, logBucket, oai, certificate, aliases) {
         if (!siteBucket)
             throw `SiteBucket not defined`;
         if (!certificate)
@@ -114,7 +113,7 @@ class CloudFrontManager {
                 securityPolicy: cloudfront.SecurityPolicyProtocol.TLS_V1_1_2016,
                 sslMethod: cloudfront.SSLMethod.SNI,
             }),
-            webACLId: webAclId,
+            webACLId: props.webACLId,
         });
         utils.createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId);
         utils.createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName);
@@ -132,9 +131,8 @@ class CloudFrontManager {
      * @param {acm.ICertificate?} certificate
      * @param {string[]?} aliases
      * @param {cloudfront.FunctionAssociation?} defaultFunctionAssociations
-     * @param {string?} webAclId
      */
-    createDistributionWithS3Origin(id, scope, props, origin, siteBucket, logBucket, oai, certificate, aliases, defaultFunctionAssociations, webAclId) {
+    createDistributionWithS3Origin(id, scope, props, origin, siteBucket, logBucket, oai, certificate, aliases, defaultFunctionAssociations) {
         const distribution = new cloudfront.Distribution(scope, `${id}`, {
             certificate: certificate,
             comment: `${id} - ${scope.props.stage} stage`,
@@ -159,7 +157,7 @@ class CloudFrontManager {
             logFilePrefix: props.logFilePrefix ?? `edge/`,
             minimumProtocolVersion: props.minimumProtocolVersion ?? cloudfront.SecurityPolicyProtocol.TLS_V1_2_2021,
             priceClass: props.priceClass ?? cloudfront.PriceClass.PRICE_CLASS_ALL,
-            webAclId: webAclId,
+            webAclId: props.webAclId,
         });
         utils.createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId);
         utils.createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName);
@@ -175,9 +173,8 @@ class CloudFrontManager {
      * @param {s3.IBucket?} logBucket
      * @param {acm.ICertificate?} certificate
      * @param {cloudfront.FunctionAssociation?} defaultFunctionAssociations
-     * @param {string?} webAclId
      */
-    createDistributionWithHttpOrigin(id, scope, props, origin, domainNames, logBucket, certificate, defaultFunctionAssociations, webAclId) {
+    createDistributionWithHttpOrigin(id, scope, props, origin, domainNames, logBucket, certificate, defaultFunctionAssociations) {
         const distribution = new cloudfront.Distribution(scope, `${id}`, {
             certificate: certificate,
             comment: `${id} - ${scope.props.stage} stage`,
@@ -202,7 +199,7 @@ class CloudFrontManager {
             logFilePrefix: props.logFilePrefix ?? `edge/`,
             minimumProtocolVersion: props.minimumProtocolVersion ?? cloudfront.SecurityPolicyProtocol.TLS_V1_2_2021,
             priceClass: props.priceClass ?? cloudfront.PriceClass.PRICE_CLASS_ALL,
-            webAclId: webAclId,
+            webAclId: props.webAclId,
         });
         utils.createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId);
         utils.createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName);

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

@@ -58,12 +58,17 @@ class SqsManager {
     createQueue(id, scope, props, deadLetterQueue) {
         if (!props)
             throw `Queue props undefined`;
+        console.log(props);
         const queue = new sqs.Queue(scope, id, {
             queueName: props.queueName,
-            visibilityTimeout: cdk.Duration.seconds(props.visibilityTimeoutInSecs),
-            receiveMessageWaitTime: cdk.Duration.seconds(props.receiveMessageWaitTimeInSecs),
+            visibilityTimeout: props.visibilityTimeoutInSecs
+                ? cdk.Duration.seconds(props.visibilityTimeoutInSecs)
+                : undefined,
+            receiveMessageWaitTime: props.receiveMessageWaitTimeInSecs
+                ? cdk.Duration.seconds(props.receiveMessageWaitTimeInSecs)
+                : undefined,
             contentBasedDeduplication: props.contentBasedDeduplication,
-            dataKeyReuse: cdk.Duration.seconds(props.dataKeyReuseInSecs),
+            dataKeyReuse: props.dataKeyReuseInSecs ? cdk.Duration.seconds(props.dataKeyReuseInSecs) : undefined,
             deadLetterQueue: !deadLetterQueue
                 ? undefined
                 : {
@@ -71,7 +76,7 @@ class SqsManager {
                     maxReceiveCount: props.maxReceiveCount,
                 },
             deduplicationScope: props.deduplicationScope,
-            deliveryDelay: cdk.Duration.seconds(props.deliveryDelayInSecs),
+            deliveryDelay: props.deliveryDelayInSecs ? cdk.Duration.seconds(props.deliveryDelayInSecs) : undefined,
             encryption: props.encryption,
             encryptionMasterKey: props.encryptionMasterKey,
             fifo: props.fifo,
@@ -92,10 +97,9 @@ class SqsManager {
      * @param {types.LambdaProps} props the lambda properties
      */
     createRedriveQueueForLambda(id, scope, props) {
-        if (!props.dlq || !props.redriveq)
+        if (!props.redriveq)
             throw `Redrive queue props for Lambda undefined`;
         return this.createQueue(`${id}`, scope, {
-            ...props.dlq,
             ...props.redriveq,
             ...{
                 queueName: `${props.functionName}-redriveq-${scope.props.stage}`,

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

@@ -72,7 +72,6 @@ export interface SiteWithEcsBackendProps extends CommonStackProps {
     siteSubDomain: string;
     siteTask: ecsPatterns.ApplicationLoadBalancedFargateServiceProps;
     siteVpc: ec2.VpcProps;
-    siteWebAcl?: WafWebACLProps;
     useExistingHostedZone: boolean;
     nodeEnv: string;
     logLevel: string;
@@ -95,7 +94,6 @@ export interface StaticSiteProps extends CommonStackProps {
     siteRecordName?: string;
     siteSubDomain?: string;
     siteAliases?: string[];
-    siteWebAcl?: WafWebACLProps;
     useExistingHostedZone: boolean;
     nodeEnv: string;
     logLevel: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "5.12.0",
+  "version": "5.13.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -46,52 +46,52 @@
   },
   "dependencies": {
     "@types/lodash": "^4.14.182",
-    "@types/node": "^18.0.0",
+    "@types/node": "^18.6.1",
     "app-root-path": "^3.0.0",
-    "aws-cdk-lib": "^2.28.1",
-    "aws-sdk": "^2.1158.0",
-    "constructs": "^10.1.42",
+    "aws-cdk-lib": "^2.33.0",
+    "aws-sdk": "^2.1182.0",
+    "constructs": "^10.1.58",
     "lodash": "^4.17.21",
-    "moment": "^2.29.3",
+    "moment": "^2.29.4",
     "nconf": "^0.12.0",
     "pluralize": "^8.0.0",
-    "ts-node": "^10.8.1"
+    "ts-node": "^10.9.1"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.17.12",
-    "@types/jest": "^28.1.2",
-    "@typescript-eslint/eslint-plugin": "^5.29.0",
-    "@typescript-eslint/parser": "^5.29.0",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@types/jest": "^28.1.6",
+    "@typescript-eslint/eslint-plugin": "^5.31.0",
+    "@typescript-eslint/parser": "^5.31.0",
     "aws-cdk": "*",
     "babel-eslint": "^10.1.0",
     "better-docs": "^2.7.2",
     "codecov": "^3.8.3",
-    "commitizen": "^4.2.4",
+    "commitizen": "^4.2.5",
     "dotenv": "^16.0.1",
-    "eslint": "^8.18.0",
+    "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "husky": "^8.0.1",
-    "jest": "^28.1.1",
-    "jest-extended": "^2.0.0",
-    "jest-junit": "^13.2.0",
-    "jsdoc": "^3.6.10",
+    "jest": "^28.1.3",
+    "jest-extended": "^3.0.1",
+    "jest-junit": "^14.0.0",
+    "jsdoc": "^3.6.11",
     "jsdoc-babel": "^0.5.0",
     "jsdoc-mermaid": "^1.0.0",
-    "lerna": "^5.1.4",
+    "lerna": "^5.3.0",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.0.0",
     "rimraf": "^3.0.2",
     "semantic-release": "^19.0.3",
-    "ts-jest": "^28.0.5",
-    "ts-node": "^10.8.1",
+    "ts-jest": "^28.0.7",
+    "ts-node": "^10.9.1",
     "typescript": "4.7.4"
   },
   "optionalDependencies": {
-    "@babel/core": "^7.18.5",
+    "@babel/core": "^7.18.9",
     "prop-types": "^15.8.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "config": {
     "commitizen": {

package/src/lib/construct/site-with-ecs-backend/main.ts

@@ -11,7 +11,6 @@ import * as logs from 'aws-cdk-lib/aws-logs'
 import * as route53 from 'aws-cdk-lib/aws-route53'
 import * as s3 from 'aws-cdk-lib/aws-s3'
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
-import * as wafv2 from 'aws-cdk-lib/aws-wafv2'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
 import { SiteWithEcsBackendProps } from '../../types'
@@ -66,7 +65,6 @@ export class SiteWithEcsBackend extends CommonConstruct {
   siteDomainNames: string[]
   siteCloudfrontFunction: cloudfront.Function
   siteFunctionAssociations: cloudfront.FunctionAssociation[]
-  siteWebAcl: wafv2.CfnWebACL
 
   constructor(parent: Construct, id: string, props: SiteWithEcsBackendProps) {
     super(parent, id, props)
@@ -97,7 +95,6 @@ export class SiteWithEcsBackend extends CommonConstruct {
     this.createSiteOrigin()
     this.createSiteCloudfrontFunction()
     this.resolveSiteFunctionAssociations()
-    this.createSiteWebAcl()
     this.createDistribution()
     this.createNetworkMappings()
     this.invalidateDistributionCache()
@@ -342,16 +339,6 @@ export class SiteWithEcsBackend extends CommonConstruct {
     }
   }
 
-  /**
-   * @summary Method to create WAF
-   * @protected
-   */
-  protected createSiteWebAcl() {
-    if (!this.props.siteWebAcl) throw 'SiteWebAcl props undefined'
-
-    this.siteWebAcl = this.wafManager.createWebAcl(`${this.id}-waf`, this, this.props.siteWebAcl)
-  }
-
   /**
    * Method to create Site distribution
    * @protected
@@ -365,8 +352,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
       this.siteDomainNames,
       this.siteLogBucket,
       this.siteCertificate,
-      this.siteFunctionAssociations,
-      this.siteWebAcl.attrId
+      this.siteFunctionAssociations
     )
   }
 

package/src/lib/construct/static-site/main.ts

@@ -3,7 +3,6 @@ import * as cloudfront from 'aws-cdk-lib/aws-cloudfront'
 import * as origins from 'aws-cdk-lib/aws-cloudfront-origins'
 import * as route53 from 'aws-cdk-lib/aws-route53'
 import * as s3 from 'aws-cdk-lib/aws-s3'
-import * as wafv2 from 'aws-cdk-lib/aws-wafv2'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
 import { StaticSiteProps } from '../../types'
@@ -44,7 +43,6 @@ export class StaticSite extends CommonConstruct {
   siteOriginAccessIdentity: cloudfront.OriginAccessIdentity
   siteCloudfrontFunction: cloudfront.Function
   siteFunctionAssociations: cloudfront.FunctionAssociation[]
-  siteWebAcl: wafv2.CfnWebACL
 
   constructor(parent: Construct, id: string, props: StaticSiteProps) {
     super(parent, id, props)
@@ -65,7 +63,6 @@ export class StaticSite extends CommonConstruct {
     this.createSiteOrigin()
     this.createSiteCloudfrontFunction()
     this.resolveSiteFunctionAssociations()
-    this.createSiteWebAcl()
     this.createSiteDistribution()
     this.createSiteRouteAssets()
     this.deploySite()
@@ -156,16 +153,6 @@ export class StaticSite extends CommonConstruct {
     }
   }
 
-  /**
-   * @summary Method to create WAF
-   * @protected
-   */
-  protected createSiteWebAcl() {
-    if (!this.props.siteWebAcl) throw 'SiteWebAcl props undefined'
-
-    this.siteWebAcl = this.wafManager.createWebAcl(`${this.id}-waf`, this, this.props.siteWebAcl)
-  }
-
   /**
    * @summary Method to create a site cloudfront distribution
    * @protected
@@ -183,8 +170,7 @@ export class StaticSite extends CommonConstruct {
       this.siteOriginAccessIdentity,
       this.siteCertificate,
       this.props.siteAliases,
-      this.siteFunctionAssociations,
-      this.siteWebAcl.attrId
+      this.siteFunctionAssociations
     )
   }
 

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

@@ -61,7 +61,6 @@ export class CloudFrontManager {
    * @param {cloudfront.OriginAccessIdentity?} oai
    * @param {acm.ICertificate?} certificate
    * @param {string[]?} aliases
-   * @param {string?} webAclId
    */
   public createCloudFrontDistribution(
     id: string,
@@ -71,8 +70,7 @@ export class CloudFrontManager {
     logBucket?: s3.IBucket,
     oai?: cloudfront.OriginAccessIdentity,
     certificate?: acm.ICertificate,
-    aliases?: string[],
-    webAclId?: string
+    aliases?: string[]
   ) {
     if (!siteBucket) throw `SiteBucket not defined`
     if (!certificate) throw `Certificate not defined`
@@ -105,7 +103,7 @@ export class CloudFrontManager {
         securityPolicy: cloudfront.SecurityPolicyProtocol.TLS_V1_1_2016,
         sslMethod: cloudfront.SSLMethod.SNI,
       }),
-      webACLId: webAclId,
+      webACLId: props.webACLId,
     })
 
     utils.createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)
@@ -126,7 +124,6 @@ export class CloudFrontManager {
    * @param {acm.ICertificate?} certificate
    * @param {string[]?} aliases
    * @param {cloudfront.FunctionAssociation?} defaultFunctionAssociations
-   * @param {string?} webAclId
    */
   public createDistributionWithS3Origin(
     id: string,
@@ -138,8 +135,7 @@ export class CloudFrontManager {
     oai?: cloudfront.OriginAccessIdentity,
     certificate?: acm.ICertificate,
     aliases?: string[],
-    defaultFunctionAssociations?: cloudfront.FunctionAssociation[],
-    webAclId?: string
+    defaultFunctionAssociations?: cloudfront.FunctionAssociation[]
   ) {
     const distribution = new cloudfront.Distribution(scope, `${id}`, {
       certificate: certificate,
@@ -165,7 +161,7 @@ export class CloudFrontManager {
       logFilePrefix: props.logFilePrefix ?? `edge/`,
       minimumProtocolVersion: props.minimumProtocolVersion ?? cloudfront.SecurityPolicyProtocol.TLS_V1_2_2021,
       priceClass: props.priceClass ?? cloudfront.PriceClass.PRICE_CLASS_ALL,
-      webAclId: webAclId,
+      webAclId: props.webAclId,
     })
 
     utils.createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)
@@ -184,7 +180,6 @@ export class CloudFrontManager {
    * @param {s3.IBucket?} logBucket
    * @param {acm.ICertificate?} certificate
    * @param {cloudfront.FunctionAssociation?} defaultFunctionAssociations
-   * @param {string?} webAclId
    */
   public createDistributionWithHttpOrigin(
     id: string,
@@ -194,8 +189,7 @@ export class CloudFrontManager {
     domainNames: string[],
     logBucket?: s3.IBucket,
     certificate?: acm.ICertificate,
-    defaultFunctionAssociations?: cloudfront.FunctionAssociation[],
-    webAclId?: string
+    defaultFunctionAssociations?: cloudfront.FunctionAssociation[]
   ) {
     const distribution = new cloudfront.Distribution(scope, `${id}`, {
       certificate: certificate,
@@ -221,7 +215,7 @@ export class CloudFrontManager {
       logFilePrefix: props.logFilePrefix ?? `edge/`,
       minimumProtocolVersion: props.minimumProtocolVersion ?? cloudfront.SecurityPolicyProtocol.TLS_V1_2_2021,
       priceClass: props.priceClass ?? cloudfront.PriceClass.PRICE_CLASS_ALL,
-      webAclId: webAclId,
+      webAclId: props.webAclId,
     })
 
     utils.createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)

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

@@ -35,12 +35,18 @@ export class SqsManager {
   public createQueue(id: string, scope: common.CommonConstruct, props: types.QueueProps, deadLetterQueue?: sqs.IQueue) {
     if (!props) throw `Queue props undefined`
 
+    console.log(props)
+
     const queue = new sqs.Queue(scope, id, {
       queueName: props.queueName,
-      visibilityTimeout: cdk.Duration.seconds(props.visibilityTimeoutInSecs),
-      receiveMessageWaitTime: cdk.Duration.seconds(props.receiveMessageWaitTimeInSecs),
+      visibilityTimeout: props.visibilityTimeoutInSecs
+        ? cdk.Duration.seconds(props.visibilityTimeoutInSecs)
+        : undefined,
+      receiveMessageWaitTime: props.receiveMessageWaitTimeInSecs
+        ? cdk.Duration.seconds(props.receiveMessageWaitTimeInSecs)
+        : undefined,
       contentBasedDeduplication: props.contentBasedDeduplication,
-      dataKeyReuse: cdk.Duration.seconds(props.dataKeyReuseInSecs),
+      dataKeyReuse: props.dataKeyReuseInSecs ? cdk.Duration.seconds(props.dataKeyReuseInSecs) : undefined,
       deadLetterQueue: !deadLetterQueue
         ? undefined
         : {
@@ -48,7 +54,7 @@ export class SqsManager {
             maxReceiveCount: props.maxReceiveCount,
           },
       deduplicationScope: props.deduplicationScope,
-      deliveryDelay: cdk.Duration.seconds(props.deliveryDelayInSecs),
+      deliveryDelay: props.deliveryDelayInSecs ? cdk.Duration.seconds(props.deliveryDelayInSecs) : undefined,
       encryption: props.encryption,
       encryptionMasterKey: props.encryptionMasterKey,
       fifo: props.fifo,
@@ -72,10 +78,9 @@ export class SqsManager {
    * @param {types.LambdaProps} props the lambda properties
    */
   public createRedriveQueueForLambda(id: string, scope: common.CommonConstruct, props: types.LambdaProps) {
-    if (!props.dlq || !props.redriveq) throw `Redrive queue props for Lambda undefined`
+    if (!props.redriveq) throw `Redrive queue props for Lambda undefined`
 
     return this.createQueue(`${id}`, scope, {
-      ...props.dlq,
       ...props.redriveq,
       ...{
         queueName: `${props.functionName}-redriveq-${scope.props.stage}`,

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

@@ -75,7 +75,6 @@ export interface SiteWithEcsBackendProps extends CommonStackProps {
   siteSubDomain: string
   siteTask: ecsPatterns.ApplicationLoadBalancedFargateServiceProps
   siteVpc: ec2.VpcProps
-  siteWebAcl?: WafWebACLProps
   useExistingHostedZone: boolean
   nodeEnv: string
   logLevel: string
@@ -99,7 +98,6 @@ export interface StaticSiteProps extends CommonStackProps {
   siteRecordName?: string
   siteSubDomain?: string
   siteAliases?: string[]
-  siteWebAcl?: WafWebACLProps
   useExistingHostedZone: boolean
   nodeEnv: string
   logLevel: string