@gradientedge/cdk-utils 4.1.2 → 4.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "4.1.2",
+  "version": "4.2.3",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -27,6 +27,7 @@
   "scripts": {
     "build": "rimraf dist/ && npx tsc",
     "ci": "yarn install --frozen-lockfile && yarn build && yarn validate && yarn docs",
+    "cz": "npx cz",
     "typedocs": "rimraf api-docs/ && npx typedoc",
     "docs": "rimraf api-docs && npx jsdoc --pedantic -c jsdoc.json .",
     "fix": "yarn prettify && eslint --fix **/*.ts",
@@ -42,13 +43,13 @@
     }
   },
   "dependencies": {
-    "@aws-cdk/aws-lambda-python-alpha": "2.8.0-alpha.0",
+    "@aws-cdk/aws-lambda-python-alpha": "2.10.0-alpha.0",
     "@types/lodash": "^4.14.178",
-    "@types/node": "^17.0.10",
+    "@types/node": "^17.0.13",
     "app-root-path": "^3.0.0",
-    "aws-cdk-lib": "^2.8.0",
-    "aws-sdk": "^2.1060.0",
-    "constructs": "^10.0.39",
+    "aws-cdk-lib": "^2.10.0",
+    "aws-sdk": "^2.1066.0",
+    "constructs": "^10.0.48",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "nconf": "^0.11.3",
@@ -58,34 +59,43 @@
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@types/jest": "^27.4.0",
-    "@typescript-eslint/eslint-plugin": "^5.10.0",
-    "@typescript-eslint/parser": "^5.10.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
     "aws-cdk": "*",
     "babel-eslint": "^10.1.0",
-    "better-docs": "^2.3.2",
+    "better-docs": "^2.7.1",
     "codecov": "^3.8.3",
-    "dotenv": "^14.2.0",
-    "eslint": "^8.7.0",
+    "commitizen": "^4.2.4",
+    "dotenv": "^14.3.2",
+    "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.25.4",
     "husky": "^7.0.4",
     "jest": "^27.4.7",
-    "jest-extended": "^1.2.0",
+    "jest-extended": "^2.0.0",
     "jest-junit": "^13.0.0",
-    "jsdoc": "^3.6.7",
+    "jsdoc": "^3.6.10",
     "jsdoc-babel": "^0.5.0",
     "jsdoc-mermaid": "^1.0.0",
     "prettier": "^2.5.1",
+    "prettier-plugin-organize-imports": "^2.3.4",
     "rimraf": "^3.0.2",
     "semantic-release": "^19.0.2",
     "ts-jest": "^27.1.3",
     "ts-node": "^10.4.0",
     "typedoc": "^0.22.11",
     "typedoc-plugin-mermaid": "^1.6.0",
-    "typescript": "4.5.4"
+    "typescript": "4.5.5"
   },
   "optionalDependencies": {
-    "@babel/core": "^7.16.10",
-    "prop-types": "^15.8.1"
+    "@babel/core": "^7.16.12",
+    "prop-types": "^15.8.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
 }

package/src/lib/common/commonConstruct.ts

@@ -1,28 +1,8 @@
 import * as cdk from 'aws-cdk-lib'
-import { createCfnOutput, isDevStage, isPrdStage, isTestStage, isUatStage } from '../utils'
-import { CommonStackProps } from '../types'
-import { Route53Manager } from '../manager/route53Manager'
-import { S3Manager } from '../manager/s3Manager'
-import { AcmManager } from '../manager/acmManager'
-import { CloudFrontManager } from '../manager/cloudFrontManager'
-import { LogManager } from '../manager/logManager'
-import { IamManager } from '../manager/iamManager'
-import { CloudTrailManager } from '../manager/cloudTrailManager'
-import { EcsManager } from '../manager/ecsManager'
-import { EventManager } from '../manager/eventManager'
-import { VpcManager } from '../manager/vpcManager'
-import { EksManager } from '../manager/eksManager'
-import { EcrManager } from '../manager/ecrManager'
-import { LambdaManager } from '../manager/lambdaManager'
-import { SnsManager } from '../manager/snsManager'
-import { SecretsManager } from '../manager/secretsManager'
-import { CloudWatchManager } from '../manager/cloudWatchManager'
-import { WafManager } from '../manager/wafManager'
-import { AppConfigManager } from '../manager/appConfigManager'
 import { Construct } from 'constructs'
-import { ApiManager } from '../manager/apiManager'
-import { SsmManager } from '../manager/ssmManager'
-import { CodeBuildManager } from '../manager/codeBuildManager'
+import * as aws from '../manager/aws'
+import * as types from '../types'
+import * as utils from '../utils'
 
 /**
  * @stability stable
@@ -45,28 +25,28 @@ import { CodeBuildManager } from '../manager/codeBuildManager'
  *     B(Construct)-->|implements|C(IConstruct);
  */
 export class CommonConstruct extends Construct {
-  props: CommonStackProps
-  acmManager: AcmManager
-  apiManager: ApiManager
-  appConfigManager: AppConfigManager
-  codeBuildManager: CodeBuildManager
-  cloudFrontManager: CloudFrontManager
-  cloudTrailManager: CloudTrailManager
-  cloudWatchManager: CloudWatchManager
-  ecrManager: EcrManager
-  ecsManager: EcsManager
-  eksManager: EksManager
-  eventManager: EventManager
-  iamManager: IamManager
-  lambdaManager: LambdaManager
-  logManager: LogManager
-  route53Manager: Route53Manager
-  s3Manager: S3Manager
-  secretsManager: SecretsManager
-  snsManager: SnsManager
-  ssMManager: SsmManager
-  vpcManager: VpcManager
-  wafManager: WafManager
+  props: types.CommonStackProps
+  acmManager: aws.AcmManager
+  apiManager: aws.ApiManager
+  appConfigManager: aws.AppConfigManager
+  codeBuildManager: aws.CodeBuildManager
+  cloudFrontManager: aws.CloudFrontManager
+  cloudTrailManager: aws.CloudTrailManager
+  cloudWatchManager: aws.CloudWatchManager
+  ecrManager: aws.EcrManager
+  ecsManager: aws.EcsManager
+  eksManager: aws.EksManager
+  eventManager: aws.EventManager
+  iamManager: aws.IamManager
+  lambdaManager: aws.LambdaManager
+  logManager: aws.LogManager
+  route53Manager: aws.Route53Manager
+  s3Manager: aws.S3Manager
+  secretsManager: aws.SecretsManager
+  snsManager: aws.SnsManager
+  ssMManager: aws.SsmManager
+  vpcManager: aws.VpcManager
+  wafManager: aws.WafManager
   fullyQualifiedDomainName: string
 
   /**
@@ -75,31 +55,31 @@ export class CommonConstruct extends Construct {
    * @param {string} id scoped id of the resource
    * @param {CommonStackProps} props
    */
-  constructor(parent: Construct, id: string, props: CommonStackProps) {
+  constructor(parent: Construct, id: string, props: types.CommonStackProps) {
     super(parent, id)
     this.props = props
-    this.acmManager = new AcmManager()
-    this.apiManager = new ApiManager()
-    this.appConfigManager = new AppConfigManager()
-    this.codeBuildManager = new CodeBuildManager()
-    this.cloudFrontManager = new CloudFrontManager()
-    this.cloudTrailManager = new CloudTrailManager()
-    this.cloudWatchManager = new CloudWatchManager()
-    this.ecrManager = new EcrManager()
-    this.ecsManager = new EcsManager()
-    this.eksManager = new EksManager()
-    this.eventManager = new EventManager()
-    this.iamManager = new IamManager()
-    this.lambdaManager = new LambdaManager()
-    this.logManager = new LogManager()
-    this.route53Manager = new Route53Manager()
-    this.s3Manager = new S3Manager()
-    this.secretsManager = new SecretsManager()
-    this.snsManager = new SnsManager()
-    this.ssMManager = new SsmManager()
-    this.vpcManager = new VpcManager()
-    this.vpcManager = new VpcManager()
-    this.wafManager = new WafManager()
+    this.acmManager = new aws.AcmManager()
+    this.apiManager = new aws.ApiManager()
+    this.appConfigManager = new aws.AppConfigManager()
+    this.codeBuildManager = new aws.CodeBuildManager()
+    this.cloudFrontManager = new aws.CloudFrontManager()
+    this.cloudTrailManager = new aws.CloudTrailManager()
+    this.cloudWatchManager = new aws.CloudWatchManager()
+    this.ecrManager = new aws.EcrManager()
+    this.ecsManager = new aws.EcsManager()
+    this.eksManager = new aws.EksManager()
+    this.eventManager = new aws.EventManager()
+    this.iamManager = new aws.IamManager()
+    this.lambdaManager = new aws.LambdaManager()
+    this.logManager = new aws.LogManager()
+    this.route53Manager = new aws.Route53Manager()
+    this.s3Manager = new aws.S3Manager()
+    this.secretsManager = new aws.SecretsManager()
+    this.snsManager = new aws.SnsManager()
+    this.ssMManager = new aws.SsmManager()
+    this.vpcManager = new aws.VpcManager()
+    this.vpcManager = new aws.VpcManager()
+    this.wafManager = new aws.WafManager()
 
     this.determineFullyQualifiedDomain()
   }
@@ -112,7 +92,7 @@ export class CommonConstruct extends Construct {
    * @param {boolean} overrideId Flag which indicates whether to override the default logical id of the output
    */
   protected addCfnOutput(id: string, value: string, description?: string, overrideId = true): cdk.CfnOutput {
-    return createCfnOutput(id, this, value, description, overrideId)
+    return utils.createCfnOutput(id, this, value, description, overrideId)
   }
 
   /**
@@ -128,23 +108,23 @@ export class CommonConstruct extends Construct {
    * @summary Utility method to determine if the initialisation is in development (dev) stage
    * This is determined by the stage property injected via cdk context
    */
-  public isDevelopmentStage = () => isDevStage(this.props.stage)
+  public isDevelopmentStage = () => utils.isDevStage(this.props.stage)
 
   /**
    * @summary Utility method to determine if the initialisation is in test (tst) stage
    * This is determined by the stage property injected via cdk context
    */
-  public isTestStage = () => isTestStage(this.props.stage)
+  public isTestStage = () => utils.isTestStage(this.props.stage)
 
   /**
    * @summary Utility method to determine if the initialisation is in uat (uat) stage
    * This is determined by the stage property injected via cdk context
    */
-  public isUatStage = () => isUatStage(this.props.stage)
+  public isUatStage = () => utils.isUatStage(this.props.stage)
 
   /**
    * @summary Utility method to determine if the initialisation is in production (prd) stage
    * This is determined by the stage property injected via cdk context
    */
-  public isProductionStage = () => isPrdStage(this.props.stage)
+  public isProductionStage = () => utils.isPrdStage(this.props.stage)
 }

package/src/lib/common/commonStack.ts

@@ -1,7 +1,7 @@
 import * as cdk from 'aws-cdk-lib'
+import { CommonStackProps } from '../types'
 import { isDevStage } from '../utils'
 import { CommonConstruct } from './commonConstruct'
-import { CommonStackProps } from '../types'
 
 const appRoot = require('app-root-path')
 const fs = require('fs')

package/src/lib/common/index.ts

@@ -0,0 +1,2 @@
+export * from './commonConstruct'
+export * from './commonStack'

package/src/lib/construct/graphQLApiLambda.ts

@@ -1,12 +1,12 @@
-import { CommonConstruct } from '../common/commonConstruct'
+import * as apig from 'aws-cdk-lib/aws-apigateway'
+import * as acm from 'aws-cdk-lib/aws-certificatemanager'
 import * as iam from 'aws-cdk-lib/aws-iam'
-import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
-import * as apig from 'aws-cdk-lib/aws-apigateway'
 import * as route53 from 'aws-cdk-lib/aws-route53'
-import * as acm from 'aws-cdk-lib/aws-certificatemanager'
-import { GraphQlApiLambdaEnvironment, GraphQlApiLambdaProps } from '../types'
+import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
+import { CommonConstruct } from '../common/commonConstruct'
+import { GraphQlApiLambdaEnvironment, GraphQlApiLambdaProps } from '../types'
 
 /**
  * @stability stable

package/src/lib/construct/index.ts

@@ -0,0 +1,3 @@
+export * from './graphQLApiLambda'
+export * from './siteWithEcsBackend'
+export * from './staticSite'

package/src/lib/construct/siteWithEcsBackend.ts

@@ -1,19 +1,19 @@
-import { Construct } from 'constructs'
-import { CommonConstruct } from '../common/commonConstruct'
-import { SiteWithEcsBackendProps } from '../types'
 import * as cdk from 'aws-cdk-lib'
-import * as iam from 'aws-cdk-lib/aws-iam'
-import * as ec2 from 'aws-cdk-lib/aws-ec2'
-import * as ecs from 'aws-cdk-lib/aws-ecs'
-import * as logs from 'aws-cdk-lib/aws-logs'
-import * as route53 from 'aws-cdk-lib/aws-route53'
 import * as certificateManager from 'aws-cdk-lib/aws-certificatemanager'
 import * as cloudfront from 'aws-cdk-lib/aws-cloudfront'
+import * as origins from 'aws-cdk-lib/aws-cloudfront-origins'
+import * as ec2 from 'aws-cdk-lib/aws-ec2'
+import * as ecs from 'aws-cdk-lib/aws-ecs'
 import * as ecsPatterns from 'aws-cdk-lib/aws-ecs-patterns'
 import * as elb from 'aws-cdk-lib/aws-elasticloadbalancingv2'
-import * as origins from 'aws-cdk-lib/aws-cloudfront-origins'
+import * as iam from 'aws-cdk-lib/aws-iam'
+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 { Construct } from 'constructs'
+import { CommonConstruct } from '../common/commonConstruct'
+import { SiteWithEcsBackendProps } from '../types'
 
 /**
  * @stability stable
@@ -68,6 +68,8 @@ export class SiteWithEcsBackend extends CommonConstruct {
   siteInternalDomainName: string
   siteExternalDomainName: string
   siteDomainNames: string[]
+  siteCloudfrontFunction: cloudfront.Function
+  siteFunctionAssociations: cloudfront.FunctionAssociation[]
 
   /**
    * @summary Constructor to initialise the SiteWithEcsBackend Construct
@@ -102,6 +104,8 @@ export class SiteWithEcsBackend extends CommonConstruct {
     this.createEcsService()
     this.createSiteLogBucket()
     this.createSiteOrigin()
+    this.createSiteCloudfrontFunction()
+    this.resolveSiteFunctionAssociations()
     this.createDistribution()
     this.createNetworkMappings()
     this.invalidateDistributionCache()
@@ -316,6 +320,35 @@ export class SiteWithEcsBackend extends CommonConstruct {
     })
   }
 
+  /**
+   * @summary Method to create a site cloudfront function
+   * @protected
+   */
+  protected createSiteCloudfrontFunction() {
+    if (this.props.siteCloudfrontFunctionProps) {
+      this.siteCloudfrontFunction = this.cloudFrontManager.createCloudfrontFunction(
+        `${this.id}-function`,
+        this,
+        this.props.siteCloudfrontFunctionProps
+      )
+    }
+  }
+
+  /**
+   * @summary Method to create a site cloudfront function associations
+   * @protected
+   */
+  protected resolveSiteFunctionAssociations() {
+    if (this.props.siteCloudfrontFunctionProps) {
+      this.siteFunctionAssociations = [
+        {
+          function: this.siteCloudfrontFunction,
+          eventType: cloudfront.FunctionEventType.VIEWER_REQUEST,
+        },
+      ]
+    }
+  }
+
   /**
    * Method to create Site distribution
    * @protected
@@ -328,7 +361,8 @@ export class SiteWithEcsBackend extends CommonConstruct {
       this.siteOrigin,
       this.siteDomainNames,
       this.siteLogBucket,
-      this.siteCertificate
+      this.siteCertificate,
+      this.siteFunctionAssociations
     )
   }
 

package/src/lib/construct/staticSite.ts

@@ -1,11 +1,11 @@
-import { CommonConstruct } from '../common/commonConstruct'
-import { StaticSiteProps } from '../types'
-import * as route53 from 'aws-cdk-lib/aws-route53'
 import * as certificateManager from 'aws-cdk-lib/aws-certificatemanager'
-import * as s3 from 'aws-cdk-lib/aws-s3'
 import * as cloudfront from 'aws-cdk-lib/aws-cloudfront'
-import { Construct } from 'constructs'
 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 { Construct } from 'constructs'
+import { CommonConstruct } from '../common/commonConstruct'
+import { StaticSiteProps } from '../types'
 
 /**
  * @stability stable
@@ -46,6 +46,8 @@ export class StaticSite extends CommonConstruct {
   siteDistribution: cloudfront.Distribution
   siteLogBucket: s3.IBucket
   siteOriginAccessIdentity: cloudfront.OriginAccessIdentity
+  siteCloudfrontFunction: cloudfront.Function
+  siteFunctionAssociations: cloudfront.FunctionAssociation[]
 
   /**
    * @summary Constructor to initialise the StaticSite Construct
@@ -70,6 +72,8 @@ export class StaticSite extends CommonConstruct {
     this.createSiteLogBucket()
     this.createSiteBucket()
     this.createSiteOrigin()
+    this.createSiteCloudfrontFunction()
+    this.resolveSiteFunctionAssociations()
     this.createSiteDistribution()
     this.createSiteRouteAssets()
     this.deploySite()
@@ -131,6 +135,35 @@ export class StaticSite extends CommonConstruct {
     this.siteOrigin = new origins.S3Origin(this.siteBucket)
   }
 
+  /**
+   * @summary Method to create a site cloudfront function
+   * @protected
+   */
+  protected createSiteCloudfrontFunction() {
+    if (this.props.siteCloudfrontFunctionProps) {
+      this.siteCloudfrontFunction = this.cloudFrontManager.createCloudfrontFunction(
+        `${this.id}-function`,
+        this,
+        this.props.siteCloudfrontFunctionProps
+      )
+    }
+  }
+
+  /**
+   * @summary Method to create a site cloudfront function associations
+   * @protected
+   */
+  protected resolveSiteFunctionAssociations() {
+    if (this.props.siteCloudfrontFunctionProps) {
+      this.siteFunctionAssociations = [
+        {
+          function: this.siteCloudfrontFunction,
+          eventType: cloudfront.FunctionEventType.VIEWER_REQUEST,
+        },
+      ]
+    }
+  }
+
   /**
    * @summary Method to create a site cloudfront distribution
    * @protected
@@ -147,7 +180,8 @@ export class StaticSite extends CommonConstruct {
       this.siteLogBucket,
       this.siteOriginAccessIdentity,
       this.siteCertificate,
-      this.props.siteAliases
+      this.props.siteAliases,
+      this.siteFunctionAssociations
     )
   }
 

package/src/lib/manager/{acmManager.ts → aws/acmManager.ts}

@@ -1,16 +1,16 @@
+import * as cdk from 'aws-cdk-lib'
 import * as acm from 'aws-cdk-lib/aws-certificatemanager'
 import * as route53 from 'aws-cdk-lib/aws-route53'
-import * as cdk from 'aws-cdk-lib'
-import { CommonConstruct } from '../common/commonConstruct'
-import { AcmProps } from '../types'
-import { createCfnOutput } from '../utils'
+import * as common from '../../common'
+import * as types from '../../types'
+import * as utils from '../../utils'
 
 /**
  * @stability stable
  * @category Security, Identity & Compliance
  * @summary Provides operations on AWS Certificates.
- * - 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.
+ * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
+ * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
  * @example
  * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
@@ -28,8 +28,8 @@ export class AcmManager {
   /**
    * @summary Method to create/import a certificate
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {AcmProps} props certificate props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.AcmProps} props certificate props
    * @param {route53.HostedZone?} hostedZone optional hosted zone to perform DNS validation
    * @returns {acm.ICertificate}
    *
@@ -46,8 +46,8 @@ export class AcmManager {
    */
   public resolveCertificate(
     id: string,
-    scope: CommonConstruct,
-    props: AcmProps,
+    scope: common.CommonConstruct,
+    props: types.AcmProps,
     hostedZone?: route53.IHostedZone
   ): acm.ICertificate {
     if (!props) throw `Certificate props undefined`
@@ -70,7 +70,7 @@ export class AcmManager {
       })
     }
 
-    createCfnOutput(`${id}-certificateArn`, scope, certificate.certificateArn)
+    utils.createCfnOutput(`${id}-certificateArn`, scope, certificate.certificateArn)
 
     return certificate
   }

package/src/lib/manager/{apiManager.ts → aws/apiManager.ts}

@@ -1,19 +1,19 @@
-import { CommonConstruct } from '../common/commonConstruct'
 import * as apig from 'aws-cdk-lib/aws-apigateway'
-import * as lambda from 'aws-cdk-lib/aws-lambda'
 import * as acm from 'aws-cdk-lib/aws-certificatemanager'
-import { createCfnOutput } from '../utils'
+import * as lambda from 'aws-cdk-lib/aws-lambda'
+import * as common from '../../common'
+import * as utils from '../../utils'
 
 /**
  * @stability stable
  * @category Networking & Content Delivery
  * @summary Provides operations on AWS API Gateway.
- * - 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.
+ * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
+ * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
  * @example
- * import { CommonConstruct } from '@gradientedge/cdk-utils'
+ * import { common.CommonConstruct } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends CommonConstruct {
+ * class CustomConstruct extends common.CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -28,19 +28,20 @@ export class ApiManager {
   /**
    * @summary Method to create a Rest API with Lambda backend/target
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
    * @param {AcmProps} props lambda rest api props
    * @param lambdaFunction
    */
   public createLambdaRestApi(
     id: string,
-    scope: CommonConstruct,
+    scope: common.CommonConstruct,
     props: apig.LambdaRestApiProps,
     lambdaFunction: lambda.Function
   ) {
     const api = new apig.LambdaRestApi(scope, `${id}`, {
       binaryMediaTypes: props.binaryMediaTypes,
       minimumCompressionSize: props.minimumCompressionSize,
+      defaultMethodOptions: props.defaultMethodOptions,
       deploy: props.deploy || true,
       deployOptions: {
         stageName: scope.props.stage,
@@ -68,15 +69,12 @@ export class ApiManager {
       },
       restApiName: `${props.restApiName}-${scope.props.stage}`,
       handler: lambdaFunction,
-      defaultCorsPreflightOptions: {
-        allowOrigins: props.defaultCorsPreflightOptions?.allowOrigins || apig.Cors.ALL_ORIGINS,
-        allowMethods: props.defaultCorsPreflightOptions?.allowMethods || apig.Cors.ALL_METHODS,
-      },
+      defaultCorsPreflightOptions: props.defaultCorsPreflightOptions,
       proxy: props.proxy || true,
     })
 
-    createCfnOutput(`${id}-restApiId`, scope, api.restApiId)
-    createCfnOutput(`${id}-restApiName`, scope, api.restApiName)
+    utils.createCfnOutput(`${id}-restApiId`, scope, api.restApiId)
+    utils.createCfnOutput(`${id}-restApiName`, scope, api.restApiName)
 
     return api
   }
@@ -84,11 +82,11 @@ export class ApiManager {
   /**
    * @summary Method to create custom api domain
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
    * @param domainName the domain name to use
    * @param certificate the certificate used for custom api domain
    */
-  public createApiDomain(id: string, scope: CommonConstruct, domainName: string, certificate: acm.ICertificate) {
+  public createApiDomain(id: string, scope: common.CommonConstruct, domainName: string, certificate: acm.ICertificate) {
     const apiDomain = new apig.DomainName(scope, `${id}`, {
       domainName: domainName,
       certificate: certificate,
@@ -96,7 +94,7 @@ export class ApiManager {
       securityPolicy: apig.SecurityPolicy.TLS_1_2,
     })
 
-    createCfnOutput(`${id}-customDomainName`, scope, apiDomain.domainName)
+    utils.createCfnOutput(`${id}-customDomainName`, scope, apiDomain.domainName)
 
     return apiDomain
   }