diff --git a/nx.json b/nx.json
index 549cca57a91..6a70dc30f98 100644
--- a/nx.json
+++ b/nx.json
@@ -11,7 +11,8 @@
           "lint",
           "package",
           "prepare"
-        ]
+        ],
+        "useDaemonProcess": false
       }
     }
   },
@@ -43,4 +44,4 @@
       "analyzeSourceFiles": false
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
index ebcdccc4f0c..3a539ce5f2d 100644
--- a/packages/amplify-category-auth/package.json
+++ b/packages/amplify-category-auth/package.json
@@ -29,10 +29,7 @@
   "dependencies": {
     "@aws-amplify/amplify-environment-parameters": "1.0.0",
     "@aws-amplify/cli-extensibility-helper": "2.3.34",
-    "@aws-cdk/aws-cognito": "~1.124.0",
-    "@aws-cdk/aws-iam": "~1.124.0",
-    "@aws-cdk/aws-lambda": "~1.124.0",
-    "@aws-cdk/core": "~1.124.0",
+    "aws-cdk-lib": "^2.41.0",
     "amplify-cli-core": "3.0.0",
     "amplify-headless-interface": "1.15.0",
     "amplify-prompts": "2.3.0",
@@ -41,6 +38,7 @@
     "aws-sdk": "^2.1113.0",
     "chalk": "^4.1.1",
     "change-case": "^4.1.1",
+    "constructs": "^10.0.5",
     "enquirer": "^2.3.6",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
@@ -71,4 +69,4 @@
       "node"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.test.ts b/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.test.ts
index 0be25b9976b..7ab604bf2c9 100644
--- a/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.test.ts
+++ b/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.test.ts
@@ -1,7 +1,7 @@
+import * as cdk from 'aws-cdk-lib';
+import * as iam from 'aws-cdk-lib/aws-iam';
 import { AmplifyAuthCognitoStack } from '../../../../provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder';
 import { AuthStackSynthesizer } from '../../../../provider-utils/awscloudformation/auth-stack-builder/stack-synthesizer';
-import * as cdk from '@aws-cdk/core';
-import * as iam from '@aws-cdk/aws-iam';
 import { CognitoStackOptions } from '../../../../provider-utils/awscloudformation/service-walkthrough-types/cognito-user-input-types';
 
 describe('generateCognitoStackResources', () => {
@@ -31,83 +31,83 @@ describe('generateCognitoStackResources', () => {
     const testApp = new cdk.App();
     const cognitoStack = new AmplifyAuthCognitoStack(testApp, 'CognitoPreSignUpTriggerTest', { synthesizer: new AuthStackSynthesizer() });
     const props : CognitoStackOptions = {
-        "identityPoolName": "issue96802f106de3_identitypool_2f106de3",
-        "allowUnauthenticatedIdentities": false,
-        "resourceNameTruncated": "issue92f106de3",
-        "userPoolName": "issue96802f106de3_userpool_2f106de3",
-        "autoVerifiedAttributes": [
-          "email"
+      identityPoolName: 'issue96802f106de3_identitypool_2f106de3',
+      allowUnauthenticatedIdentities: false,
+      resourceNameTruncated: 'issue92f106de3',
+      userPoolName: 'issue96802f106de3_userpool_2f106de3',
+      autoVerifiedAttributes: [
+        'email',
+      ],
+      mfaConfiguration: 'OFF',
+      mfaTypes: [
+        'SMS Text Message',
+      ],
+      smsAuthenticationMessage: 'Your authentication code is {####}',
+      smsVerificationMessage: 'Your verification code is {####}',
+      emailVerificationSubject: 'Your verification code',
+      emailVerificationMessage: 'Your verification code is {####}',
+      passwordPolicyMinLength: 8,
+      passwordPolicyCharacters: [],
+      requiredAttributes: [
+        'email',
+      ],
+      aliasAttributes: [],
+      userpoolClientGenerateSecret: false,
+      userpoolClientRefreshTokenValidity: 30,
+      userpoolClientWriteAttributes: [
+        'email',
+      ],
+      userpoolClientReadAttributes: [
+        'email',
+      ],
+      userpoolClientLambdaRole: 'issue92f106de3_userpoolclient_lambda_role',
+      userpoolClientSetAttributes: false,
+      sharedId: '2f106de3',
+      resourceName: 'issue96802f106de32f106de3',
+      authSelections: 'identityPoolAndUserPool',
+      useDefault: 'manual',
+      thirdPartyAuth: false,
+      userPoolGroups: false,
+      adminQueries: false,
+      triggers: {
+        PreSignup: [
+          'custom',
         ],
-        "mfaConfiguration": "OFF",
-        "mfaTypes": [
-          "SMS Text Message"
+      },
+      hostedUI: false,
+      userPoolGroupList: [],
+      serviceName: 'Cognito',
+      usernameCaseSensitive: false,
+      useEnabledMfas: true,
+      authRoleArn: {
+        'Fn::GetAtt': [
+          'AuthRole',
+          'Arn',
         ],
-        "smsAuthenticationMessage": "Your authentication code is {####}",
-        "smsVerificationMessage": "Your verification code is {####}",
-        "emailVerificationSubject": "Your verification code",
-        "emailVerificationMessage": "Your verification code is {####}",
-        "passwordPolicyMinLength": 8,
-        "passwordPolicyCharacters": [],
-        "requiredAttributes": [
-          "email"
+      },
+      unauthRoleArn: {
+        'Fn::GetAtt': [
+          'UnauthRole',
+          'Arn',
         ],
-        "aliasAttributes": [],
-        "userpoolClientGenerateSecret": false,
-        "userpoolClientRefreshTokenValidity": 30,
-        "userpoolClientWriteAttributes": [
-          "email"
-        ],
-        "userpoolClientReadAttributes": [
-          "email"
-        ],
-        "userpoolClientLambdaRole": "issue92f106de3_userpoolclient_lambda_role",
-        "userpoolClientSetAttributes": false,
-        "sharedId": "2f106de3",
-        "resourceName": "issue96802f106de32f106de3",
-        "authSelections": "identityPoolAndUserPool",
-        "useDefault": "manual",
-        "thirdPartyAuth": false,
-        "userPoolGroups": false,
-        "adminQueries": false,
-        "triggers": {
-          "PreSignup": [
-            "custom"
-          ]
-        },
-        "hostedUI": false,
-        "userPoolGroupList": [],
-        "serviceName": "Cognito",
-        "usernameCaseSensitive": false,
-        "useEnabledMfas": true,
-        "authRoleArn": {
-          "Fn::GetAtt": [
-            "AuthRole",
-            "Arn"
-          ]
+      },
+      breakCircularDependency: false,
+      dependsOn: [
+        {
+          category: 'function',
+          resourceName: 'issue96802f106de32f106de3PreSignup',
+          attributes: [
+            'Arn',
+            'Name',
+          ],
         },
-        "unauthRoleArn": {
-          "Fn::GetAtt": [
-            "UnauthRole",
-            "Arn"
-          ]
-        },
-        "breakCircularDependency": false,
-        "dependsOn": [
-          {
-            "category": "function",
-            "resourceName": "issue96802f106de32f106de3PreSignup",
-            "attributes": [
-              "Arn",
-              "Name"
-            ]
-          }
-        ],
-        "permissions": [],
-        "authTriggerConnections": [
-          {triggerType: "PreSignUp",lambdaFunctionName: "issue96802f106de32f106de3PreSignup"}
-        ],
-        "authProviders": [],
-      }
+      ],
+      permissions: [],
+      authTriggerConnections: [
+        { triggerType: 'PreSignUp', lambdaFunctionName: 'issue96802f106de32f106de3PreSignup' },
+      ],
+      authProviders: [],
+    };
     cognitoStack.generateCognitoStackResources(props);
     expect(cognitoStack.userPool!.lambdaConfig).toHaveProperty('preSignUp');
     expect(cognitoStack.userPoolClientWeb!.tokenValidityUnits).toHaveProperty('refreshToken');
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts
index d608503791f..1ed7f61630a 100644
--- a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts
+++ b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts
@@ -1,11 +1,13 @@
-import * as cdk from '@aws-cdk/core';
-import * as s3 from '@aws-cdk/aws-s3';
-import * as iam from '@aws-cdk/aws-iam';
-import * as cognito from '@aws-cdk/aws-cognito';
-import * as lambda from '@aws-cdk/aws-lambda';
+import * as cdk from 'aws-cdk-lib';
+import * as s3 from 'aws-cdk-lib/aws-s3';
+import * as iam from 'aws-cdk-lib/aws-iam';
+import * as cognito from 'aws-cdk-lib/aws-cognito';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
 import { AmplifyAuthCognitoStackTemplate } from '@aws-amplify/cli-extensibility-helper';
-import { CognitoStackOptions } from '../service-walkthrough-types/cognito-user-input-types';
 import _ from 'lodash';
+import * as fs from 'fs-extra';
+import { Construct } from 'constructs';
+import { AmplifyStackTemplate } from 'amplify-cli-core';
 import {
   hostedUILambdaFilePath,
   hostedUIProviderLambdaFilePath,
@@ -14,8 +16,7 @@ import {
   openIdLambdaFilePath,
   userPoolClientLambdaFilePath,
 } from '../constants';
-import * as fs from 'fs-extra';
-import { AmplifyStackTemplate } from 'amplify-cli-core';
+import { CognitoStackOptions } from '../service-walkthrough-types/cognito-user-input-types';
 import { AttributeType } from '../service-walkthrough-types/awsCognito-user-input-types';
 
 const CFN_TEMPLATE_FORMAT_VERSION = '2010-09-09';
@@ -40,12 +41,18 @@ const authProvidersList: Record<string, string> = {
   'appleid.apple.com': 'appleAppId',
 };
 
+/**
+ *
+ */
 export type AmplifyAuthCognitoStackProps = {
   synthesizer: cdk.IStackSynthesizer;
 };
 
+/**
+ *
+ */
 export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCognitoStackTemplate, AmplifyStackTemplate {
-  private _scope: cdk.Construct;
+  private _scope: Construct;
   private _cfnParameterMap: Map<string, cdk.CfnParameter> = new Map();
   private _cfnConditionMap: Map<string, cdk.CfnCondition> = new Map();
   private _cfnOutputMap: Map<string, cdk.CfnOutput> = new Map();
@@ -81,21 +88,21 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
   oAuthCustomResourcePolicy?: iam.CfnPolicy;
   oAuthCustomResourceLogPolicy?: iam.CfnPolicy;
   oAuthCustomResourceInputs?: cdk.CustomResource;
-  //custom resource MFA
+  // custom resource MFA
   mfaLambda?: lambda.CfnFunction;
   mfaLogPolicy?: iam.CfnPolicy;
   mfaLambdaPolicy?: iam.CfnPolicy;
   mfaLambdaInputs?: cdk.CustomResource;
   mfaLambdaRole?: iam.CfnRole;
 
-  //custom resource identity pool - OPenId Lambda Role
+  // custom resource identity pool - OPenId Lambda Role
   openIdLambda?: lambda.CfnFunction;
   openIdLogPolicy?: iam.CfnPolicy;
   openIdLambdaIAMPolicy?: iam.CfnPolicy;
   openIdLambdaInputs?: cdk.CustomResource;
   openIdLambdaRole?: iam.CfnRole;
 
-  constructor(scope: cdk.Construct, id: string, props: AmplifyAuthCognitoStackProps) {
+  constructor(scope: Construct, id: string, props: AmplifyAuthCognitoStackProps) {
     super(scope, id, props);
     this._scope = scope;
     this.templateOptions.templateFormatVersion = CFN_TEMPLATE_FORMAT_VERSION;
@@ -103,6 +110,10 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
     this.lambdaConfigPermissions = {};
     this.lambdaTriggerPermissions = {};
   }
+
+  /**
+   *
+   */
   addCfnResource(props: cdk.CfnResourceProps, logicalId: string): void {
     if (!this._cfnResourceMap.has(logicalId)) {
       this._cfnResourceMap.set(logicalId, new cdk.CfnResource(this, logicalId, props));
@@ -110,19 +121,25 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
       throw new Error(`Cfn Resource with LogicalId ${logicalId} already exists`);
     }
   }
+
+  /**
+   *
+   */
   getCfnOutput(logicalId: string): cdk.CfnOutput {
     if (this._cfnOutputMap.has(logicalId)) {
       return this._cfnOutputMap.get(logicalId)!;
-    } else {
-      throw new Error(`Cfn Output with LogicalId ${logicalId} doesnt exist`);
     }
+    throw new Error(`Cfn Output with LogicalId ${logicalId} doesnt exist`);
   }
+
+  /**
+   *
+   */
   getCfnMapping(logicalId: string): cdk.CfnMapping {
     if (this._cfnMappingMap.has(logicalId)) {
       return this._cfnMappingMap.get(logicalId)!;
-    } else {
-      throw new Error(`Cfn Mapping with LogicalId ${logicalId} doesnt exist`);
     }
+    throw new Error(`Cfn Mapping with LogicalId ${logicalId} doesnt exist`);
   }
 
   /**
@@ -177,33 +194,36 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
     }
   }
 
+  /**
+   *
+   */
   getCfnParameter(logicalId: string): cdk.CfnParameter {
     if (this._cfnParameterMap.has(logicalId)) {
       return this._cfnParameterMap.get(logicalId)!;
-    } else {
-      throw new Error(`Cfn Parameter with LogicalId ${logicalId} doesnt exist`);
     }
+    throw new Error(`Cfn Parameter with LogicalId ${logicalId} doesnt exist`);
   }
 
+  /**
+   *
+   */
   getCfnCondition(logicalId: string): cdk.CfnCondition {
     if (this._cfnConditionMap.has(logicalId)) {
       return this._cfnConditionMap.get(logicalId)!;
-    } else {
-      throw new Error(`Cfn Condition with LogicalId ${logicalId} doesnt exist`);
     }
+    throw new Error(`Cfn Condition with LogicalId ${logicalId} doesnt exist`);
   }
 
   generateCognitoStackResources = async (props: CognitoStackOptions) => {
     const autoVerifiedAttributes = props.autoVerifiedAttributes
       ? props.autoVerifiedAttributes
-          .concat(props.aliasAttributes ? props.aliasAttributes : [])
-          .filter((attr, i, aliasAttributeArray) => ['email', 'phone_number'].includes(attr) && aliasAttributeArray.indexOf(attr) === i)
+        .concat(props.aliasAttributes ? props.aliasAttributes : [])
+        .filter((attr, i, aliasAttributeArray) => ['email', 'phone_number'].includes(attr) && aliasAttributeArray.indexOf(attr) === i)
       : [];
-    const configureSMS =
-      (props.autoVerifiedAttributes && props.autoVerifiedAttributes.includes('phone_number')) ||
-      (props.mfaConfiguration != 'OFF' && props.mfaTypes && props.mfaTypes.includes('SMS Text Message')) ||
-      (props.requiredAttributes && props.requiredAttributes.includes('phone_number')) ||
-      (props.usernameAttributes && props.usernameAttributes.includes(AttributeType.PHONE_NUMBER));
+    const configureSMS = (props.autoVerifiedAttributes && props.autoVerifiedAttributes.includes('phone_number'))
+      || (props.mfaConfiguration != 'OFF' && props.mfaTypes && props.mfaTypes.includes('SMS Text Message'))
+      || (props.requiredAttributes && props.requiredAttributes.includes('phone_number'))
+      || (props.usernameAttributes && props.usernameAttributes.includes(AttributeType.PHONE_NUMBER));
 
     if (props.verificationBucketName) {
       this.customMessageConfirmationBucket = new s3.CfnBucket(this, 'CustomMessageConfirmationBucket', {
@@ -301,7 +321,7 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
       }
 
       if (props.requiredAttributes && props.requiredAttributes.length > 0) {
-        let schemaAttributes: cognito.CfnUserPool.SchemaAttributeProperty[] = [];
+        const schemaAttributes: cognito.CfnUserPool.SchemaAttributeProperty[] = [];
         props.requiredAttributes.forEach(attr => {
           schemaAttributes.push({
             name: attr,
@@ -379,7 +399,7 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
         this.userPool.emailVerificationSubject = cdk.Fn.ref('emailVerificationSubject');
       }
 
-      //TODO: change this
+      // TODO: change this
       if (props.usernameAttributes && (props.usernameAttributes[0] as string) !== 'username') {
         this.userPool.usernameAttributes = cdk.Fn.ref('usernameAttributes') as unknown as string[];
       }
@@ -427,7 +447,7 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
             }
           });
         });
-        //Updating lambda role with permissions to Cognito
+        // Updating lambda role with permissions to Cognito
         if (!_.isEmpty(props.permissions)) {
           this.generateIAMPolicies(props);
         }
@@ -513,13 +533,13 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
       }
 
       if (
-        props.authProviders &&
-        !_.isEmpty(props.authProviders) &&
-        !(Object.keys(props.authProviders).length === 1 && props.authProviders[0] === 'accounts.google.com' && props.audiences)
+        props.authProviders
+        && !_.isEmpty(props.authProviders)
+        && !(Object.keys(props.authProviders).length === 1 && props.authProviders[0] === 'accounts.google.com' && props.audiences)
       ) {
-        this.identityPool.supportedLoginProviders = cdk.Lazy.anyValue({
+        this.identityPool.supportedLoginProviders = cdk.Lazy.any({
           produce: () => {
-            let supprtedProvider: any = {};
+            const supprtedProvider: any = {};
             props.authProviders?.forEach(provider => {
               if (Object.keys(authProvidersList).includes(provider)) {
                 supprtedProvider[provider] = cdk.Fn.ref(authProvidersList[provider]);
@@ -558,10 +578,11 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
    * @param _
    * @returns
    */
-  public renderCloudFormationTemplate = (_: cdk.ISynthesisSession): string => {
-    return JSON.stringify(this._toCloudFormation(), undefined, 2);
-  };
+  public renderCloudFormationTemplate = (_: cdk.ISynthesisSession): string => JSON.stringify(this._toCloudFormation(), undefined, 2);
 
+  /**
+   *
+   */
   createUserPoolClientCustomResource(props: CognitoStackOptions) {
     // iam role
     this.userPoolClientRole = new iam.CfnRole(this, 'UserPoolClientRole', {
@@ -659,6 +680,9 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
     this.userPoolClientInputs.node.addDependency(this.userPoolClientLogPolicy);
   }
 
+  /**
+   *
+   */
   createHostedUICustomResource() {
     // lambda function
     this.hostedUICustomResource = new lambda.CfnFunction(this, 'HostedUICustomResource', {
@@ -737,6 +761,9 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
     this.hostedUICustomResourceInputs.node.addDependency(this.hostedUICustomResourceLogPolicy);
   }
 
+  /**
+   *
+   */
   createHostedUIProviderCustomResource() {
     // lambda function
     this.hostedUIProvidersCustomResource = new lambda.CfnFunction(this, 'HostedUIProvidersCustomResource', {
@@ -817,6 +844,9 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
     this.hostedUIProvidersCustomResourceInputs.node.addDependency(this.hostedUIProvidersCustomResourceLogPolicy);
   }
 
+  /**
+   *
+   */
   createOAuthCustomResource() {
     // lambda function
     this.oAuthCustomResource = new lambda.CfnFunction(this, 'OAuthCustomResource', {
@@ -891,6 +921,9 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
     this.oAuthCustomResourceInputs.node.addDependency(this.oAuthCustomResourceLogPolicy);
   }
 
+  /**
+   *
+   */
   createMFACustomResource(props: CognitoStackOptions) {
     // iam role
     this.mfaLambdaRole = new iam.CfnRole(this, 'MFALambdaRole', {
@@ -1039,6 +1072,9 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
     this.mfaLambdaInputs.node.addDependency(this.mfaLogPolicy);
   }
 
+  /**
+   *
+   */
   createOpenIdLambdaCustomResource(props: CognitoStackOptions) {
     // iam role
     /**
@@ -1083,7 +1119,7 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
         },
       ],
     });
-    //TODO
+    // TODO
     this.openIdLambdaRole!.node.addDependency(this.userPoolClientInputs!.node!.defaultChild!);
     // lambda function
     /**
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.ts
index 97ecca54ce2..d86744f078e 100644
--- a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.ts
+++ b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.ts
@@ -14,21 +14,24 @@ import {
   stateManager,
   $TSAny,
 } from 'amplify-cli-core';
+import * as cdk from 'aws-cdk-lib';
+import _ from 'lodash';
+import * as path from 'path';
+import { printer, formatter } from 'amplify-prompts';
+import * as vm from 'vm2';
+import * as fs from 'fs-extra';
+import os from 'os';
 import { AmplifyAuthCognitoStack } from './auth-cognito-stack-builder';
 import { AuthStackSynthesizer } from './stack-synthesizer';
-import * as cdk from '@aws-cdk/core';
 import { AuthInputState } from '../auth-inputs-manager/auth-input-state';
 import { CognitoStackOptions, AuthTriggerConnection, AuthTriggerPermissions } from '../service-walkthrough-types/cognito-user-input-types';
-import _ from 'lodash';
-import * as path from 'path';
-import { printer, formatter } from 'amplify-prompts';
 import { generateNestedAuthTriggerTemplate } from '../utils/generate-auth-trigger-template';
 import { createUserPoolGroups, updateUserPoolGroups } from '../utils/synthesize-resources';
 import { AttributeType, CognitoCLIInputs } from '../service-walkthrough-types/awsCognito-user-input-types';
-import * as vm from 'vm2';
-import * as fs from 'fs-extra';
-import os from 'os';
 
+/**
+ *
+ */
 export class AmplifyAuthTransform extends AmplifyCategoryTransform {
   private _app: cdk.App;
   private _category: string;
@@ -47,6 +50,9 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
     this._authTemplateObj = new AmplifyAuthCognitoStack(this._app, 'AmplifyAuthCongitoStack', { synthesizer: this._synthesizer });
   }
 
+  /**
+   *
+   */
   public async transform(context: $TSContext): Promise<Template> {
     // parse Input data
     // validating cli-inputs
@@ -94,7 +100,7 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
 
     this._authTemplateObj.generateCognitoStackResources(props);
 
-    //generate Output
+    // generate Output
     this.generateCfnOutputs(props);
   }
 
@@ -133,6 +139,7 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
       }
     }
   };
+
   /**
    *
    * @returns Object required to generate Stack using cdk
@@ -182,7 +189,7 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
       // Auth lambda config for Triggers
       const authTriggerConnections: AuthTriggerConnection[] = [];
       keys.forEach(key => {
-        let config: AuthTriggerConnection = {
+        const config: AuthTriggerConnection = {
           triggerType: key === 'PreSignup' ? 'PreSignUp' : key,
           lambdaFunctionName: `${this.resourceName}${key}`,
         };
@@ -240,7 +247,7 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
       },
     };
 
-    //save parameters
+    // save parameters
     let parameters = {
       ...this._cliInputs.cognitoConfig,
       ...roles,
@@ -255,7 +262,7 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
       // convert permissions
       const triggerPermissions = this._cognitoStackProps.permissions!.map(i => JSON.stringify(i));
       // convert dependsOn
-      const dependsOn = this._cognitoStackProps.dependsOn;
+      const { dependsOn } = this._cognitoStackProps;
       // convert auth trigger connections
       const authTriggerConnections = this._cognitoStackProps.authTriggerConnections!.map(obj => {
         const modifiedObj = _.omit(obj, ['lambdaFunctionArn']);
@@ -273,10 +280,13 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
 
     this.validateCfnParameters(context, oldParameters, parameters);
 
-    //save parameters
+    // save parameters
     JSONUtilities.writeJson(parametersJSONFilePath, parameters);
   };
 
+  /**
+   *
+   */
   public validateCfnParameters(context: $TSContext, oldParameters: $TSAny, parametersJson: $TSAny) {
     // There was a bug between v7.3.0 and v7.6.9 where Cognito resources were being created with incorrect `requiredAttributes` parameter
     // Since `requiredAttributes` is immutable, we must adjust this or CloudFormation step will fail
@@ -302,11 +312,10 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
   }
 
   private generateCfnOutputs = (props: CognitoStackOptions) => {
-    const configureSMS =
-      (props.autoVerifiedAttributes && props.autoVerifiedAttributes.includes('phone_number')) ||
-      (props.mfaConfiguration != 'OFF' && props.mfaTypes && props.mfaTypes.includes('SMS Text Message')) ||
-      (props.requiredAttributes && props.requiredAttributes.includes('phone_number')) ||
-      (props.usernameAttributes && props.usernameAttributes.includes(AttributeType.PHONE_NUMBER));
+    const configureSMS = (props.autoVerifiedAttributes && props.autoVerifiedAttributes.includes('phone_number'))
+      || (props.mfaConfiguration != 'OFF' && props.mfaTypes && props.mfaTypes.includes('SMS Text Message'))
+      || (props.requiredAttributes && props.requiredAttributes.includes('phone_number'))
+      || (props.usernameAttributes && props.usernameAttributes.includes(AttributeType.PHONE_NUMBER));
 
     if (props.authSelections === 'identityPoolAndUserPool' || props.authSelections == 'identityPoolOnly') {
       this._authTemplateObj.addCfnOutput(
@@ -470,7 +479,7 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
     );
 
     if (!_.isEmpty(props.dependsOn)) {
-      const dependsOn = props.dependsOn;
+      const { dependsOn } = props;
       dependsOn?.forEach(param => {
         param.attributes.forEach(attribute => {
           this._authTemplateObj.addCfnParameter(
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-user-pool-group-stack-builder.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-user-pool-group-stack-builder.ts
index 7e801ad7f40..df4e6aa0c65 100644
--- a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-user-pool-group-stack-builder.ts
+++ b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-user-pool-group-stack-builder.ts
@@ -1,11 +1,12 @@
 /* eslint-disable max-classes-per-file */
-import * as cdk from '@aws-cdk/core';
-import * as iam from '@aws-cdk/aws-iam';
-import * as lambda from '@aws-cdk/aws-lambda';
-import { CfnUserPoolGroup } from '@aws-cdk/aws-cognito';
+import * as cdk from 'aws-cdk-lib';
+import * as iam from 'aws-cdk-lib/aws-iam';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
+import { CfnUserPoolGroup } from 'aws-cdk-lib/aws-cognito';
 import { AmplifyUserPoolGroupStackTemplate } from '@aws-amplify/cli-extensibility-helper';
 import { AmplifyStackTemplate } from 'amplify-cli-core';
 import * as fs from 'fs-extra';
+import { Construct } from 'constructs';
 // eslint-disable-next-line import/no-cycle
 import { AmplifyUserPoolGroupStackOptions } from './user-pool-group-stack-transform';
 import { roleMapLambdaFilePath } from '../constants';
@@ -24,7 +25,7 @@ export type AmplifyAuthCognitoStackProps = {
  * CDK stack that contains the UserPool Group resources
  */
 export class AmplifyUserPoolGroupStack extends cdk.Stack implements AmplifyUserPoolGroupStackTemplate, AmplifyStackTemplate {
-  _scope: cdk.Construct;
+  _scope: Construct;
   private _cfnParameterMap: Map<string, cdk.CfnParameter> = new Map();
   private _cfnConditionMap: Map<string, cdk.CfnCondition> = new Map();
   userPoolGroup: Record<string, CfnUserPoolGroup>;
@@ -33,7 +34,7 @@ export class AmplifyUserPoolGroupStack extends cdk.Stack implements AmplifyUserP
   roleMapLambdaFunction?: lambda.CfnFunction;
   lambdaExecutionRole?: iam.CfnRole;
 
-  constructor(scope: cdk.Construct, id: string, props: AmplifyAuthCognitoStackProps) {
+  constructor(scope: Construct, id: string, props: AmplifyAuthCognitoStackProps) {
     super(scope, id, props);
     this._scope = scope;
     this.templateOptions.templateFormatVersion = CFN_TEMPLATE_FORMAT_VERSION;
@@ -311,7 +312,7 @@ const getCfnParamsLogicalId = (cognitoResourceName: string, cfnParamName: string
  */
 export class AmplifyUserPoolGroupStackOutputs extends cdk.Stack implements AmplifyStackTemplate {
   // eslint-disable-next-line @typescript-eslint/no-useless-constructor
-  constructor(scope: cdk.Construct, id: string, props: AmplifyAuthCognitoStackProps) {
+  constructor(scope: Construct, id: string, props: AmplifyAuthCognitoStackProps) {
     super(scope, id, props);
   }
 
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/stack-synthesizer.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/stack-synthesizer.ts
index 6086c9bac98..47ce93d53b4 100644
--- a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/stack-synthesizer.ts
+++ b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/stack-synthesizer.ts
@@ -1,17 +1,20 @@
-import { ISynthesisSession, Stack, LegacyStackSynthesizer } from '@aws-cdk/core';
+import { ISynthesisSession, Stack, LegacyStackSynthesizer } from 'aws-cdk-lib';
 import { Template } from 'cloudform-types';
 import { AmplifyAuthCognitoStack } from './auth-cognito-stack-builder';
 import { AmplifyUserPoolGroupStack, AmplifyUserPoolGroupStackOutputs } from './auth-user-pool-group-stack-builder';
 
+/**
+ *
+ */
 export class AuthStackSynthesizer extends LegacyStackSynthesizer {
   private readonly stacks: Map<string, Stack> = new Map();
   private static readonly stackAssets: Map<string, Template> = new Map();
 
   protected synthesizeStackTemplate(stack: Stack, session: ISynthesisSession): void {
     if (
-      stack instanceof AmplifyAuthCognitoStack ||
-      stack instanceof AmplifyUserPoolGroupStack ||
-      stack instanceof AmplifyUserPoolGroupStackOutputs
+      stack instanceof AmplifyAuthCognitoStack
+      || stack instanceof AmplifyUserPoolGroupStack
+      || stack instanceof AmplifyUserPoolGroupStackOutputs
     ) {
       this.addStack(stack);
       const template = stack.renderCloudFormationTemplate(session) as string;
@@ -24,14 +27,23 @@ export class AuthStackSynthesizer extends LegacyStackSynthesizer {
     }
   }
 
+  /**
+   *
+   */
   setStackAsset(templateName: string, template: string): void {
     AuthStackSynthesizer.stackAssets.set(templateName, JSON.parse(template));
   }
 
+  /**
+   *
+   */
   collectStacks(): Map<string, Template> {
     return new Map(AuthStackSynthesizer.stackAssets.entries());
   }
 
+  /**
+   *
+   */
   addStack(stack: Stack) {
     this.stacks.set(stack.node.id, stack);
   }
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/user-pool-group-stack-transform.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/user-pool-group-stack-transform.ts
index 789a67ff830..68117db3f48 100644
--- a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/user-pool-group-stack-transform.ts
+++ b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/user-pool-group-stack-transform.ts
@@ -13,7 +13,7 @@ import {
   $TSAny,
   $TSObject,
 } from 'amplify-cli-core';
-import * as cdk from '@aws-cdk/core';
+import * as cdk from 'aws-cdk-lib';
 import * as path from 'path';
 import { printer, formatter } from 'amplify-prompts';
 import _ from 'lodash';
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/generate-auth-trigger-template.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/generate-auth-trigger-template.ts
index 709c6d98b10..6d10fa8ebd2 100644
--- a/packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/generate-auth-trigger-template.ts
+++ b/packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/generate-auth-trigger-template.ts
@@ -1,12 +1,13 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
 import { JSONUtilities, pathManager } from 'amplify-cli-core';
-import * as iam from '@aws-cdk/aws-iam';
-import * as lambda from '@aws-cdk/aws-lambda';
-import * as cdk from '@aws-cdk/core';
-import { prepareApp } from '@aws-cdk/core/lib/private/prepare-app';
-import { Construct, CustomResource } from '@aws-cdk/core';
+import * as iam from 'aws-cdk-lib/aws-iam';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
+import * as cdk from 'aws-cdk-lib';
+import { prepareApp } from 'aws-cdk-lib/core/lib/private/prepare-app';
+import { CustomResource } from 'aws-cdk-lib';
 import { v4 as uuid } from 'uuid';
+import { Construct } from 'constructs';
 import { AuthTriggerConnection, CognitoStackOptions } from '../service-walkthrough-types/cognito-user-input-types';
 import { authTriggerAssetFilePath } from '../constants';
 
@@ -21,7 +22,7 @@ const CFN_TEMPLATE_FORMAT_VERSION = '2010-09-09';
  * CDK stack for custom auth resources
  */
 export class CustomResourceAuthStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props: CustomResourceAuthStackProps) {
+  constructor(scope: Construct, id: string, props: CustomResourceAuthStackProps) {
     super(scope, id, props);
     this.templateOptions.templateFormatVersion = CFN_TEMPLATE_FORMAT_VERSION;
 
diff --git a/packages/amplify-category-custom/resources/cdk-stack.ts.sample b/packages/amplify-category-custom/resources/cdk-stack.ts.sample
index 1e9c071f73c..7b46e2b739e 100644
--- a/packages/amplify-category-custom/resources/cdk-stack.ts.sample
+++ b/packages/amplify-category-custom/resources/cdk-stack.ts.sample
@@ -1,13 +1,13 @@
-import * as cdk from '@aws-cdk/core';
+import * as cdk from 'aws-cdk-lib';
 import * as AmplifyHelpers from '@aws-amplify/cli-extensibility-helper';
 import { AmplifyDependentResourcesAttributes } from '../../types/amplify-dependent-resources-ref';
-//import * as iam from '@aws-cdk/aws-iam';
-//import * as sns from '@aws-cdk/aws-sns';
-//import * as subs from '@aws-cdk/aws-sns-subscriptions';
-//import * as sqs from '@aws-cdk/aws-sqs';
+//import * as iam from 'aws-cdk-lib/aws-iam';
+//import * as sns from 'aws-cdk-lib/aws-sns';
+//import * as subs from 'aws-cdk-lib/aws-sns-subscriptions';
+//import * as sqs from 'aws-cdk-lib/aws-sqs';
 
 export class cdkStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps, amplifyResourceProps?: AmplifyHelpers.AmplifyResourceProps) {
+  constructor(scope: Construct, id: string, props?: cdk.StackProps, amplifyResourceProps?: AmplifyHelpers.AmplifyResourceProps) {
     super(scope, id, props);
     /* Do not remove - Amplify CLI automatically injects the current deployment environment in this input parameter */
     new cdk.CfnParameter(this, 'env', {
diff --git a/packages/amplify-category-custom/resources/package.json b/packages/amplify-category-custom/resources/package.json
index 3647f6943d7..00026153d37 100644
--- a/packages/amplify-category-custom/resources/package.json
+++ b/packages/amplify-category-custom/resources/package.json
@@ -1,21 +1,17 @@
 {
-    "name": "custom-resource",
-    "version": "1.0.0",
-    "description": "",
-    "scripts": {
-      "build": "tsc",
-      "watch": "tsc -w",
-      "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "dependencies": {
-      "@aws-amplify/cli-extensibility-helper": "^2.0.0",
-      "@aws-cdk/core": "~1.124.0",
-      "@aws-cdk/aws-iam": "~1.124.0",
-      "@aws-cdk/aws-sns-subscriptions": "~1.124.0",
-      "@aws-cdk/aws-sqs": "~1.124.0",
-      "@aws-cdk/aws-sns": "~1.124.0"
-    },
-    "devDependencies": {
-      "typescript": "^4.2.4"
-    }
-}
+  "name": "custom-resource",
+  "version": "1.0.0",
+  "description": "",
+  "scripts": {
+    "build": "tsc",
+    "watch": "tsc -w",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "dependencies": {
+    "@aws-amplify/cli-extensibility-helper": "^2.0.0",
+    "aws-cdk-lib": "^2.41.0",
+  },
+  "devDependencies": {
+    "typescript": "^4.2.4"
+  }
+}
\ No newline at end of file
diff --git a/packages/amplify-category-custom/src/__tests__/utils/dependency-management-utils.test.ts b/packages/amplify-category-custom/src/__tests__/utils/dependency-management-utils.test.ts
index a46fd5f4972..e34e58b37d7 100644
--- a/packages/amplify-category-custom/src/__tests__/utils/dependency-management-utils.test.ts
+++ b/packages/amplify-category-custom/src/__tests__/utils/dependency-management-utils.test.ts
@@ -1,15 +1,17 @@
-import { $TSContext, CFNTemplateFormat, readCFNTemplate, pathManager, stateManager, writeCFNTemplate } from 'amplify-cli-core';
+import {
+  $TSContext, CFNTemplateFormat, readCFNTemplate, pathManager, stateManager, writeCFNTemplate,
+} from 'amplify-cli-core';
 import { glob } from 'glob';
 import * as inquirer from 'inquirer';
 import { prompter } from 'amplify-prompts';
 import * as fs from 'fs-extra';
+import * as cdk from 'aws-cdk-lib';
 import {
   getResourceCfnOutputAttributes,
   getAllResources,
   addCDKResourceDependency,
   addCFNResourceDependency,
 } from '../../utils/dependency-management-utils';
-import * as cdk from '@aws-cdk/core';
 
 jest.mock('amplify-cli-core');
 jest.mock('amplify-prompts');
@@ -319,7 +321,7 @@ describe('addCFNResourceDependency() scenarios', () => {
     } as unknown as $TSContext;
   });
 
-  it('add new resource dependency to custom cfn stack ', async () => {
+  it('add new resource dependency to custom cfn stack', async () => {
     prompter.yesOrNo = jest.fn().mockReturnValueOnce(true);
     fs_mock.existsSync.mockReturnValue(false); // if build dir exists
 
diff --git a/packages/amplify-category-custom/src/utils/dependency-management-utils.ts b/packages/amplify-category-custom/src/utils/dependency-management-utils.ts
index 0e0401af40d..b6bf307c1fa 100644
--- a/packages/amplify-category-custom/src/utils/dependency-management-utils.ts
+++ b/packages/amplify-category-custom/src/utils/dependency-management-utils.ts
@@ -1,21 +1,30 @@
-import * as cdk from '@aws-cdk/core';
-import { $TSContext, $TSObject, pathManager, readCFNTemplate, stateManager, writeCFNTemplate } from 'amplify-cli-core';
+import * as cdk from 'aws-cdk-lib';
+import {
+  $TSContext, $TSObject, pathManager, readCFNTemplate, stateManager, writeCFNTemplate,
+} from 'amplify-cli-core';
 import { printer, prompter } from 'amplify-prompts';
 import * as fs from 'fs-extra';
 import { glob } from 'glob';
 import inquirer, { CheckboxQuestion, DistinctChoice } from 'inquirer';
 import _ from 'lodash';
 import * as path from 'path';
-import { categoryName, customResourceCFNFilenameSuffix } from '../utils/constants';
+import { categoryName, customResourceCFNFilenameSuffix } from './constants';
+
 const AUTH_TRIGGER_TEMPLATE = 'auth-trigger-cloudformation-template.json';
 
 const cfnTemplateGlobPattern = '*template*.+(yaml|yml|json)';
+/**
+ *
+ */
 export interface AmplifyDependentResourceDefinition {
   resourceName: string;
   category: string;
   attributes?: [string?];
 }
 
+/**
+ *
+ */
 export function getResourceCfnOutputAttributes(category: string, resourceName: string): [string?] {
   const resourceDir = pathManager.getResourceDirectoryPath(undefined, category, resourceName);
   const resourceBuildDir = path.join(resourceDir, 'build');
@@ -37,10 +46,9 @@ export function getResourceCfnOutputAttributes(category: string, resourceName: s
       if (cfnFiles.length > 1) {
         printer.warn(`${resourceName} has more than one CloudFormation definitions in the resource folder which isn't permitted.`);
         return [];
-      } else {
-        if (resourceBuildDir && cfnFiles[0]) {
-          cfnFilePath = path.join(resourceBuildDir, cfnFiles[0]);
-        }
+      }
+      if (resourceBuildDir && cfnFiles[0]) {
+        cfnFilePath = path.join(resourceBuildDir, cfnFiles[0]);
       }
     }
   }
@@ -62,10 +70,10 @@ export function getResourceCfnOutputAttributes(category: string, resourceName: s
     const { cfnTemplate } = readCFNTemplate(cfnFilePath);
     if (cfnTemplate && cfnTemplate.Outputs) {
       const allOutputs: $TSObject = cfnTemplate.Outputs;
-      let outputsWithoutConditions: any = {};
+      const outputsWithoutConditions: any = {};
 
       for (const key in allOutputs) {
-        if (!allOutputs[key]['Condition']) {
+        if (!allOutputs[key].Condition) {
           // Filter out outputs which are conditional to avoid deployment failures
           outputsWithoutConditions[key] = allOutputs[key];
         }
@@ -78,13 +86,16 @@ export function getResourceCfnOutputAttributes(category: string, resourceName: s
   return [];
 }
 
+/**
+ *
+ */
 export function getAllResources() {
   const meta = stateManager.getMeta();
   const categories = Object.keys(meta).filter(category => category !== 'providers');
   const allResources: $TSObject = {};
 
   for (const category of categories) {
-    let resourcesList = category in meta ? Object.keys(meta[category]) : [];
+    const resourcesList = category in meta ? Object.keys(meta[category]) : [];
 
     if (_.isEmpty(resourcesList)) {
       continue;
@@ -121,6 +132,9 @@ export function getAllResources() {
 }
 
 // helper function to add dependencies for resources to a CDK stack
+/**
+ *
+ */
 export function addCDKResourceDependency(
   stack: cdk.Stack,
   category: string,
@@ -176,6 +190,9 @@ function addDependsOnToResource(category: string, resourceName: string, dependsO
   stateManager.setMeta(undefined, meta);
 }
 
+/**
+ *
+ */
 export async function addCFNResourceDependency(context: $TSContext, customResourceName: string) {
   const selectResourcesInCategory = (
     choices: DistinctChoice<any>[],
@@ -251,7 +268,7 @@ export async function addCFNResourceDependency(context: $TSContext, customResour
         selectedResources = _.concat(resourcesList);
       }
 
-      for (let resourceName of selectedResources) {
+      for (const resourceName of selectedResources) {
         // In case of some resources they are not in the meta file so check for resource existence as well
         const isMobileHubImportedResource = _.get(amplifyMeta, [selectedCategory, resourceName, 'mobileHubMigrated'], false);
         if (isMobileHubImportedResource) {
@@ -266,7 +283,7 @@ export async function addCFNResourceDependency(context: $TSContext, customResour
 
           const resourceDefinition: AmplifyDependentResourceDefinition = {
             category: selectedCategory,
-            resourceName: resourceName,
+            resourceName,
             attributes: resourceCfnOutputAttributes,
           };
 
@@ -329,7 +346,7 @@ function showUsageInformation(resources: AmplifyDependentResourceDefinition[]) {
 }
 
 function generateInputParametersForDependencies(resources: AmplifyDependentResourceDefinition[]) {
-  let parameters: $TSObject = {};
+  const parameters: $TSObject = {};
 
   for (const resource of resources) {
     for (const attribute of resource.attributes || []) {
diff --git a/packages/amplify-category-custom/src/utils/generate-cfn-from-cdk.ts b/packages/amplify-category-custom/src/utils/generate-cfn-from-cdk.ts
index 33e06d891bc..aa26f325aad 100644
--- a/packages/amplify-category-custom/src/utils/generate-cfn-from-cdk.ts
+++ b/packages/amplify-category-custom/src/utils/generate-cfn-from-cdk.ts
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import * as cdk from '@aws-cdk/core';
+import * as cdk from 'aws-cdk-lib';
 import { JSONUtilities, pathManager } from 'amplify-cli-core';
 import { categoryName } from './constants';
 
diff --git a/packages/amplify-category-storage/package.json b/packages/amplify-category-storage/package.json
index 910dda50cc0..3ba7b67af37 100644
--- a/packages/amplify-category-storage/package.json
+++ b/packages/amplify-category-storage/package.json
@@ -28,15 +28,14 @@
   "dependencies": {
     "@aws-amplify/amplify-environment-parameters": "1.0.0",
     "@aws-amplify/cli-extensibility-helper": "2.3.34",
-    "@aws-cdk/aws-dynamodb": "~1.124.0",
-    "@aws-cdk/aws-s3": "~1.124.0",
-    "@aws-cdk/core": "~1.124.0",
+    "aws-cdk-lib": "^2.41.0",
     "amplify-cli-core": "3.0.0",
     "amplify-headless-interface": "1.15.0",
     "amplify-prompts": "2.3.0",
     "amplify-util-import": "2.2.36",
     "aws-sdk": "^2.1113.0",
     "chalk": "^4.1.1",
+    "constructs": "^10.0.5",
     "enquirer": "^2.3.6",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.21",
@@ -69,4 +68,4 @@
       "html"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/ddb-stack-builder.ts b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/ddb-stack-builder.ts
index a0162d89a42..6a350a13501 100644
--- a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/ddb-stack-builder.ts
+++ b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/ddb-stack-builder.ts
@@ -1,18 +1,22 @@
-import * as cdk from '@aws-cdk/core';
-import * as ddb from '@aws-cdk/aws-dynamodb';
-import { DynamoDBCLIInputs, DynamoDBCLIInputsKeyType, FieldType } from '../service-walkthrough-types/dynamoDB-user-input-types';
+import * as cdk from 'aws-cdk-lib';
+import * as ddb from 'aws-cdk-lib/aws-dynamodb';
+import { Construct } from 'constructs';
 import { AmplifyDDBResourceTemplate } from '@aws-amplify/cli-extensibility-helper';
+import { DynamoDBCLIInputs, DynamoDBCLIInputsKeyType, FieldType } from '../service-walkthrough-types/dynamoDB-user-input-types';
 
 const CFN_TEMPLATE_FORMAT_VERSION = '2010-09-09';
 const ROOT_CFN_DESCRIPTION = 'DDB Resource for AWS Amplify CLI';
 
+/**
+ *
+ */
 export class AmplifyDDBResourceStack extends cdk.Stack implements AmplifyDDBResourceTemplate {
-  _scope: cdk.Construct;
+  _scope: Construct;
   dynamoDBTable!: ddb.CfnTable;
   _props: DynamoDBCLIInputs;
   _cfnParameterMap: Map<string, cdk.CfnParameter> = new Map();
 
-  constructor(scope: cdk.Construct, id: string, props: DynamoDBCLIInputs) {
+  constructor(scope: Construct, id: string, props: DynamoDBCLIInputs) {
     super(scope, id, undefined);
     this._scope = scope;
     this._props = props;
@@ -58,6 +62,7 @@ export class AmplifyDDBResourceStack extends cdk.Stack implements AmplifyDDBReso
       throw new Error(error);
     }
   }
+
   /**
    *
    * @param props
@@ -88,9 +93,9 @@ export class AmplifyDDBResourceStack extends cdk.Stack implements AmplifyDDBReso
   }
 
   generateStackResources = async () => {
-    let usedAttributes: DynamoDBCLIInputsKeyType[] = [];
-    let keySchema: ddb.CfnTable.KeySchemaProperty[] = [];
-    let globalSecondaryIndexes: ddb.CfnTable.GlobalSecondaryIndexProperty[] = [];
+    const usedAttributes: DynamoDBCLIInputsKeyType[] = [];
+    const keySchema: ddb.CfnTable.KeySchemaProperty[] = [];
+    const globalSecondaryIndexes: ddb.CfnTable.GlobalSecondaryIndexProperty[] = [];
 
     if (this._props.partitionKey) {
       usedAttributes.push(this._props.partitionKey);
@@ -108,7 +113,7 @@ export class AmplifyDDBResourceStack extends cdk.Stack implements AmplifyDDBReso
     }
     if (this._props.gsi && this._props.gsi.length > 0) {
       this._props.gsi.forEach(gsi => {
-        let gsiIndex = {
+        const gsiIndex = {
           indexName: gsi.name,
           keySchema: [
             {
@@ -154,7 +159,7 @@ export class AmplifyDDBResourceStack extends cdk.Stack implements AmplifyDDBReso
       'binary-set': 'BS',
     };
 
-    let attributeMapping: ddb.CfnTable.AttributeDefinitionProperty[] = [];
+    const attributeMapping: ddb.CfnTable.AttributeDefinitionProperty[] = [];
 
     usedAttributes.forEach((attr: DynamoDBCLIInputsKeyType) => {
       attributeMapping.push({
@@ -182,7 +187,5 @@ export class AmplifyDDBResourceStack extends cdk.Stack implements AmplifyDDBReso
     });
   };
 
-  public renderCloudFormationTemplate = (): string => {
-    return JSON.stringify(this._toCloudFormation(), undefined, 2);
-  };
+  public renderCloudFormationTemplate = (): string => JSON.stringify(this._toCloudFormation(), undefined, 2);
 }
diff --git a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/ddb-stack-transform.ts b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/ddb-stack-transform.ts
index 455c8f9e2c1..1005c1cbed6 100644
--- a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/ddb-stack-transform.ts
+++ b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/ddb-stack-transform.ts
@@ -1,7 +1,8 @@
 import { AmplifyDDBResourceTemplate } from '@aws-amplify/cli-extensibility-helper';
-import * as cdk from '@aws-cdk/core';
-import { App } from '@aws-cdk/core';
-import { $TSAny, $TSContext, buildOverrideDir, JSONUtilities, pathManager } from 'amplify-cli-core';
+import * as cdk from 'aws-cdk-lib';
+import {
+  $TSAny, $TSContext, buildOverrideDir, JSONUtilities, pathManager,
+} from 'amplify-cli-core';
 import { formatter, printer } from 'amplify-prompts';
 import * as fs from 'fs-extra';
 import os from 'os';
@@ -13,8 +14,11 @@ import { AmplifyDDBResourceStack } from './ddb-stack-builder';
 import { AmplifyDDBResourceInputParameters } from './types';
 import { getDdbAttrType } from '../cfn-template-utils';
 
+/**
+ *
+ */
 export class DDBStackTransform {
-  app: App;
+  app: cdk.App;
   _context: $TSContext;
   _cliInputs: DynamoDBCLIInputs;
   _resourceTemplateObj: AmplifyDDBResourceStack | undefined;
@@ -24,7 +28,7 @@ export class DDBStackTransform {
   _resourceName: string;
 
   constructor(context: $TSContext, resourceName: string) {
-    this.app = new App();
+    this.app = new cdk.App();
     this._context = context;
     this._resourceName = resourceName;
 
@@ -34,6 +38,9 @@ export class DDBStackTransform {
     this._cliInputsState.isCLIInputsValid();
   }
 
+  /**
+   *
+   */
   async transform() {
     // Generate  cloudformation stack from cli-inputs.json
     await this.generateStack();
@@ -48,6 +55,9 @@ export class DDBStackTransform {
     this.saveBuildFiles();
   }
 
+  /**
+   *
+   */
   generateCfnInputParameters() {
     this._cfnInputParams = {
       tableName: this._cliInputs.tableName,
@@ -60,6 +70,9 @@ export class DDBStackTransform {
     }
   }
 
+  /**
+   *
+   */
   async generateStack() {
     this._resourceTemplateObj = new AmplifyDDBResourceStack(this.app, 'AmplifyDDBResourceStack', this._cliInputs);
 
@@ -172,6 +185,9 @@ export class DDBStackTransform {
     );
   }
 
+  /**
+   *
+   */
   async applyOverrides() {
     const backendDir = pathManager.getBackendDirPath();
     const resourceDirPath = pathManager.getResourceDirectoryPath(undefined, 'storage', this._resourceName);
@@ -216,6 +232,9 @@ export class DDBStackTransform {
     }
   }
 
+  /**
+   *
+   */
   saveBuildFiles() {
     if (this._resourceTemplateObj) {
       this._cfn = JSON.parse(this._resourceTemplateObj.renderCloudFormationTemplate());
diff --git a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/s3-stack-builder.ts b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/s3-stack-builder.ts
index 774ad5287d7..2aa077305b1 100644
--- a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/s3-stack-builder.ts
+++ b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/s3-stack-builder.ts
@@ -1,10 +1,13 @@
 import { AmplifyS3ResourceTemplate } from '@aws-amplify/cli-extensibility-helper';
-import * as iamCdk from '@aws-cdk/aws-iam';
-import * as lambdaCdk from '@aws-cdk/aws-lambda';
-import * as s3Cdk from '@aws-cdk/aws-s3';
-import { HttpMethods } from '@aws-cdk/aws-s3';
-import * as cdk from '@aws-cdk/core';
-import { $TSAny, $TSContext, $TSObject, AmplifyCategories, stateManager } from 'amplify-cli-core';
+import * as iamCdk from 'aws-cdk-lib/aws-iam';
+import * as lambdaCdk from 'aws-cdk-lib/aws-lambda';
+import * as s3Cdk from 'aws-cdk-lib/aws-s3';
+import { HttpMethods } from 'aws-cdk-lib/aws-s3';
+import * as cdk from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+import {
+  $TSAny, $TSContext, $TSObject, AmplifyCategories, stateManager,
+} from 'amplify-cli-core';
 import {
   defaultS3UserInputs,
   GroupAccessType,
@@ -17,16 +20,22 @@ import {
 } from '../service-walkthrough-types/s3-user-input-types';
 import * as s3AuthAPI from '../service-walkthroughs/s3-auth-api';
 import { S3CFNDependsOn, S3CFNPermissionType, S3InputState } from '../service-walkthroughs/s3-user-input-state';
-import { AmplifyBuildParamsPermissions, AmplifyCfnParamType, AmplifyResourceCfnStack, AmplifyS3ResourceInputParameters } from './types';
+import {
+  AmplifyBuildParamsPermissions, AmplifyCfnParamType, AmplifyResourceCfnStack, AmplifyS3ResourceInputParameters,
+} from './types';
 
+/**
+ *
+ */
 export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implements AmplifyS3ResourceTemplate {
   id: string;
-  scope: cdk.Construct;
+  scope: Construct;
   s3Bucket!: s3Cdk.CfnBucket;
   s3BucketName: string;
   notificationConfiguration: s3Cdk.CfnBucket.NotificationConfigurationProperty = {
     lambdaConfigurations: [],
   };
+
   triggerLambdaPermissions?: lambdaCdk.CfnPermission;
   adminTriggerLambdaPermissions?: lambdaCdk.CfnPermission;
   authResourceName!: string;
@@ -45,11 +54,11 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
   s3GuestReadPolicy?: iamCdk.CfnPolicy;
   s3GroupPolicyList?: Array<iamCdk.CfnPolicy>;
   s3TriggerPolicy?: iamCdk.CfnPolicy;
-  s3DependsOnResources: Array<S3CFNDependsOn>; //to be synced to backend-config.json
+  s3DependsOnResources: Array<S3CFNDependsOn>; // to be synced to backend-config.json
 
   _props: S3UserInputs = defaultS3UserInputs();
   _cfnInputParams: AmplifyS3ResourceInputParameters = {};
-  constructor(scope: cdk.Construct, s3ResourceName: string, props: S3UserInputs, cfnInputParams: AmplifyS3ResourceInputParameters) {
+  constructor(scope: Construct, s3ResourceName: string, props: S3UserInputs, cfnInputParams: AmplifyS3ResourceInputParameters) {
     super(scope, s3ResourceName);
     this.scope = scope;
     this.id = s3ResourceName;
@@ -69,14 +78,23 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return groupList;
   }
 
+  /**
+   *
+   */
   public getS3ResourceFriendlyName(): string {
     return this.id;
   }
 
+  /**
+   *
+   */
   public getS3BucketName(): string {
     return this.s3BucketName;
   }
 
+  /**
+   *
+   */
   public getS3DependsOn(): Array<S3CFNDependsOn> | undefined {
     return this.s3DependsOnResources;
   }
@@ -92,24 +110,24 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
    * configure trigger policy to handle triggerFunction and adminTriggerFunction (predictions)
    */
   private configureTriggerPolicy() {
-    let s3TriggerPolicyDefinition = undefined;
-    //6.1 Configure Trigger policy group
+    let s3TriggerPolicyDefinition;
+    // 6.1 Configure Trigger policy group
     if (this._props.triggerFunction && this._props.triggerFunction != 'NONE') {
       s3TriggerPolicyDefinition = this.createTriggerPolicyDefinition('S3TriggerBucketPolicy', this._props.triggerFunction);
     }
-    //6.2 Configure Trigger policy group with adminTrigger
+    // 6.2 Configure Trigger policy group with adminTrigger
     if (
-      this._props.adminTriggerFunction?.triggerFunction &&
-      this._props.adminTriggerFunction.triggerFunction != 'NONE' &&
-      this._props.adminTriggerFunction.triggerFunction !== this._props.triggerFunction
+      this._props.adminTriggerFunction?.triggerFunction
+      && this._props.adminTriggerFunction.triggerFunction != 'NONE'
+      && this._props.adminTriggerFunction.triggerFunction !== this._props.triggerFunction
     ) {
       const adminTriggerFunctionName = this._props.adminTriggerFunction.triggerFunction;
-      //create/update s3TriggerPolicyGroup with [predictions] adminLambda
+      // create/update s3TriggerPolicyGroup with [predictions] adminLambda
       s3TriggerPolicyDefinition = s3TriggerPolicyDefinition
         ? this.addFunctionToTriggerPolicyDefinition(s3TriggerPolicyDefinition, adminTriggerFunctionName)
         : this.createTriggerPolicyDefinition('S3TriggerBucketPolicy', adminTriggerFunctionName);
     }
-    //6.3 Configure Trigger policy if groups are configured
+    // 6.3 Configure Trigger policy if groups are configured
     if (s3TriggerPolicyDefinition) {
       this.s3TriggerPolicy = this.createTriggerPolicyFromPolicyDefinition(s3TriggerPolicyDefinition);
     }
@@ -121,47 +139,50 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
    * @param triggerFunction
    * @returns triggerLambdaFunctionParams: S3UserInputTriggerFunctionParams
    */
-  _conditionallyBuildTriggerLambdaParams( triggerFunction : string ){
+  _conditionallyBuildTriggerLambdaParams(triggerFunction : string) {
     let triggerLambdaFunctionParams: S3UserInputTriggerFunctionParams;
     if (
-          this._props.adminTriggerFunction?.triggerFunction &&
-          this._props.adminTriggerFunction.triggerFunction != 'NONE' &&
-          this._props.adminTriggerFunction.triggerFunction != this._props.triggerFunction
-        ) {
-          triggerLambdaFunctionParams = {
-            category: AmplifyCategories.STORAGE,
-            tag: 'triggerFunction',
-            triggerFunction: triggerFunction,
-            permissions: [S3PermissionType.CREATE_AND_UPDATE, S3PermissionType.READ, S3PermissionType.DELETE],
-            triggerEvents: [S3TriggerEventType.OBJ_PUT_POST_COPY, S3TriggerEventType.OBJ_REMOVED],
-            triggerPrefix: [
-              { prefix: 'protected/', prefixTransform: S3TriggerPrefixTransform.ATTACH_REGION },
-              { prefix: 'private/', prefixTransform: S3TriggerPrefixTransform.ATTACH_REGION },
-              { prefix: 'public/', prefixTransform: S3TriggerPrefixTransform.ATTACH_REGION },
-            ],
-          };
+      this._props.adminTriggerFunction?.triggerFunction
+          && this._props.adminTriggerFunction.triggerFunction != 'NONE'
+          && this._props.adminTriggerFunction.triggerFunction != this._props.triggerFunction
+    ) {
+      triggerLambdaFunctionParams = {
+        category: AmplifyCategories.STORAGE,
+        tag: 'triggerFunction',
+        triggerFunction,
+        permissions: [S3PermissionType.CREATE_AND_UPDATE, S3PermissionType.READ, S3PermissionType.DELETE],
+        triggerEvents: [S3TriggerEventType.OBJ_PUT_POST_COPY, S3TriggerEventType.OBJ_REMOVED],
+        triggerPrefix: [
+          { prefix: 'protected/', prefixTransform: S3TriggerPrefixTransform.ATTACH_REGION },
+          { prefix: 'private/', prefixTransform: S3TriggerPrefixTransform.ATTACH_REGION },
+          { prefix: 'public/', prefixTransform: S3TriggerPrefixTransform.ATTACH_REGION },
+        ],
+      };
     } else {
-        triggerLambdaFunctionParams = {
-          category: AmplifyCategories.STORAGE,
-          tag: 'triggerFunction',
-          triggerFunction: triggerFunction,
-          permissions: [S3PermissionType.CREATE_AND_UPDATE, S3PermissionType.READ, S3PermissionType.DELETE],
-          triggerEvents: [S3TriggerEventType.OBJ_PUT_POST_COPY, S3TriggerEventType.OBJ_REMOVED]
-        };
+      triggerLambdaFunctionParams = {
+        category: AmplifyCategories.STORAGE,
+        tag: 'triggerFunction',
+        triggerFunction,
+        permissions: [S3PermissionType.CREATE_AND_UPDATE, S3PermissionType.READ, S3PermissionType.DELETE],
+        triggerEvents: [S3TriggerEventType.OBJ_PUT_POST_COPY, S3TriggerEventType.OBJ_REMOVED],
+      };
     }
     return triggerLambdaFunctionParams;
   }
 
-  //Generate cloudformation stack for S3 resource
+  // Generate cloudformation stack for S3 resource
+  /**
+   *
+   */
   async generateCfnStackResources(context: $TSContext) {
-    //1. Create the S3 bucket and configure CORS
+    // 1. Create the S3 bucket and configure CORS
     this.s3Bucket = new s3Cdk.CfnBucket(this, 'S3Bucket', {
       bucketName: this.s3BucketName,
       corsConfiguration: this.buildCORSRules(),
     });
 
     this.s3Bucket.applyRemovalPolicy(cdk.RemovalPolicy.RETAIN);
-    //2. Configure Notifications on the S3 bucket.
+    // 2. Configure Notifications on the S3 bucket.
     if (this._props.triggerFunction && this._props.triggerFunction != 'NONE') {
       const triggerLambdaFunctionParams: S3UserInputTriggerFunctionParams = this._conditionallyBuildTriggerLambdaParams(this._props.triggerFunction);
       const newLambdaConfigurations = this.buildLambdaConfigFromTriggerParams(triggerLambdaFunctionParams);
@@ -174,11 +195,11 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
        */
       this.s3DependsOnResources.push(this.buildS3DependsOnFunctionCfn(this._props.triggerFunction as string));
     }
-    //3. Configure (Predictions category) Admin Trigger Notifications on Bucket
+    // 3. Configure (Predictions category) Admin Trigger Notifications on Bucket
     if (
-      this._props.adminTriggerFunction?.triggerFunction &&
-      this._props.adminTriggerFunction.triggerFunction != 'NONE' &&
-      this._props.adminTriggerFunction.triggerFunction != this._props.triggerFunction
+      this._props.adminTriggerFunction?.triggerFunction
+      && this._props.adminTriggerFunction.triggerFunction != 'NONE'
+      && this._props.adminTriggerFunction.triggerFunction != this._props.triggerFunction
     ) {
       const adminLambdaConfigurations = this.buildLambdaConfigFromTriggerParams(this._props.adminTriggerFunction);
       this._addNotificationsLambdaConfigurations(adminLambdaConfigurations);
@@ -195,18 +216,18 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
       this.s3DependsOnResources.push(this.buildS3DependsOnFunctionCfn(this._props.adminTriggerFunction.triggerFunction as string));
     }
 
-    //Apply all Notifications configurations on S3Bucket;
+    // Apply all Notifications configurations on S3Bucket;
     if (
-      this.notificationConfiguration.lambdaConfigurations &&
-      (this.notificationConfiguration.lambdaConfigurations as s3Cdk.CfnBucket.LambdaConfigurationProperty[]).length > 0
+      this.notificationConfiguration.lambdaConfigurations
+      && (this.notificationConfiguration.lambdaConfigurations as s3Cdk.CfnBucket.LambdaConfigurationProperty[]).length > 0
     ) {
       this.s3Bucket.notificationConfiguration = this.notificationConfiguration;
     }
 
-    //4. Create IAM policies to control Cognito pool access to S3 bucket
+    // 4. Create IAM policies to control Cognito pool access to S3 bucket
     this.createAndSetIAMPolicies();
 
-    //5. Configure Cognito User pool policies
+    // 5. Configure Cognito User pool policies
     const groupList = this.getGroupListFromProps();
     if (groupList && groupList.length > 0) {
       const authResourceName: string = await s3AuthAPI.getAuthResourceARN(context);
@@ -219,21 +240,24 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
        * Add Depends On: AUTH
        * s3 Dependency on Cognito to Root Stack
        */
-      //1. UserPoolID
+      // 1. UserPoolID
       this.s3DependsOnResources.push(this.buildS3DependsOnUserPoolIdCfn(authResourceName as string));
-      //2. User Pool Group List
+      // 2. User Pool Group List
       const userPoollGroupList = this.buildS3DependsOnUserPoolGroupRoleListCfn(groupList);
       this.s3DependsOnResources = this.s3DependsOnResources.concat(userPoollGroupList);
     }
 
-    //6. Configure Trigger Policy for trigger function and adminTriggerFunction
+    // 6. Configure Trigger Policy for trigger function and adminTriggerFunction
     this.configureTriggerPolicy();
   }
 
+  /**
+   *
+   */
   public addGroupParams(authResourceName: string): AmplifyS3CfnParameters | undefined {
     const groupList = this.getGroupListFromProps();
     if (groupList && groupList.length > 0) {
-      let s3CfnParams: Array<AmplifyCfnParamType> = [
+      const s3CfnParams: Array<AmplifyCfnParamType> = [
         {
           params: [`auth${authResourceName}UserPoolId`],
           paramType: 'String',
@@ -248,7 +272,7 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
           default: `authuserPoolGroups${this.buildGroupRoleName(groupName)}`,
         });
       }
-      //insert into the stack
+      // insert into the stack
       s3CfnParams.map(params => this._setCFNParams(params));
     }
     return undefined;
@@ -271,6 +295,9 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return s3CfnTriggerFunctionParams;
   }
 
+  /**
+   *
+   */
   public addParameters() {
     let s3CfnParams: Array<AmplifyCfnParamType> = [
       {
@@ -299,7 +326,7 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
       {
         params: ['selectedGuestPermissions', 'selectedAuthenticatedPermissions'],
         paramType: 'CommaDelimitedList',
-        default:'NONE'
+        default: 'NONE',
       },
     ];
     if (this._props.triggerFunction && this._props.triggerFunction != 'NONE') {
@@ -308,9 +335,9 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     }
 
     if (
-      this._props.adminTriggerFunction?.triggerFunction &&
-      this._props.adminTriggerFunction.triggerFunction != 'NONE' &&
-      this._props.adminTriggerFunction.triggerFunction != this._props.triggerFunction
+      this._props.adminTriggerFunction?.triggerFunction
+      && this._props.adminTriggerFunction.triggerFunction != 'NONE'
+      && this._props.adminTriggerFunction.triggerFunction != this._props.triggerFunction
     ) {
       const adminTriggerFunctionCFNParams = this.createTriggerLambdaCFNParams(
         'adminTriggerFunction',
@@ -319,10 +346,13 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
       s3CfnParams = s3CfnParams.concat(adminTriggerFunctionCFNParams);
     }
 
-    //insert into the stack
+    // insert into the stack
     s3CfnParams.map(params => this._setCFNParams(params));
   }
 
+  /**
+   *
+   */
   public addConditions() {
     this.conditions = {
       ShouldNotCreateEnvResources: new cdk.CfnCondition(this, 'ShouldNotCreateEnvResources', {
@@ -377,6 +407,9 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return this.conditions;
   }
 
+  /**
+   *
+   */
   public addOutputs() {
     this.addCfnOutput(
       {
@@ -393,6 +426,9 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     );
   }
 
+  /**
+   *
+   */
   emptyNotificationsConfiguration() {
     return {
       lambdaConfigurations: [],
@@ -404,26 +440,32 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
    * the s3bucket was constructed without resourceName
    * @returns boolean  (true if legacy stack (2019/18))
    */
-  isAmplifyStackLegacy():boolean{
+  isAmplifyStackLegacy():boolean {
     const amplifyMeta = stateManager.getMeta();
     const stackName :string = amplifyMeta.providers.awscloudformation.StackName;
     return !stackName.startsWith('amplify-');
   }
 
+  /**
+   *
+   */
   buildBucketName() {
     const bucketRef = cdk.Fn.ref('bucketName');
     const envRef = cdk.Fn.ref('env');
     const bucketNameSuffixRef = cdk.Fn.select(3, cdk.Fn.split('-', cdk.Fn.ref('AWS::StackName')));
     const bucketFinalName = this.isAmplifyStackLegacy()
-      ? cdk.Fn.join('', [bucketRef,'-' ,envRef])
+      ? cdk.Fn.join('', [bucketRef, '-', envRef])
       : cdk.Fn.join('', [bucketRef, bucketNameSuffixRef, '-', envRef]);
     return cdk.Fn.conditionIf(
       'ShouldNotCreateEnvResources',
       bucketRef,
-      bucketFinalName
+      bucketFinalName,
     ).toString();
   }
 
+  /**
+   *
+   */
   buildCORSRules(): s3Cdk.CfnBucket.CorsConfigurationProperty {
     const corsRule: s3Cdk.CfnBucket.CorsRuleProperty = {
       id: 'S3CORSRuleId1',
@@ -440,6 +482,9 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return corsConfig;
   }
 
+  /**
+   *
+   */
   buildNotificationLambdaConfiguration(): s3Cdk.CfnBucket.LambdaConfigurationProperty[] {
     const triggerFunctionArnRef = cdk.Fn.ref(`function${this._props.triggerFunction}Arn`);
 
@@ -456,6 +501,9 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return lambdaConfigurations;
   }
 
+  /**
+   *
+   */
   filterRuleAppendRegionToLambdaTriggerPrefix(triggerPrefix: S3TriggerPrefixType) {
     const regionRef = cdk.Fn.ref('AWS::Region');
     const filterRule = {
@@ -465,6 +513,9 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return filterRule;
   }
 
+  /**
+   *
+   */
   filterRulePlainStringLambdaTriggerPrefix(triggerPrefix: S3TriggerPrefixType) {
     const filterRule = {
       name: 'prefix',
@@ -473,31 +524,36 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return filterRule;
   }
 
+  /**
+   *
+   */
   buildTriggerPrefixRule(triggerPrefix: S3TriggerPrefixType) {
     if (triggerPrefix.prefixTransform === S3TriggerPrefixTransform.ATTACH_REGION) {
       const filterRule = this.filterRuleAppendRegionToLambdaTriggerPrefix(triggerPrefix);
       return filterRule;
-    } else {
-      const filterRule = this.filterRulePlainStringLambdaTriggerPrefix(triggerPrefix);
-      return filterRule;
     }
+    const filterRule = this.filterRulePlainStringLambdaTriggerPrefix(triggerPrefix);
+    return filterRule;
   }
 
+  /**
+   *
+   */
   buildLambdaConfigFromTriggerParams(functionParams: S3UserInputTriggerFunctionParams): s3Cdk.CfnBucket.LambdaConfigurationProperty[] {
-    let lambdaConfigurations: s3Cdk.CfnBucket.LambdaConfigurationProperty[] = [];
+    const lambdaConfigurations: s3Cdk.CfnBucket.LambdaConfigurationProperty[] = [];
     const triggerFunctionArnRef = cdk.Fn.ref(`function${functionParams.triggerFunction}Arn`);
     if (functionParams.permissions) {
       for (const triggerEvent of functionParams.triggerEvents) {
-        //S3ObjectCreate/Deleted
+        // S3ObjectCreate/Deleted
         if (functionParams.triggerPrefix) {
-          //S3 folder to watch for triggers ( should be unqiue across trigger functions)
+          // S3 folder to watch for triggers ( should be unqiue across trigger functions)
           for (const triggerPrefixDefinition of functionParams.triggerPrefix) {
             const lambdaConfig: $TSAny = {
               event: triggerEvent,
               function: triggerFunctionArnRef,
               filter: {
                 s3Key: {
-                  rules: [this.buildTriggerPrefixRule(triggerPrefixDefinition)], //single rule - only single prefix supported
+                  rules: [this.buildTriggerPrefixRule(triggerPrefixDefinition)], // single rule - only single prefix supported
                 },
               },
             };
@@ -515,52 +571,61 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return lambdaConfigurations;
   }
 
+  /**
+   *
+   */
   createAndSetIAMPolicies() {
-    //Create PublicPolicy
+    // Create PublicPolicy
     if (this._cfnInputParams.s3PermissionsAuthenticatedPublic !== AmplifyBuildParamsPermissions.DISALLOW) {
       this.s3AuthPublicPolicy = this.createS3AuthPublicPolicy();
     }
-    //Create ProtectedPolicy
+    // Create ProtectedPolicy
     if (this._cfnInputParams.s3PermissionsAuthenticatedProtected !== AmplifyBuildParamsPermissions.DISALLOW) {
       this.s3AuthProtectedPolicy = this.createS3AuthProtectedPolicy();
     }
-    //Create AuthPrivatePolicy
+    // Create AuthPrivatePolicy
     if (this._cfnInputParams.s3PermissionsAuthenticatedPrivate !== AmplifyBuildParamsPermissions.DISALLOW) {
       this.s3AuthPrivatePolicy = this.createS3AuthPrivatePolicy();
     }
-    //Create Auth UploadPolicy
+    // Create Auth UploadPolicy
     if (this._cfnInputParams.s3PermissionsAuthenticatedUploads !== AmplifyBuildParamsPermissions.DISALLOW) {
       this.s3AuthUploadPolicy = this.createS3AuthUploadPolicy();
     }
-    //Create Guest PublicPolicy
+    // Create Guest PublicPolicy
     if (this._cfnInputParams.s3PermissionsGuestPublic !== AmplifyBuildParamsPermissions.DISALLOW) {
       this.s3GuestPublicPolicy = this.createS3GuestPublicPolicy();
     }
-    //Create GuestUploadsPolicy
+    // Create GuestUploadsPolicy
     if (this._cfnInputParams.s3PermissionsGuestUploads !== AmplifyBuildParamsPermissions.DISALLOW) {
       this.s3GuestUploadPolicy = this.createGuestUploadsPolicy();
     }
-    //Create AuthReadPolicy
+    // Create AuthReadPolicy
     this.s3AuthReadPolicy = this.createS3AuthReadPolicy();
 
-    //Create GuestReadPolicy
+    // Create GuestReadPolicy
     this.s3GuestReadPolicy = this.createS3GuestReadPolicy();
   }
 
+  /**
+   *
+   */
   createS3IAMPolicyDocument(refStr: string, pathStr: string, actionStr: string, effect: iamCdk.Effect) {
     const props: iamCdk.PolicyStatementProps = {
       resources: [cdk.Fn.join('', ['arn:aws:s3:::', cdk.Fn.ref(refStr), pathStr])],
       actions: cdk.Fn.split(',', cdk.Fn.ref(actionStr)),
       effect,
     };
-    //policy document
+    // policy document
     const policyDocument = new iamCdk.PolicyDocument();
-    //policy statement
+    // policy statement
     const policyStatement = new iamCdk.PolicyStatement(props);
     policyDocument.addStatements(policyStatement);
     return policyDocument;
   }
 
+  /**
+   *
+   */
   createMultiStatementIAMPolicyDocument(policyStatements: Array<IAmplifyIamPolicyStatementParams>) {
     const policyDocument = new iamCdk.PolicyDocument();
     policyStatements.map(policyStatement => {
@@ -573,19 +638,19 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
         effect: policyStatement.effect,
       };
       const statement = new iamCdk.PolicyStatement(props);
-      //Add Statement to Policy
+      // Add Statement to Policy
       policyDocument.addStatements(statement);
     });
     return policyDocument;
   }
 
-  /***************************************************************************************************
+  /** *************************************************************************************************
    *  Lambda Trigger Permissions : Allow S3 to invoke the trigger function
    ***************************************************************************************************/
   createInvokeFunctionS3Permission(logicalId: string, triggerFunctionName: string): lambdaCdk.CfnPermission {
     const sourceArn = cdk.Fn.join('', ['arn:aws:s3:::', this.buildBucketName()]);
 
-    let resourceDefinition: lambdaCdk.CfnPermissionProps = {
+    const resourceDefinition: lambdaCdk.CfnPermissionProps = {
       action: 'lambda:InvokeFunction',
       functionName: cdk.Fn.ref(`function${triggerFunctionName}Name`),
       principal: 's3.amazonaws.com',
@@ -596,18 +661,18 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return lambdaPermission;
   }
 
-  /***************************************************************************************************
+  /** *************************************************************************************************
    *  IAM Policies - Control Auth and Guest access to S3 bucket using Cognito Identity Pool
    *
    * Note :- Currently S3 doesn't have direct integration with Cognito for access control to S3 bucket.
    * We need to make cognito work with S3 for App clients. The following polcies are tied to the roles
    * attached to the cognito identity pool.
    * ************************************************************************************************/
-  //S3AuthPublicPolicy
+  // S3AuthPublicPolicy
   createS3AuthPublicPolicy() {
-    let policyDefinition: IAmplifyPolicyDefinition = {
+    const policyDefinition: IAmplifyPolicyDefinition = {
       logicalId: 'S3AuthPublicPolicy',
-      isPolicyNameAbsolute : false,
+      isPolicyNameAbsolute: false,
       policyNameRef: 's3PublicPolicy',
       roleRefs: ['authRoleName'],
       condition: this.conditions.CreateAuthPublic,
@@ -619,17 +684,20 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
           effect: iamCdk.Effect.ALLOW,
         },
       ],
-      dependsOn: [this.s3Bucket], //- Not required since refStr implicitly adds this
+      dependsOn: [this.s3Bucket], // - Not required since refStr implicitly adds this
     };
-    const policy = this.createIAMPolicy(policyDefinition, true /*action is Ref*/);
+    const policy = this.createIAMPolicy(policyDefinition, true /* action is Ref*/);
     return policy;
   }
 
-  //S3AuthProtectedPolicy
+  // S3AuthProtectedPolicy
+  /**
+   *
+   */
   createS3AuthProtectedPolicy() {
-    let policyDefinition: IAmplifyPolicyDefinition = {
+    const policyDefinition: IAmplifyPolicyDefinition = {
       logicalId: 'S3AuthProtectedPolicy',
-      isPolicyNameAbsolute : false,
+      isPolicyNameAbsolute: false,
       policyNameRef: 's3ProtectedPolicy',
       roleRefs: ['authRoleName'],
       condition: this.conditions.CreateAuthProtected,
@@ -641,17 +709,20 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
           effect: iamCdk.Effect.ALLOW,
         },
       ],
-      dependsOn: [this.s3Bucket], //- Not required since refStr implicitly adds this
+      dependsOn: [this.s3Bucket], // - Not required since refStr implicitly adds this
     };
-    const policy = this.createIAMPolicy(policyDefinition, true /*action is Ref*/);
+    const policy = this.createIAMPolicy(policyDefinition, true /* action is Ref*/);
     return policy;
   }
 
-  //S3AuthPrivatePolicy
+  // S3AuthPrivatePolicy
+  /**
+   *
+   */
   createS3AuthPrivatePolicy() {
-    let policyDefinition: IAmplifyPolicyDefinition = {
+    const policyDefinition: IAmplifyPolicyDefinition = {
       logicalId: 'S3AuthPrivatePolicy',
-      isPolicyNameAbsolute : false,
+      isPolicyNameAbsolute: false,
       policyNameRef: 's3PrivatePolicy',
       roleRefs: ['authRoleName'],
       condition: this.conditions.CreateAuthPrivate,
@@ -663,17 +734,20 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
           effect: iamCdk.Effect.ALLOW,
         },
       ],
-      dependsOn: [this.s3Bucket], //- Not required since refStr implicitly adds this
+      dependsOn: [this.s3Bucket], // - Not required since refStr implicitly adds this
     };
-    const policy = this.createIAMPolicy(policyDefinition, true /*action is Ref*/);
+    const policy = this.createIAMPolicy(policyDefinition, true /* action is Ref*/);
     return policy;
   }
 
-  //S3AuthUploadPolicy
+  // S3AuthUploadPolicy
+  /**
+   *
+   */
   createS3AuthUploadPolicy() {
-    let policyDefinition: IAmplifyPolicyDefinition = {
+    const policyDefinition: IAmplifyPolicyDefinition = {
       logicalId: 'S3AuthUploadPolicy',
-      isPolicyNameAbsolute : false,
+      isPolicyNameAbsolute: false,
       policyNameRef: 's3UploadsPolicy',
       roleRefs: ['authRoleName'],
       condition: this.conditions.CreateAuthUploads,
@@ -685,17 +759,20 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
           effect: iamCdk.Effect.ALLOW,
         },
       ],
-      dependsOn: [this.s3Bucket], //- Not required since refStr implicitly adds this
+      dependsOn: [this.s3Bucket], // - Not required since refStr implicitly adds this
     };
-    const policy = this.createIAMPolicy(policyDefinition, true /*action is Ref*/);
+    const policy = this.createIAMPolicy(policyDefinition, true /* action is Ref*/);
     return policy;
   }
 
-  //S3GuestPublicPolicy
+  // S3GuestPublicPolicy
+  /**
+   *
+   */
   createS3GuestPublicPolicy() {
-    let policyDefinition: IAmplifyPolicyDefinition = {
+    const policyDefinition: IAmplifyPolicyDefinition = {
       logicalId: 'S3GuestPublicPolicy',
-      isPolicyNameAbsolute : false,
+      isPolicyNameAbsolute: false,
       policyNameRef: 's3PublicPolicy',
       roleRefs: ['unauthRoleName'],
       condition: this.conditions.CreateGuestPublic,
@@ -707,17 +784,20 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
           effect: iamCdk.Effect.ALLOW,
         },
       ],
-      dependsOn: [this.s3Bucket], //- Not required since refStr implicitly adds this
+      dependsOn: [this.s3Bucket], // - Not required since refStr implicitly adds this
     };
-    const policy = this.createIAMPolicy(policyDefinition, true /*action is Ref*/);
+    const policy = this.createIAMPolicy(policyDefinition, true /* action is Ref*/);
     return policy;
   }
 
-  //S3GuestUploadPolicy
+  // S3GuestUploadPolicy
+  /**
+   *
+   */
   createGuestUploadsPolicy() {
-    let policyDefinition: IAmplifyPolicyDefinition = {
+    const policyDefinition: IAmplifyPolicyDefinition = {
       logicalId: 'S3GuestUploadPolicy',
-      isPolicyNameAbsolute : false,
+      isPolicyNameAbsolute: false,
       policyNameRef: 's3UploadsPolicy',
       roleRefs: ['unauthRoleName'],
       condition: this.conditions.CreateGuestUploads,
@@ -729,17 +809,20 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
           effect: iamCdk.Effect.ALLOW,
         },
       ],
-      dependsOn: [this.s3Bucket], //- Not required since refStr implicitly adds this
+      dependsOn: [this.s3Bucket], // - Not required since refStr implicitly adds this
     };
-    const policy = this.createIAMPolicy(policyDefinition, true /*action is Ref*/);
+    const policy = this.createIAMPolicy(policyDefinition, true /* action is Ref*/);
     return policy;
   }
 
-  //S3AuthReadPolicy
+  // S3AuthReadPolicy
+  /**
+   *
+   */
   createS3AuthReadPolicy() {
-    let policyDefinition: IAmplifyPolicyDefinition = {
+    const policyDefinition: IAmplifyPolicyDefinition = {
       logicalId: 'S3AuthReadPolicy',
-      isPolicyNameAbsolute : false,
+      isPolicyNameAbsolute: false,
       policyNameRef: 's3ReadPolicy',
       roleRefs: ['authRoleName'],
       condition: this.conditions.CreateAuthReadAndList,
@@ -768,18 +851,21 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
           effect: iamCdk.Effect.ALLOW,
         },
       ],
-      dependsOn: [this.s3Bucket], //- Not required since refStr implicitly adds this
+      dependsOn: [this.s3Bucket], // - Not required since refStr implicitly adds this
     };
 
     const policy: iamCdk.CfnPolicy = this.createMultiStatementIAMPolicy(policyDefinition);
     return policy;
   }
 
-  //S3GuestReadPolicy
+  // S3GuestReadPolicy
+  /**
+   *
+   */
   createS3GuestReadPolicy(): iamCdk.CfnPolicy {
-    let policyDefinition: IAmplifyPolicyDefinition = {
+    const policyDefinition: IAmplifyPolicyDefinition = {
       logicalId: 'S3GuestReadPolicy',
-      isPolicyNameAbsolute : false,
+      isPolicyNameAbsolute: false,
       policyNameRef: 's3ReadPolicy',
       roleRefs: ['unauthRoleName'],
       condition: this.conditions.CreateGuestReadAndList,
@@ -801,7 +887,7 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
           effect: iamCdk.Effect.ALLOW,
         },
       ],
-      dependsOn: [this.s3Bucket], //- Not required since refStr implicitly adds this
+      dependsOn: [this.s3Bucket], // - Not required since refStr implicitly adds this
     };
     const policy: iamCdk.CfnPolicy = this.createMultiStatementIAMPolicy(policyDefinition);
     return policy;
@@ -814,7 +900,7 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
    * @returns
    */
   private createTriggerPolicyDefinition(logicalId: string, triggerFunctionName: string): IAmplifyPolicyDefinition {
-    let policyDefinition: IAmplifyPolicyDefinition = {
+    const policyDefinition: IAmplifyPolicyDefinition = {
       logicalId,
       isPolicyNameAbsolute: true, // set if policyName is not a reference
       policyNameRef: 'amplify-lambda-execution-policy-storage',
@@ -823,14 +909,14 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
         {
           refStr: 'S3Bucket',
           pathStr: '',
-          isActionAbsolute: true, //actions are not refs
+          isActionAbsolute: true, // actions are not refs
           actions: ['s3:ListBucket'],
           effect: iamCdk.Effect.ALLOW,
         },
         {
           refStr: 'S3Bucket',
           pathStr: '/*',
-          isActionAbsolute: true, //actions are not refs
+          isActionAbsolute: true, // actions are not refs
           actions: ['s3:PutObject', 's3:GetObject', 's3:ListBucket', 's3:DeleteObject'],
           effect: iamCdk.Effect.ALLOW,
         },
@@ -840,6 +926,9 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return policyDefinition;
   }
 
+  /**
+   *
+   */
   addFunctionToTriggerPolicyDefinition(policyDefinition: IAmplifyPolicyDefinition, functionName: string) {
     const newRoleRef = `function${functionName}LambdaExecutionRole`;
     if (policyDefinition.roleRefs && policyDefinition.roleRefs.includes(newRoleRef)) {
@@ -849,55 +938,65 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return policyDefinition;
   }
 
-  //S3TriggerBucketPolicy - Policy to control trigger function access to S3 bucket
+  // S3TriggerBucketPolicy - Policy to control trigger function access to S3 bucket
+  /**
+   *
+   */
   createTriggerPolicyFromPolicyDefinition(policyDefinition: IAmplifyPolicyDefinition) {
-    const policy: iamCdk.CfnPolicy = this.createIAMPolicy(policyDefinition, false /*action is array*/);
+    const policy: iamCdk.CfnPolicy = this.createIAMPolicy(policyDefinition, false /* action is array*/);
     return policy;
   }
 
-  //helper: builder for policy statement resource
- buildResourceFromPolicyDefinition(policyDefinitionStatement : IAmplifyIamPolicyStatementParams ){
-    let resourceStrArr = ['arn:aws:s3:::', { Ref: policyDefinitionStatement.refStr, } ];
-    if ( policyDefinitionStatement.pathStr && policyDefinitionStatement.pathStr.length > 0 ){
-      resourceStrArr.push( policyDefinitionStatement.pathStr );
+  // helper: builder for policy statement resource
+  /**
+  *
+  */
+  buildResourceFromPolicyDefinition(policyDefinitionStatement : IAmplifyIamPolicyStatementParams) {
+    const resourceStrArr = ['arn:aws:s3:::', { Ref: policyDefinitionStatement.refStr }];
+    if (policyDefinitionStatement.pathStr && policyDefinitionStatement.pathStr.length > 0) {
+      resourceStrArr.push(policyDefinitionStatement.pathStr);
     }
     return {
       'Fn::Join': [
         '',
-        resourceStrArr
+        resourceStrArr,
       ],
-    }
+    };
   }
 
-  buildActionFromPolicyDefinition( policyDefinitionStatement : IAmplifyIamPolicyStatementParams, actionRef : boolean ){
+  /**
+   *
+   */
+  buildActionFromPolicyDefinition(policyDefinitionStatement : IAmplifyIamPolicyStatementParams, actionRef : boolean) {
     if (!policyDefinitionStatement.actions) {
       return [];
     }
-    if (!policyDefinitionStatement.isActionAbsolute && actionRef == true ) {
-        //actionRef is true, when : The action provided is a Ref to concatenated string of command separated permissions
-        const actionRef = policyDefinitionStatement.actions[0];
-        const actions = {
-          'Fn::Split': [
-            ',',
-            {
-              Ref: actionRef,
-            },
-          ],
-        };
-        return actions;
-    } else {
-        //isActionAbsolute is true or actionRef is false, when : The action provided is an array of action strings. e.g Triggers
-        return policyDefinitionStatement.actions;
+    if (!policyDefinitionStatement.isActionAbsolute && actionRef == true) {
+      // actionRef is true, when : The action provided is a Ref to concatenated string of command separated permissions
+      const actionRef = policyDefinitionStatement.actions[0];
+      const actions = {
+        'Fn::Split': [
+          ',',
+          {
+            Ref: actionRef,
+          },
+        ],
+      };
+      return actions;
     }
+    // isActionAbsolute is true or actionRef is false, when : The action provided is an array of action strings. e.g Triggers
+    return policyDefinitionStatement.actions;
   }
 
-
-  //Helper:: function to create single statement IAM policy & bind to the App's stack
+  // Helper:: function to create single statement IAM policy & bind to the App's stack
+  /**
+   *
+   */
   createIAMPolicy(policyDefinition: IAmplifyPolicyDefinition, actionRef: boolean): iamCdk.CfnPolicy {
-    let policyL1: $TSObject = {};
-    //Policy Properties
+    const policyL1: $TSObject = {};
+    // Policy Properties
     policyL1.Properties = {};
-    //1. Property: PolicyName
+    // 1. Property: PolicyName
     if (policyDefinition.isPolicyNameAbsolute) {
       policyL1.Properties.policyName = policyDefinition.policyNameRef;
     } else {
@@ -905,34 +1004,33 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
         Ref: policyDefinition.policyNameRef,
       };
     }
-    //2. Property: Roles
+    // 2. Property: Roles
     policyL1.Properties.roles = policyDefinition.roleRefs.map(roleRef => ({
       Ref: roleRef,
     }));
-    //3. Property: PolicyDocument
+    // 3. Property: PolicyDocument
     policyL1.Properties.policyDocument = {
       Version: '2012-10-17',
       Statement: [],
     };
 
-    const policyStatements = []; //Build each statement from the policyDefinitionStatement
-    for( const policyDefinitionStatement of policyDefinition.statements) {
-      let policyStatement:any = {};
-      //3.1.0 Property: PolicyDocument.Statement.Effect
+    const policyStatements = []; // Build each statement from the policyDefinitionStatement
+    for (const policyDefinitionStatement of policyDefinition.statements) {
+      const policyStatement:any = {};
+      // 3.1.0 Property: PolicyDocument.Statement.Effect
       policyStatement.Effect = policyDefinitionStatement.effect;
 
-      //3.1.1 Property: PolicyDocument.Statement.Action
+      // 3.1.1 Property: PolicyDocument.Statement.Action
       if (policyDefinitionStatement.actions) {
-        policyStatement.Action = this.buildActionFromPolicyDefinition(policyDefinitionStatement, actionRef );
+        policyStatement.Action = this.buildActionFromPolicyDefinition(policyDefinitionStatement, actionRef);
       }
-      //3.1.2 Property: PolicyDocument.Statement.Resource
-      policyStatement.Resource = [ this.buildResourceFromPolicyDefinition(policyDefinitionStatement) ]
+      // 3.1.2 Property: PolicyDocument.Statement.Resource
+      policyStatement.Resource = [this.buildResourceFromPolicyDefinition(policyDefinitionStatement)];
       policyStatements.push(policyStatement);
-
     } /** end build policyStatements */
 
     policyL1.Properties.policyDocument.Statement = policyStatements;
-    const policy = new iamCdk.CfnPolicy(this, policyDefinition.logicalId, policyL1['Properties']);
+    const policy = new iamCdk.CfnPolicy(this, policyDefinition.logicalId, policyL1.Properties);
     if (policyDefinition.dependsOn) {
       policyDefinition.dependsOn.map(dependency => policy.addDependsOn(dependency));
     }
@@ -942,14 +1040,17 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return policy;
   }
 
-  //Helper:: function to create multi-statement IAM policy & bind to the App's stack
+  // Helper:: function to create multi-statement IAM policy & bind to the App's stack
+  /**
+   *
+   */
   createMultiStatementIAMPolicy(policyDefinition: IAmplifyPolicyDefinition) {
     const props: iamCdk.CfnPolicyProps = {
       policyName: cdk.Fn.ref(policyDefinition.policyNameRef),
       roles: policyDefinition.roleRefs.map(roleRef => cdk.Fn.ref(roleRef as string)),
       policyDocument: this.createMultiStatementIAMPolicyDocument(policyDefinition.statements),
     };
-    const policy = new iamCdk.CfnPolicy(this, policyDefinition.logicalId, props); //bind policy to stack
+    const policy = new iamCdk.CfnPolicy(this, policyDefinition.logicalId, props); // bind policy to stack
     if (policyDefinition.dependsOn) {
       policyDefinition.dependsOn.map(dependency => policy.addDependsOn(dependency));
     }
@@ -959,14 +1060,17 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return policy;
   }
 
-  //Helper:: function to create Cognito Group IAM policy & bind to the App's stack
+  // Helper:: function to create Cognito Group IAM policy & bind to the App's stack
+  /**
+   *
+   */
   createS3AmplifyGroupPolicies(authResourceName: string, groupList: string[], groupPolicyMap: GroupAccessType): Array<iamCdk.CfnPolicy> {
     const groupPolicyList: Array<iamCdk.CfnPolicy> = [];
-    //Build policy statement
+    // Build policy statement
     for (const groupName of groupList) {
       const logicalID = this.buildGroupPolicyLogicalID(groupName);
       const groupPolicyName = this.buildGroupPolicyName(groupName);
-      const policyStatementList = this._buildCDKGroupPolicyStatements(groupPolicyMap[groupName]); //convert permissions to statements
+      const policyStatementList = this._buildCDKGroupPolicyStatements(groupPolicyMap[groupName]); // convert permissions to statements
       const props: iamCdk.CfnPolicyProps = {
         policyName: groupPolicyName,
         roles: this.buildCDKGroupRoles(groupName, authResourceName),
@@ -978,30 +1082,47 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return groupPolicyList;
   }
 
-  /**************************************************************************************************
+  /** ************************************************************************************************
    *  END IAM Policies - Control Auth and Guest access to S3 bucket using Cognito Identity Pool
    * ***********************************************************************************************/
 
-  //Helper:: create logical ID from groupName
+  // Helper:: create logical ID from groupName
+  /**
+   *
+   */
   buildGroupPolicyLogicalID(groupName: string): string {
     return `${groupName}GroupPolicy`;
   }
-  //Helper:: create policyName from groupName
+
+  // Helper:: create policyName from groupName
+  /**
+   *
+   */
   buildGroupPolicyName(groupName: string): string {
     return `${groupName}-group-s3-policy`;
   }
-  //Helper:: create group Role name from groupName
+
+  // Helper:: create group Role name from groupName
+  /**
+   *
+   */
   buildGroupRoleName(groupName: string): string {
     return `${groupName}GroupRole`;
   }
 
-  //Helper:: create CDK Group-Role name from groupName and cognito ARN
+  // Helper:: create CDK Group-Role name from groupName and cognito ARN
+  /**
+   *
+   */
   public buildCDKGroupRoles(groupName: string, authResourceName: string) {
     const roles = [cdk.Fn.join('', [cdk.Fn.ref(`auth${authResourceName}UserPoolId`), `-${this.buildGroupRoleName(groupName)}`])];
     return roles;
   }
 
-  //Helper:: Create Group permissions into CDK policy statements
+  // Helper:: Create Group permissions into CDK policy statements
+  /**
+   *
+   */
   _buildCDKGroupPolicyStatements(groupPerms: S3PermissionType[]): iamCdk.PolicyStatement[] {
     const policyStatementList: Array<iamCdk.PolicyStatement> = [];
     const bucketArn = cdk.Fn.join('', ['arn:aws:s3:::', cdk.Fn.ref('S3Bucket')]).toString();
@@ -1025,33 +1146,42 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return policyStatementList;
   }
 
-  //Helper:: Create PolicyDocument from policyStatement list
+  // Helper:: Create PolicyDocument from policyStatement list
+  /**
+   *
+   */
   _buildCDKGroupPolicyDocument(policyStatementList: iamCdk.PolicyStatement[]) {
     const policyDocument = new iamCdk.PolicyDocument();
     policyStatementList.map(policyStatement => {
-      //Add Statement to Policy
+      // Add Statement to Policy
       policyDocument.addStatements(policyStatement);
     });
     return policyDocument;
   }
 
-  //Helper: Add CFN Resource Param definitions as CfnParameter .
+  // Helper: Add CFN Resource Param definitions as CfnParameter .
+  /**
+   *
+   */
   _setCFNParams(paramDefinitions: AmplifyCfnParamType) {
     paramDefinitions.params.map(paramName => {
-      //set param type
-      let cfnParam: any = {
+      // set param type
+      const cfnParam: any = {
         type: paramDefinitions.paramType,
       };
-      //set param default if provided
+      // set param default if provided
       if (paramDefinitions.default) {
         cfnParam.default = paramDefinitions.default;
       }
-      //configure param in resource template object
+      // configure param in resource template object
       this.addCfnParameter(cfnParam, paramName);
     });
   }
 
-  //Helper: Get DependsOn CFN to add Function as dependency on S3Bucket.
+  // Helper: Get DependsOn CFN to add Function as dependency on S3Bucket.
+  /**
+   *
+   */
   buildS3DependsOnFunctionCfn(functionName: string): S3CFNDependsOn {
     const s3DependsOnLambda: S3CFNDependsOn = {
       category: 'function',
@@ -1061,7 +1191,10 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return s3DependsOnLambda;
   }
 
-  //Helper: Get DependsOn CFN to add Auth as dependency on S3Bucket.
+  // Helper: Get DependsOn CFN to add Auth as dependency on S3Bucket.
+  /**
+   *
+   */
   buildS3DependsOnUserPoolIdCfn(authResourceName: string): S3CFNDependsOn {
     const dependsOnAuth: S3CFNDependsOn = {
       category: 'auth',
@@ -1071,6 +1204,9 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
     return dependsOnAuth;
   }
 
+  /**
+   *
+   */
   buildS3DependsOnUserPoolGroupRoleListCfn(selectedUserPoolGroupList: Array<string>): Array<S3CFNDependsOn> {
     if (selectedUserPoolGroupList && selectedUserPoolGroupList.length > 0) {
       const userPoolGroupRoleList = selectedUserPoolGroupList.map((groupName: string) => {
@@ -1082,16 +1218,18 @@ export class AmplifyS3ResourceCfnStack extends AmplifyResourceCfnStack implement
         return dependsOnAuth;
       });
       return userPoolGroupRoleList;
-    } else {
-      return [];
     }
+    return [];
   }
 }
 
-//Constants and Interfaces
+// Constants and Interfaces
 const CFN_TEMPLATE_FORMAT_VERSION = '2010-09-09';
 const S3_ROOT_CFN_DESCRIPTION = 'S3 Resource for AWS Amplify CLI';
 
+/**
+ *
+ */
 export interface IAmplifyIamPolicyStatementParams {
   refStr: string;
   conditions?: $TSObject;
diff --git a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/s3-stack-transform.ts b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/s3-stack-transform.ts
index e0e0d0f9ac5..8ccb85f1bc3 100644
--- a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/s3-stack-transform.ts
+++ b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/s3-stack-transform.ts
@@ -1,5 +1,4 @@
-import * as cdk from '@aws-cdk/core';
-import { App } from '@aws-cdk/core';
+import * as cdk from 'aws-cdk-lib';
 import {
   $TSAny,
   $TSContext,
@@ -15,10 +14,12 @@ import * as fs from 'fs-extra';
 import * as path from 'path';
 import * as vm from 'vm2';
 import os from 'os';
+import { AmplifyS3ResourceTemplate } from '@aws-amplify/cli-extensibility-helper';
 import { S3PermissionType, S3UserInputs } from '../service-walkthrough-types/s3-user-input-types';
-import { canResourceBeTransformed, S3CFNDependsOn, S3CFNPermissionType, S3InputState } from '../service-walkthroughs/s3-user-input-state';
+import {
+  canResourceBeTransformed, S3CFNDependsOn, S3CFNPermissionType, S3InputState,
+} from '../service-walkthroughs/s3-user-input-state';
 import { AmplifyS3ResourceCfnStack } from './s3-stack-builder';
-import { AmplifyS3ResourceTemplate } from '@aws-amplify/cli-extensibility-helper';
 import { AmplifyBuildParamsPermissions, AmplifyCfnParamType, AmplifyS3ResourceInputParameters } from './types';
 
 /**
@@ -33,9 +34,12 @@ export async function transformS3ResourceStack(context: $TSContext, resource: IA
   }
 }
 
-//Stack transformer for S3
+// Stack transformer for S3
+/**
+ *
+ */
 export class AmplifyS3ResourceStackTransform {
-  private app: App;
+  private app: cdk.App;
   private cliInputs: S3UserInputs;
   private resourceTemplateObj: AmplifyS3ResourceCfnStack | undefined;
   private cliInputsState: S3InputState;
@@ -45,7 +49,7 @@ export class AmplifyS3ResourceStackTransform {
   private resourceName: string;
 
   constructor(resourceName: string, context: $TSContext) {
-    this.app = new App();
+    this.app = new cdk.App();
     // Validate the cli-inputs.json for the resource
     this.cliInputsState = new S3InputState(context, resourceName, undefined);
     this.cliInputs = this.cliInputsState.getCliInputPayload();
@@ -53,14 +57,23 @@ export class AmplifyS3ResourceStackTransform {
     this.resourceName = resourceName;
   }
 
+  /**
+   *
+   */
   getCFN(): string | undefined {
     return this.cfn;
   }
 
+  /**
+   *
+   */
   getCFNInputParams():AmplifyS3ResourceInputParameters {
     return this.cfnInputParams;
   }
 
+  /**
+   *
+   */
   async transform(commandType: CLISubCommandType) {
     this.generateCfnInputParameters();
     // Generate cloudformation stack from cli-inputs.json
@@ -81,9 +94,12 @@ export class AmplifyS3ResourceStackTransform {
     return this.resourceTemplateObj ? this.resourceTemplateObj.getS3DependsOn() : undefined;
   }
 
+  /**
+   *
+   */
   generateCfnInputParameters() {
     const userInput: S3UserInputs = this.cliInputsState.getUserInput();
-    //DEFAULT Parameters
+    // DEFAULT Parameters
     const defaultS3PermissionsUpload = [S3PermissionType.CREATE_AND_UPDATE];
     this.cfnInputParams = {
       bucketName: userInput.bucketName,
@@ -113,36 +129,40 @@ export class AmplifyS3ResourceStackTransform {
     this.cfnInputParams.GuestAllowList = this._getAuthGuestListPermission(S3PermissionType.READ, userInput.guestAccess);
     this.cfnInputParams.s3PermissionsAuthenticatedPrivate = this._getPublicPrivatePermissions(
       userInput.authAccess,
-      true, //exclude bucketList
+      true, // exclude bucketList
     );
     this.cfnInputParams.s3PermissionsAuthenticatedProtected = this._getPublicPrivatePermissions(
       userInput.authAccess,
-      true, //exclude bucketList
+      true, // exclude bucketList
     );
     this.cfnInputParams.s3PermissionsAuthenticatedPublic = this._getPublicPrivatePermissions(
       userInput.authAccess,
-      true, //exclude bucketList
+      true, // exclude bucketList
     );
     this.cfnInputParams.s3PermissionsAuthenticatedUploads = this._getUploadPermissions(userInput.authAccess);
     this.cfnInputParams.s3PermissionsGuestPublic = this._getPublicPrivatePermissions(
       userInput.guestAccess,
-      true, //exclude bucketList
+      true, // exclude bucketList
     );
     this.cfnInputParams.s3PermissionsGuestUploads = this._getUploadPermissions(userInput.guestAccess);
   }
 
+  /**
+   *
+   */
   _getAuthGuestListPermission(checkOperation: S3PermissionType, authPermissions: Array<S3PermissionType> | undefined) {
     if (authPermissions) {
       if (authPermissions.includes(checkOperation)) {
         return AmplifyBuildParamsPermissions.ALLOW;
-      } else {
-        return AmplifyBuildParamsPermissions.DISALLOW;
       }
-    } else {
       return AmplifyBuildParamsPermissions.DISALLOW;
     }
+    return AmplifyBuildParamsPermissions.DISALLOW;
   }
 
+  /**
+   *
+   */
   _getPublicPrivatePermissions(authPermissions: Array<S3PermissionType> | undefined, excludeListBuckets: boolean) {
     if (authPermissions) {
       let cfnPermissions: Array<S3CFNPermissionType> = S3InputState.getCfnPermissionsFromInputPermissions(authPermissions);
@@ -153,12 +173,16 @@ export class AmplifyS3ResourceStackTransform {
     }
     return AmplifyBuildParamsPermissions.DISALLOW;
   }
+
+  /**
+   *
+   */
   _getUploadPermissions(authPermissions: Array<S3PermissionType> | undefined) {
     if (authPermissions) {
       if (!authPermissions.includes(S3PermissionType.CREATE_AND_UPDATE)) {
         return AmplifyBuildParamsPermissions.DISALLOW;
       }
-      //For uploads only set "s3:PutObject"
+      // For uploads only set "s3:PutObject"
       const cfnPermissions: Array<S3CFNPermissionType> = S3InputState.getCfnTypesFromPermissionType(S3PermissionType.CREATE_AND_UPDATE);
       return cfnPermissions.join();
     }
@@ -166,6 +190,9 @@ export class AmplifyS3ResourceStackTransform {
   }
 
   // Modify cloudformation files based on overrides
+  /**
+   *
+   */
   async applyOverrides() {
     const backendDir = pathManager.getBackendDirPath();
     const resourceDirPath = pathManager.getResourceDirectoryPath(undefined, AmplifyCategories.STORAGE, this.resourceName);
@@ -175,7 +202,7 @@ export class AmplifyS3ResourceStackTransform {
       printer.error(`Build error : ${error.message}`);
       throw new Error(error);
     });
-    //Skip if packageManager or override.ts not found
+    // Skip if packageManager or override.ts not found
     if (isBuild) {
       const { override } = await import(overrideJSFilePath).catch(error => {
         formatter.list(['No override File Found', `To override ${this.resourceName} run amplify override auth ${this.resourceName} `]);
@@ -210,12 +237,15 @@ export class AmplifyS3ResourceStackTransform {
     }
   }
 
+  /**
+   *
+   */
   saveBuildFiles(commandType: CLISubCommandType) {
     if (this.resourceTemplateObj) {
       // Render CFN Template string and store as member in this.cfn
       this.cfn = this.resourceTemplateObj.renderCloudFormationTemplate();
     }
-    //Store cloudformation-template.json, Parameters.json and Update BackendConfig
+    // Store cloudformation-template.json, Parameters.json and Update BackendConfig
     this._saveFilesToLocalFileSystem('cloudformation-template.json', this.cfn);
     this._saveFilesToLocalFileSystem('parameters.json', this.cfnInputParams);
 
@@ -229,6 +259,9 @@ export class AmplifyS3ResourceStackTransform {
     }
   }
 
+  /**
+   *
+   */
   async generateStack(context: $TSContext): Promise<void> {
     // Create Resource Stack from CLI Inputs in this._resourceTemplateObj
     this.resourceTemplateObj = new AmplifyS3ResourceCfnStack(this.app, 'AmplifyS3ResourceStack', this.cliInputs, this.cfnInputParams);
@@ -254,6 +287,9 @@ export class AmplifyS3ResourceStackTransform {
     await this.resourceTemplateObj.generateCfnStackResources(context);
   }
 
+  /**
+   *
+   */
   _addOutputs() {
     this.resourceTemplateObj?.addCfnOutput(
       {
@@ -270,8 +306,11 @@ export class AmplifyS3ResourceStackTransform {
     );
   }
 
+  /**
+   *
+   */
   _addParameters() {
-    let s3CfnParams: Array<AmplifyCfnParamType> = [
+    const s3CfnParams: Array<AmplifyCfnParamType> = [
       {
         params: ['env', 'bucketName', 'authPolicyName', 'unauthPolicyName', 'authRoleName', 'unauthRoleName', 'triggerFunction'],
         paramType: 'String',
@@ -305,26 +344,32 @@ export class AmplifyS3ResourceStackTransform {
     s3CfnParams.map(params => this._setCFNParams(params));
   }
 
-  //Helper: Add CFN Resource Param definitions as CfnParameter .
+  // Helper: Add CFN Resource Param definitions as CfnParameter .
+  /**
+   *
+   */
   _setCFNParams(paramDefinitions: AmplifyCfnParamType) {
-    const resourceTemplateObj = this.resourceTemplateObj;
+    const { resourceTemplateObj } = this;
     if (resourceTemplateObj) {
       paramDefinitions.params.map(paramName => {
-        //set param type
-        let cfnParam: any = {
+        // set param type
+        const cfnParam: any = {
           type: paramDefinitions.paramType,
         };
-        //set param default if provided
+        // set param default if provided
         if (paramDefinitions.default) {
           cfnParam.default = paramDefinitions.default;
         }
-        //configure param in resource template object
+        // configure param in resource template object
         resourceTemplateObj.addCfnParameter(cfnParam, paramName);
       });
-    } //else throw an exception TBD
+    } // else throw an exception TBD
   }
 
-  //Helper: Save files in local-filesysten
+  // Helper: Save files in local-filesysten
+  /**
+   *
+   */
   _saveFilesToLocalFileSystem(fileName: string, data: $TSAny) {
     fs.ensureDirSync(this.cliInputsState.buildFilePath);
     const cfnFilePath = path.resolve(path.join(this.cliInputsState.buildFilePath, fileName));
@@ -335,10 +380,13 @@ export class AmplifyS3ResourceStackTransform {
     }
   }
 
-  //Helper: Save DependsOn entries to amplify-meta
+  // Helper: Save DependsOn entries to amplify-meta
+  /**
+   *
+   */
   _saveDependsOnToBackendConfig() {
     if (this.resourceTemplateObj) {
-      //Get all collated resource dependencies
+      // Get all collated resource dependencies
       const s3DependsOnResources = this.resourceTemplateObj.getS3DependsOn();
       const dependsOn = [...(s3DependsOnResources || [])];
       this.context.amplify.updateamplifyMetaAfterResourceUpdate(AmplifyCategories.STORAGE, this.resourceName, 'dependsOn', dependsOn);
diff --git a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/types.ts b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/types.ts
index f04858879d9..939c121f448 100644
--- a/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/types.ts
+++ b/packages/amplify-category-storage/src/provider-utils/awscloudformation/cdk-stack-builder/types.ts
@@ -1,8 +1,12 @@
 import { AmplifyCDKL1 } from '@aws-amplify/cli-extensibility-helper';
-import * as cdk from '@aws-cdk/core';
+import * as cdk from 'aws-cdk-lib';
 import { $TSObject } from 'amplify-cli-core';
+import { Construct } from 'constructs';
 import { DdbAttrType } from '../cfn-template-utils';
 
+/**
+ *
+ */
 export interface AmplifyDDBResourceInputParameters {
   tableName: string;
   partitionKeyName: string;
@@ -11,12 +15,18 @@ export interface AmplifyDDBResourceInputParameters {
   sortKeyType?: DdbAttrType;
 }
 
+/**
+ *
+ */
 export type AmplifyCfnParamType = {
   params: Array<string>;
   paramType: string;
   default?: string;
 };
 
+/**
+ *
+ */
 export interface AmplifyS3ResourceInputParameters {
   bucketName?: string;
   resourceName?: string;
@@ -26,7 +36,7 @@ export interface AmplifyS3ResourceInputParameters {
   authRoleName?: $TSObject;
   unauthRoleName?: $TSObject;
   s3PublicPolicy?: string;
-  s3PrivatePolicy?: string; //default:"NONE"
+  s3PrivatePolicy?: string; // default:"NONE"
   s3ProtectedPolicy?: string;
   s3UploadsPolicy?: string;
   s3ReadPolicy?: string;
@@ -44,10 +54,13 @@ export interface AmplifyS3ResourceInputParameters {
   adminTriggerFunction?: string;
 }
 
-//Base class for all storage resource stacks ( S3, DDB )
+// Base class for all storage resource stacks ( S3, DDB )
+/**
+ *
+ */
 export class AmplifyResourceCfnStack extends cdk.Stack implements AmplifyCDKL1 {
   _cfnParameterMap: Map<string, cdk.CfnParameter> = new Map();
-  constructor(scope: cdk.Construct, id: string) {
+  constructor(scope: Construct, id: string) {
     super(scope, id, undefined);
   }
 
@@ -89,6 +102,7 @@ export class AmplifyResourceCfnStack extends cdk.Stack implements AmplifyCDKL1 {
       throw error;
     }
   }
+
   /**
    *
    * @param props
@@ -101,6 +115,7 @@ export class AmplifyResourceCfnStack extends cdk.Stack implements AmplifyCDKL1 {
       throw error;
     }
   }
+
   /**
    *
    * @param props
@@ -117,13 +132,14 @@ export class AmplifyResourceCfnStack extends cdk.Stack implements AmplifyCDKL1 {
     }
   }
 
-  //Generate convert cdk stack to cloudformation
-  public renderCloudFormationTemplate = (): string => {
-    return this._toCloudFormation();
-  };
+  // Generate convert cdk stack to cloudformation
+  public renderCloudFormationTemplate = (): string => this._toCloudFormation();
 }
 
-//Types used in Build/Params.json
+// Types used in Build/Params.json
+/**
+ *
+ */
 export enum AmplifyBuildParamsPermissions {
   ALLOW = 'ALLOW',
   DISALLOW = 'DISALLOW',
diff --git a/packages/amplify-cli-core/src/category-interfaces/amplify-base-cdk-types.ts b/packages/amplify-cli-core/src/category-interfaces/amplify-base-cdk-types.ts
index 8b85ac9ca2b..9feb39836a8 100644
--- a/packages/amplify-cli-core/src/category-interfaces/amplify-base-cdk-types.ts
+++ b/packages/amplify-cli-core/src/category-interfaces/amplify-base-cdk-types.ts
@@ -1,20 +1,26 @@
-//Define all common classes and interfaces required to generate cloudformation using CDK.
-import * as cdk from '@aws-cdk/core';
+// Define all common classes and interfaces required to generate cloudformation using CDK.
+import * as cdk from 'aws-cdk-lib';
 
-//Base template
-//Customer can use these params to mutate the Cloudformation for the resource
+// Base template
+// Customer can use these params to mutate the Cloudformation for the resource
+/**
+ *
+ */
 export interface AmplifyStackTemplate {
-  addCfnParameter(props: cdk.CfnParameterProps, logicalId: string): void;
-  addCfnOutput(props: cdk.CfnOutputProps, logicalId: string): void;
-  addCfnMapping(props: cdk.CfnMappingProps, logicalId: string): void;
-  addCfnCondition(props: cdk.CfnConditionProps, logicalId: string): void;
+  addCfnParameter: (props: cdk.CfnParameterProps, logicalId: string) => void;
+  addCfnOutput: (props: cdk.CfnOutputProps, logicalId: string) => void;
+  addCfnMapping: (props: cdk.CfnMappingProps, logicalId: string) => void;
+  addCfnCondition: (props: cdk.CfnConditionProps, logicalId: string) => void;
 
-  getCfnParameter(logicalId: string): cdk.CfnParameter;
-  getCfnOutput(logicalId: string): cdk.CfnOutput;
-  getCfnMapping(logicalId: string): cdk.CfnMapping;
-  getCfnCondition(logicalId: string): cdk.CfnCondition;
+  getCfnParameter: (logicalId: string) => cdk.CfnParameter;
+  getCfnOutput: (logicalId: string) => cdk.CfnOutput;
+  getCfnMapping: (logicalId: string) => cdk.CfnMapping;
+  getCfnCondition: (logicalId: string) => cdk.CfnCondition;
 }
 
+/**
+ *
+ */
 export interface Template {
   AWSTemplateFormatVersion?: string;
   Description?: string;
diff --git a/packages/amplify-cli-extensibility-helper/package.json b/packages/amplify-cli-extensibility-helper/package.json
index 2f848a2a80f..5642bf800d3 100644
--- a/packages/amplify-cli-extensibility-helper/package.json
+++ b/packages/amplify-cli-extensibility-helper/package.json
@@ -28,15 +28,7 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-category-custom": "2.4.4",
-    "@aws-cdk/aws-apigateway": "~1.124.0",
-    "@aws-cdk/aws-appsync": "~1.124.0",
-    "@aws-cdk/aws-cognito": "~1.124.0",
-    "@aws-cdk/aws-dynamodb": "~1.124.0",
-    "@aws-cdk/aws-elasticsearch": "~1.124.0",
-    "@aws-cdk/aws-iam": "~1.124.0",
-    "@aws-cdk/aws-lambda": "~1.124.0",
-    "@aws-cdk/aws-s3": "~1.124.0",
-    "@aws-cdk/core": "~1.124.0",
+    "aws-cdk-lib": "^2.41.0",
     "amplify-cli-core": "3.0.0"
   },
   "jest": {
@@ -54,4 +46,4 @@
     ],
     "collectCoverage": true
   }
-}
+}
\ No newline at end of file
diff --git a/packages/amplify-cli-extensibility-helper/src/types/api/amplify-api-resource-stack-types.ts b/packages/amplify-cli-extensibility-helper/src/types/api/amplify-api-resource-stack-types.ts
index d1109aca2c3..f6fa5f4c3db 100644
--- a/packages/amplify-cli-extensibility-helper/src/types/api/amplify-api-resource-stack-types.ts
+++ b/packages/amplify-cli-extensibility-helper/src/types/api/amplify-api-resource-stack-types.ts
@@ -1,15 +1,20 @@
 // Amplify generated Types for API - override.ts
 
-import { CfnApiKey, CfnDataSource, CfnFunctionConfiguration, CfnGraphQLApi, CfnGraphQLSchema, CfnResolver } from '@aws-cdk/aws-appsync';
-import { CfnTable } from '@aws-cdk/aws-dynamodb';
-import { CfnPolicy, CfnRole } from '@aws-cdk/aws-iam';
-import { CfnDomain } from '@aws-cdk/aws-elasticsearch';
-import { CfnFunction, CfnEventSourceMapping } from '@aws-cdk/aws-lambda';
-import { CfnStack } from '@aws-cdk/core';
+import {
+  CfnApiKey, CfnDataSource, CfnFunctionConfiguration, CfnGraphQLApi, CfnGraphQLSchema, CfnResolver,
+} from 'aws-cdk-lib/aws-appsync';
+import { CfnTable } from 'aws-cdk-lib/aws-dynamodb';
+import { CfnPolicy, CfnRole } from 'aws-cdk-lib/aws-iam';
+import { CfnDomain } from 'aws-cdk-lib/aws-elasticsearch';
+import { CfnFunction, CfnEventSourceMapping } from 'aws-cdk-lib/aws-lambda';
+import { CfnStack } from 'aws-cdk-lib';
 
 // Base template
 // Customer can use these params to mutate the Cloudformation for the resource
 
+/**
+ *
+ */
 export interface AmplifyApiGraphQlResourceStackTemplate {
   // directives stack
   api?: Partial<AppsyncApiStack>;
@@ -18,6 +23,9 @@ export interface AmplifyApiGraphQlResourceStackTemplate {
   predictions?: Partial<PredictionsDirectiveStack & AppsyncStackCommon>;
 }
 
+/**
+ *
+ */
 export type AppsyncApiStack = {
   rootstack: CfnStack;
   GraphQLAPI: CfnGraphQLApi;
@@ -29,13 +37,22 @@ export type AppsyncApiStack = {
   DynamoDBAccess?: CfnPolicy;
 };
 
+/**
+ *
+ */
 export type ModelDirectiveStack = AppsyncStackCommon & DDBModelDirectiveStack;
 
+/**
+ *
+ */
 export type AppsyncStackCommon = {
   resolvers?: Record<string, CfnResolver>;
   appsyncFunctions?: Record<string, CfnFunctionConfiguration>;
 };
 
+/**
+ *
+ */
 export type DDBModelDirectiveStack = {
   modelStack?: CfnStack;
   modelDDBTable?: CfnTable;
@@ -46,12 +63,18 @@ export type DDBModelDirectiveStack = {
   invokeLambdaFunction?: CfnPolicy;
 };
 
+/**
+ *
+ */
 export interface HttpsDirectiveStack {
   httpsDataSource?: Record<string, CfnDataSource>;
   httpDataSourceServiceRole?: Record<string, CfnRole>;
   httpDataSourceServiceRoleDefaultPolicy?: Record<string, CfnPolicy>;
 }
 
+/**
+ *
+ */
 export interface OpenSearchDirectiveStack {
   OpenSearchDataSource?: CfnDataSource;
   OpenSearchAccessIAMRole?: CfnRole;
@@ -64,12 +87,18 @@ export interface OpenSearchDirectiveStack {
   OpenSearchModelLambdaMapping?: Record<string, CfnEventSourceMapping>;
 }
 
+/**
+ *
+ */
 export interface FunctionDirectiveStack {
   lambdaDataSource: Record<string, CfnDataSource>;
   lambdaDataSourceRole: Record<string, CfnRole>;
   lambdaDataSourceServiceRoleDefaultPolicy: Record<string, CfnPolicy>;
 }
 
+/**
+ *
+ */
 export interface PredictionsDirectiveStack {
   RekognitionDataSource: CfnDataSource;
   RekognitionDataSourceServiceRole: CfnRole;
diff --git a/packages/amplify-cli-extensibility-helper/src/types/api/types.ts b/packages/amplify-cli-extensibility-helper/src/types/api/types.ts
index 09c9d1107fa..5ac49f104d9 100644
--- a/packages/amplify-cli-extensibility-helper/src/types/api/types.ts
+++ b/packages/amplify-cli-extensibility-helper/src/types/api/types.ts
@@ -1,15 +1,21 @@
-import * as cdk from '@aws-cdk/core';
-import * as apigwCdk from '@aws-cdk/aws-apigateway';
-import * as iamCdk from '@aws-cdk/aws-iam';
+import * as cdk from 'aws-cdk-lib';
+import * as apigwCdk from 'aws-cdk-lib/aws-apigateway';
+import * as iamCdk from 'aws-cdk-lib/aws-iam';
 
+/**
+ *
+ */
 export type AmplifyCDKL1 = {
-  addCfnCondition(props: cdk.CfnConditionProps, logicalId: string): void;
-  addCfnMapping(props: cdk.CfnMappingProps, logicalId: string): void;
-  addCfnOutput(props: cdk.CfnOutputProps, logicalId: string): void;
-  addCfnParameter(props: cdk.CfnParameterProps, logicalId: string, value?: any): void;
-  addCfnResource(props: cdk.CfnResourceProps, logicalId: string): void;
+  addCfnCondition: (props: cdk.CfnConditionProps, logicalId: string) => void;
+  addCfnMapping: (props: cdk.CfnMappingProps, logicalId: string) => void;
+  addCfnOutput: (props: cdk.CfnOutputProps, logicalId: string) => void;
+  addCfnParameter: (props: cdk.CfnParameterProps, logicalId: string, value?: any) => void;
+  addCfnResource: (props: cdk.CfnResourceProps, logicalId: string) => void;
 };
 
+/**
+ *
+ */
 export type AmplifyApiRestResourceStackTemplate = {
   restApi: apigwCdk.CfnRestApi;
   deploymentResource: apigwCdk.CfnDeployment;
@@ -18,6 +24,9 @@ export type AmplifyApiRestResourceStackTemplate = {
   };
 } & AmplifyCDKL1;
 
+/**
+ *
+ */
 export type ApigwPathPolicy = {
   groups?: { [groupName: string]: iamCdk.CfnPolicy };
 };
diff --git a/packages/amplify-cli-extensibility-helper/src/types/auth/types.ts b/packages/amplify-cli-extensibility-helper/src/types/auth/types.ts
index 770c64d6c78..90b2fa61d98 100644
--- a/packages/amplify-cli-extensibility-helper/src/types/auth/types.ts
+++ b/packages/amplify-cli-extensibility-helper/src/types/auth/types.ts
@@ -1,17 +1,23 @@
-import * as cdk from '@aws-cdk/core';
-import * as s3 from '@aws-cdk/aws-s3';
-import * as iam from '@aws-cdk/aws-iam';
-import * as cognito from '@aws-cdk/aws-cognito';
-import * as lambda from '@aws-cdk/aws-lambda';
+import * as cdk from 'aws-cdk-lib';
+import * as s3 from 'aws-cdk-lib/aws-s3';
+import * as iam from 'aws-cdk-lib/aws-iam';
+import * as cognito from 'aws-cdk-lib/aws-cognito';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
 
+/**
+ *
+ */
 export type AmplifyCDKL1 = {
-  addCfnCondition(props: cdk.CfnConditionProps, logicalId: string): void;
-  addCfnMapping(props: cdk.CfnMappingProps, logicalId: string): void;
-  addCfnOutput(props: cdk.CfnOutputProps, logicalId: string): void;
-  addCfnParameter(props: cdk.CfnParameterProps, logicalId: string): void;
-  addCfnResource(props: cdk.CfnResourceProps, logicalId: string): void;
+  addCfnCondition: (props: cdk.CfnConditionProps, logicalId: string) => void;
+  addCfnMapping: (props: cdk.CfnMappingProps, logicalId: string) => void;
+  addCfnOutput: (props: cdk.CfnOutputProps, logicalId: string) => void;
+  addCfnParameter: (props: cdk.CfnParameterProps, logicalId: string) => void;
+  addCfnResource: (props: cdk.CfnResourceProps, logicalId: string) => void;
 };
 
+/**
+ *
+ */
 export type AmplifyAuthCognitoStackTemplate = {
   customMessageConfirmationBucket?: s3.CfnBucket;
   snsRole?: iam.CfnRole;
@@ -43,14 +49,14 @@ export type AmplifyAuthCognitoStackTemplate = {
   oAuthCustomResourcePolicy?: iam.CfnPolicy;
   oAuthCustomResourceLogPolicy?: iam.CfnPolicy;
   oAuthCustomResourceInputs?: cdk.CustomResource;
-  //custom resource MFA
+  // custom resource MFA
   mfaLambda?: lambda.CfnFunction;
   mfaLogPolicy?: iam.CfnPolicy;
   mfaLambdaPolicy?: iam.CfnPolicy;
   mfaLambdaInputs?: cdk.CustomResource;
   mfaLambdaRole?: iam.CfnRole;
 
-  //custom resource identity pool - OPenId Lambda Role
+  // custom resource identity pool - OPenId Lambda Role
   openIdLambda?: lambda.CfnFunction;
   openIdLogPolicy?: iam.CfnPolicy;
   openIdLambdaIAMPolicy?: iam.CfnPolicy;
@@ -58,6 +64,9 @@ export type AmplifyAuthCognitoStackTemplate = {
   openIdLambdaRole?: iam.CfnRole;
 } & AmplifyCDKL1;
 
+/**
+ *
+ */
 export type AmplifyUserPoolGroupStackTemplate = {
   userPoolGroup?: Record<string, cognito.CfnUserPoolGroup>;
   userPoolGroupRole?: Record<string, iam.CfnRole>;
diff --git a/packages/amplify-cli-extensibility-helper/src/types/project/types.ts b/packages/amplify-cli-extensibility-helper/src/types/project/types.ts
index 77fd7a5fbb9..5cf8ed6fd0a 100644
--- a/packages/amplify-cli-extensibility-helper/src/types/project/types.ts
+++ b/packages/amplify-cli-extensibility-helper/src/types/project/types.ts
@@ -1,13 +1,16 @@
 import * as iam from '@aws-cdk/aws-iam';
 import * as cdk from '@aws-cdk/core';
 
+/**
+ *
+ */
 export interface AmplifyRootStackTemplate {
   authRole?: iam.CfnRole;
   unauthRole?: iam.CfnRole;
 
-  addCfnParameter(props: cdk.CfnParameterProps, logicalId: string): void;
-  addCfnOutput(props: cdk.CfnOutputProps, logicalId: string): void;
-  addCfnMapping(props: cdk.CfnMappingProps, logicalId: string): void;
-  addCfnCondition(props: cdk.CfnConditionProps, logicalId: string): void;
-  addCfnResource(props: cdk.CfnResourceProps, logicalId: string): void;
+  addCfnParameter: (props: cdk.CfnParameterProps, logicalId: string) => void;
+  addCfnOutput: (props: cdk.CfnOutputProps, logicalId: string) => void;
+  addCfnMapping: (props: cdk.CfnMappingProps, logicalId: string) => void;
+  addCfnCondition: (props: cdk.CfnConditionProps, logicalId: string) => void;
+  addCfnResource: (props: cdk.CfnResourceProps, logicalId: string) => void;
 }
diff --git a/packages/amplify-cli-extensibility-helper/src/types/storage/types.ts b/packages/amplify-cli-extensibility-helper/src/types/storage/types.ts
index d40579ca434..7ce241465b6 100644
--- a/packages/amplify-cli-extensibility-helper/src/types/storage/types.ts
+++ b/packages/amplify-cli-extensibility-helper/src/types/storage/types.ts
@@ -1,21 +1,30 @@
-import * as cdk from '@aws-cdk/core';
-import * as ddb from '@aws-cdk/aws-dynamodb';
-import * as s3Cdk from '@aws-cdk/aws-s3';
-import * as iamCdk from '@aws-cdk/aws-iam';
+import * as cdk from 'aws-cdk-lib';
+import * as ddb from 'aws-cdk-lib/aws-dynamodb';
+import * as s3Cdk from 'aws-cdk-lib/aws-s3';
+import * as iamCdk from 'aws-cdk-lib/aws-iam';
 
-//CDK - L1 methods to store CFN gen related information
+// CDK - L1 methods to store CFN gen related information
+/**
+ *
+ */
 export interface AmplifyCDKL1 {
-  addCfnParameter(props: cdk.CfnParameterProps, logicalId: string): void;
-  addCfnOutput(props: cdk.CfnOutputProps, logicalId: string): void;
-  addCfnMapping(props: cdk.CfnMappingProps, logicalId: string): void;
-  addCfnCondition(props: cdk.CfnConditionProps, logicalId: string): void;
-  addCfnResource(props: cdk.CfnResourceProps, logicalId: string): void;
+  addCfnParameter: (props: cdk.CfnParameterProps, logicalId: string) => void;
+  addCfnOutput: (props: cdk.CfnOutputProps, logicalId: string) => void;
+  addCfnMapping: (props: cdk.CfnMappingProps, logicalId: string) => void;
+  addCfnCondition: (props: cdk.CfnConditionProps, logicalId: string) => void;
+  addCfnResource: (props: cdk.CfnResourceProps, logicalId: string) => void;
 }
 
+/**
+ *
+ */
 export interface AmplifyDDBResourceTemplate extends AmplifyCDKL1 {
   dynamoDBTable?: ddb.CfnTable;
 }
 
+/**
+ *
+ */
 export interface AmplifyS3ResourceTemplate extends AmplifyCDKL1 {
   s3Bucket?: s3Cdk.CfnBucket;
   s3AuthPublicPolicy?: iamCdk.CfnPolicy;
@@ -28,7 +37,10 @@ export interface AmplifyS3ResourceTemplate extends AmplifyCDKL1 {
   s3GuestReadPolicy?: iamCdk.CfnPolicy;
 }
 
-//Types used in Build/Params.json
+// Types used in Build/Params.json
+/**
+ *
+ */
 export enum AmplifyBuildParamsPermissions {
   ALLOW = 'ALLOW',
   DISALLOW = 'DISALLOW',
diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
index ab10b245fb2..d3613e1eaec 100644
--- a/packages/amplify-cli/package.json
+++ b/packages/amplify-cli/package.json
@@ -263,4 +263,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/resource-status-diff.ts b/packages/amplify-cli/src/extensions/amplify-helpers/resource-status-diff.ts
index a51bbc81353..79dc8bbbe84 100644
--- a/packages/amplify-cli/src/extensions/amplify-helpers/resource-status-diff.ts
+++ b/packages/amplify-cli/src/extensions/amplify-helpers/resource-status-diff.ts
@@ -3,21 +3,27 @@ import * as path from 'path';
 import * as glob from 'glob';
 import chalk from 'chalk';
 import * as cfnDiff from '@aws-cdk/cloudformation-diff';
-import { print } from './print';
 import { generateCustomPoliciesInTemplate, pathManager, readCFNTemplate } from 'amplify-cli-core';
 import { Template } from 'cloudform-types';
+import { print } from './print';
 import { getResourceService } from './resource-status-data';
 
 const CategoryProviders = {
   CLOUDFORMATION: 'cloudformation',
 };
 
+/**
+ *
+ */
 export interface StackMutationInfo {
-  label: String;
+  label: string;
   consoleStyle: chalk.Chalk;
-  icon: String;
+  icon: string;
 }
-//helper for summary styling
+// helper for summary styling
+/**
+ *
+ */
 export interface StackMutationType {
   CREATE: StackMutationInfo;
   UPDATE: StackMutationInfo;
@@ -26,7 +32,7 @@ export interface StackMutationType {
   UNLINK: StackMutationInfo;
   NOCHANGE: StackMutationInfo;
 }
-//helper map from mutation-type to ux styling
+// helper map from mutation-type to ux styling
 export const stackMutationType: StackMutationType = {
   CREATE: {
     label: 'Create',
@@ -63,15 +69,18 @@ export const stackMutationType: StackMutationType = {
   },
 };
 
-//helper to capitalize string
+// helper to capitalize string
+/**
+ *
+ */
 export function capitalize(str: string): string {
   return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
 }
 
-//Console text styling for resource details section
+// Console text styling for resource details section
 const resourceDetailSectionStyle = chalk.bgRgb(15, 100, 204);
 
-//IResourcePaths: Interface for (build/prebuild) paths to local and cloud CFN files
+// IResourcePaths: Interface for (build/prebuild) paths to local and cloud CFN files
 interface IResourcePaths {
   localPreBuildCfnFile: string;
   cloudPreBuildCfnFile: string;
@@ -79,6 +88,9 @@ interface IResourcePaths {
   cloudBuildCfnFile: string;
 }
 
+/**
+ *
+ */
 export function globCFNFilePath(fileFolder: string) {
   if (fs.existsSync(fileFolder)) {
     const globOptions: glob.IOptions = {
@@ -90,12 +102,15 @@ export function globCFNFilePath(fileFolder: string) {
     const templateFileNames = glob.sync('**/*template.{yaml,yml,json}', globOptions);
     for (const templateFileName of templateFileNames) {
       const absolutePath = path.join(fileFolder, templateFileName);
-      return absolutePath; //only the top level cloudformation ( nested templates are picked after parsing this file )
+      return absolutePath; // only the top level cloudformation ( nested templates are picked after parsing this file )
     }
   }
   throw new Error(`No CloudFormation template found in ${fileFolder}`);
 }
 
+/**
+ *
+ */
 export class ResourceDiff {
   resourceName: string;
   category: string;
@@ -115,23 +130,23 @@ export class ResourceDiff {
     this.category = category;
     this.provider = this.normalizeProviderForFileNames(provider);
     this.service = getResourceService(category, resourceName);
-    this.localTemplate = {}; //requires file-access, hence loaded from async methods
-    this.cloudTemplate = {}; //requires file-access, hence loaded from async methods
+    this.localTemplate = {}; // requires file-access, hence loaded from async methods
+    this.cloudTemplate = {}; // requires file-access, hence loaded from async methods
     this.mutationInfo = mutationInfo;
-    //Resource Path state
+    // Resource Path state
     const localResourceAbsolutePathFolder = path.normalize(path.join(this.localBackendDir, category, resourceName));
     const cloudResourceAbsolutePathFolder = path.normalize(path.join(this.cloudBackendDir, category, resourceName));
     this.resourceFiles = {
-      //Paths using glob for Cfn file and Build file
+      // Paths using glob for Cfn file and Build file
       localPreBuildCfnFile: this.safeGlobCFNFilePath(localResourceAbsolutePathFolder),
       cloudPreBuildCfnFile: this.safeGlobCFNFilePath(cloudResourceAbsolutePathFolder),
-      //Build folder exists for services like GraphQL api which have an additional build step to generate CFN.
+      // Build folder exists for services like GraphQL api which have an additional build step to generate CFN.
       localBuildCfnFile: this.safeGlobCFNFilePath(path.normalize(path.join(localResourceAbsolutePathFolder, 'build'))),
       cloudBuildCfnFile: this.safeGlobCFNFilePath(path.normalize(path.join(cloudResourceAbsolutePathFolder, 'build'))),
     };
   }
 
-  //API :View: Print the resource detail status for the given mutation (Create/Update/Delete)
+  // API :View: Print the resource detail status for the given mutation (Create/Update/Delete)
   public printResourceDetailStatus = async (mutationInfo: StackMutationInfo) => {
     const header = `${mutationInfo.consoleStyle(mutationInfo.label)}`;
     const diff = await this.calculateCfnDiff();
@@ -142,34 +157,34 @@ export class ResourceDiff {
     }
   };
 
-  //API :Data: Calculate the difference in cloudformation templates between local and cloud templates
+  // API :Data: Calculate the difference in cloudformation templates between local and cloud templates
   public calculateCfnDiff = async (): Promise<cfnDiff.TemplateDiff> => {
     const resourceTemplatePaths = await this.getCfnResourceFilePaths();
-    //set the member template objects
+    // set the member template objects
     this.localTemplate = await this.safeReadCFNTemplate(resourceTemplatePaths.localTemplatePath);
     this.localTemplate = generateCustomPoliciesInTemplate(this.localTemplate, this.resourceName, this.service, this.category);
     this.cloudTemplate = await this.safeReadCFNTemplate(resourceTemplatePaths.cloudTemplatePath);
 
-    //Note!! :- special handling to support multi-env. Currently in multi-env, when new env is created,
-    //we do *Not* delete the cloud-backend folder. Hence this logic will always give no diff for new resources.
-    //TBD: REMOVE this once we delete cloud-backend folder for new envs
+    // Note!! :- special handling to support multi-env. Currently in multi-env, when new env is created,
+    // we do *Not* delete the cloud-backend folder. Hence this logic will always give no diff for new resources.
+    // TBD: REMOVE this once we delete cloud-backend folder for new envs
     if (this.mutationInfo.label == stackMutationType.CREATE.label) {
-      this.cloudTemplate = {}; //Dont use the parent env's template
+      this.cloudTemplate = {}; // Dont use the parent env's template
     }
 
-    //calculate diff of graphs.
+    // calculate diff of graphs.
     const diff: cfnDiff.TemplateDiff = cfnDiff.diffTemplate(this.cloudTemplate, this.localTemplate);
     return diff;
   };
 
-  //helper: wrapper around readCFNTemplate type to handle expressions.
+  // helper: wrapper around readCFNTemplate type to handle expressions.
   private safeReadCFNTemplate = async (filePath: string) => {
     const templateResult = readCFNTemplate(filePath, { throwIfNotExist: false });
     return templateResult?.cfnTemplate || {};
   };
 
-  //helper: Select cloudformation file path from build folder or non build folder.
-  //TBD: Update this function to infer filepath based on the state of the resource.
+  // helper: Select cloudformation file path from build folder or non build folder.
+  // TBD: Update this function to infer filepath based on the state of the resource.
   private getCfnResourceFilePaths = async () => {
     const resourceFilePaths = {
       localTemplatePath: checkExist(this.resourceFiles.localBuildCfnFile)
@@ -182,17 +197,16 @@ export class ResourceDiff {
     return resourceFilePaths;
   };
 
-  //helper: Get category provider from filename
+  // helper: Get category provider from filename
   private normalizeProviderForFileNames(provider: string): string {
-    //file-names are currently standardized around "cloudformation" not awscloudformation.
+    // file-names are currently standardized around "cloudformation" not awscloudformation.
     if (provider === 'awscloudformation') {
       return CategoryProviders.CLOUDFORMATION;
-    } else {
-      return provider;
     }
+    return provider;
   }
 
-  //helper: Convert cloudformation template diff data using CDK api
+  // helper: Convert cloudformation template diff data using CDK api
   private printStackDiff = (templateDiff: cfnDiff.TemplateDiff, stream?: cfnDiff.FormatStream) => {
     // filter out 'AWS::CDK::Metadata' since info is not helpful and formatDifferences doesnt know how to format it.
     if (templateDiff.resources) {
@@ -212,7 +226,7 @@ export class ResourceDiff {
     return templateDiff.differenceCount;
   };
 
-  //Search and return the path to cloudformation template in the given folder
+  // Search and return the path to cloudformation template in the given folder
   private safeGlobCFNFilePath(fileFolder: string) {
     try {
       return globCFNFilePath(fileFolder);
@@ -227,7 +241,7 @@ export class ResourceDiff {
 }
 
 function checkExist(filePath) {
-  const inputTypes = ['json', 'yaml', 'yml']; //check for existence of any one of the extensions.
+  const inputTypes = ['json', 'yaml', 'yml']; // check for existence of any one of the extensions.
   for (let i = 0; i < inputTypes.length; i++) {
     if (fs.existsSync(`${filePath}.${inputTypes[i]}`)) {
       return true;
@@ -236,14 +250,20 @@ function checkExist(filePath) {
   return false;
 }
 
-//Interface to store template-diffs for C-D-U resource diffs
+// Interface to store template-diffs for C-D-U resource diffs
+/**
+ *
+ */
 export interface IResourceDiffCollection {
   updatedDiff: ResourceDiff[] | [];
   deletedDiff: ResourceDiff[] | [];
   createdDiff: ResourceDiff[] | [];
 }
 
-//Interface to store resource status for each category
+// Interface to store resource status for each category
+/**
+ *
+ */
 export interface ICategoryStatusCollection {
   resourcesToBeCreated: any[];
   resourcesToBeUpdated: any[];
@@ -254,11 +274,14 @@ export interface ICategoryStatusCollection {
   tagsUpdated: boolean;
 }
 
-//"CollateResourceDiffs" - Calculates the diffs for the list of resources provided.
+// "CollateResourceDiffs" - Calculates the diffs for the list of resources provided.
 // note:- The mutationInfo may be used for styling in enhanced summary.
+/**
+ *
+ */
 export async function CollateResourceDiffs(resources, mutationInfo: StackMutationInfo /* create/update/delete */) {
   const provider = CategoryProviders.CLOUDFORMATION;
-  let resourceDiffs: ResourceDiff[] = [];
+  const resourceDiffs: ResourceDiff[] = [];
   for await (const resource of resources) {
     resourceDiffs.push(new ResourceDiff(resource.category, resource.resourceName, provider, mutationInfo));
   }
diff --git a/packages/amplify-e2e-tests/custom-resources/custom-cdk-stack.ts b/packages/amplify-e2e-tests/custom-resources/custom-cdk-stack.ts
index e86dd942449..350b9d859df 100644
--- a/packages/amplify-e2e-tests/custom-resources/custom-cdk-stack.ts
+++ b/packages/amplify-e2e-tests/custom-resources/custom-cdk-stack.ts
@@ -1,11 +1,14 @@
-import * as cdk from '@aws-cdk/core';
-import * as iam from '@aws-cdk/aws-iam';
-import * as sns from '@aws-cdk/aws-sns';
-import * as subs from '@aws-cdk/aws-sns-subscriptions';
-import * as sqs from '@aws-cdk/aws-sqs';
-
+import * as cdk from 'aws-cdk-lib';
+import * as iam from 'aws-cdk-lib/aws-iam';
+import * as sns from 'aws-cdk-lib/aws-sns';
+import * as subs from 'aws-cdk-lib/aws-sns-subscriptions';
+import * as sqs from 'aws-cdk-lib/aws-sqs';
+
+/**
+ *
+ */
 export class cdkStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) {
+  constructor(scope: Construct, id: string, props?: cdk.StackProps) {
     super(scope, id, props);
 
     /* Do not remove - Amplify CLI automatically injects the current deployment environment in this input paramater */
@@ -41,7 +44,7 @@ export class cdkStack extends cdk.Stack {
       assumedBy: new iam.AccountRootPrincipal(),
     });
 
-    /*Example 3: Adding policy to the IAM role*/
+    /* Example 3: Adding policy to the IAM role*/
     role.addToPolicy(
       new iam.PolicyStatement({
         actions: ['*'],
diff --git a/packages/amplify-graphql-migration-tests/package.json b/packages/amplify-graphql-migration-tests/package.json
index 80e05f66ea3..1cfd679920e 100644
--- a/packages/amplify-graphql-migration-tests/package.json
+++ b/packages/amplify-graphql-migration-tests/package.json
@@ -49,8 +49,8 @@
     "@aws-amplify/graphql-transformer-core": "^0.17.11",
     "@aws-amplify/graphql-transformer-interfaces": "^1.14.7",
     "@aws-amplify/graphql-transformer-migrator": "^1.4.6",
-    "@aws-cdk/cloudformation-diff": "~1.124.0",
     "amplify-prompts": "2.3.0",
+    "aws-cdk-lib": "^2.41.0",
     "fs-extra": "^8.1.0",
     "graphql-auth-transformer": "^7.2.43",
     "graphql-connection-transformer": "^5.2.42",
@@ -63,4 +63,4 @@
     "graphql-transformer-core": "^7.6.5",
     "graphql-versioned-transformer": "^5.2.42"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/amplify-graphql-migration-tests/src/__tests__/graphql-version-migration.test.ts b/packages/amplify-graphql-migration-tests/src/__tests__/graphql-version-migration.test.ts
index a09682f185d..44bbc148164 100644
--- a/packages/amplify-graphql-migration-tests/src/__tests__/graphql-version-migration.test.ts
+++ b/packages/amplify-graphql-migration-tests/src/__tests__/graphql-version-migration.test.ts
@@ -1,10 +1,10 @@
+import * as cdkDiff from 'aws-cdk-lib/cloudformation-diff';
+import { ResourceImpact } from 'aws-cdk-lib/cloudformation-diff';
 import { getTestCaseRegistry } from '../test-case-registry';
 import { v1transformerProvider } from '../v1-transformer-provider';
 import { v2transformerProvider } from '../v2-transformer-provider';
 import { migrateSchema } from '../migrate-schema-wrapper';
 import { getNestedStackDiffRules } from '../nested-stack-diff-rules';
-import * as cdkDiff from '@aws-cdk/cloudformation-diff';
-import { ResourceImpact } from '@aws-cdk/cloudformation-diff';
 
 describe('v1 to v2 migration', () => {
   test.concurrent.each(getTestCaseRegistry())(
diff --git a/packages/amplify-graphql-migration-tests/src/nested-stack-diff-rules.ts b/packages/amplify-graphql-migration-tests/src/nested-stack-diff-rules.ts
index a7c7c6044e6..fdd220e7934 100644
--- a/packages/amplify-graphql-migration-tests/src/nested-stack-diff-rules.ts
+++ b/packages/amplify-graphql-migration-tests/src/nested-stack-diff-rules.ts
@@ -1,5 +1,8 @@
-import { ResourceImpact, TemplateDiff } from '@aws-cdk/cloudformation-diff';
+import { ResourceImpact, TemplateDiff } from 'aws-cdk-lib/cloudformation-diff';
 
+/**
+ *
+ */
 export const getNestedStackDiffRules = (): NestedStackDiffRule[] => [
   onlyUpdatesTableNameProperty,
   tableNameResolvesToSameName,
@@ -13,7 +16,7 @@ export const getNestedStackDiffRules = (): NestedStackDiffRule[] => [
  * @param diff The diff of the nested stack
  */
 const onlyUpdatesTableNameProperty = (stackName: string, diff: TemplateDiff) => {
-  const propertyUpdates = diff.resources.changes[`${stackName}Table`].propertyUpdates;
+  const { propertyUpdates } = diff.resources.changes[`${stackName}Table`];
   try {
     expect(Object.keys(propertyUpdates)).toEqual(['TableName']); // The table name should resolve to the same value but the way it's defined is different so it shows up here as a diff
   } catch (err) {
@@ -24,7 +27,7 @@ const onlyUpdatesTableNameProperty = (stackName: string, diff: TemplateDiff) =>
 };
 
 const tableNameResolvesToSameName = (stackName: string, diff: TemplateDiff) => {
-  const propertyUpdates = diff.resources.changes[`${stackName}Table`].propertyUpdates;
+  const { propertyUpdates } = diff.resources.changes[`${stackName}Table`];
   const newTableName = propertyUpdates.TableName.newValue;
   expect(newTableName['Fn::Join']).toBeDefined();
   const joinParams = newTableName['Fn::Join'];
@@ -57,4 +60,7 @@ const dataSourceLogicalIdsAreSame = (_: string, diff: TemplateDiff) => {
   expect(areDataSourcesReplaced).toBe(true);
 };
 
+/**
+ *
+ */
 export type NestedStackDiffRule = (stackName: string, diff: TemplateDiff) => void;
diff --git a/yarn.lock b/yarn.lock
index fc250203edd..98330a2b2ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -609,7 +609,7 @@
 
 "@aws-cdk/assert@~1.124.0":
   version "1.124.0"
-  resolved "https://registry.npmjs.org/@aws-cdk/assert/-/assert-1.124.0.tgz#1cc724a45666e29b58a269cab4176d41bedb2fd0"
+  resolved "https://registry.yarnpkg.com/@aws-cdk/assert/-/assert-1.124.0.tgz#1cc724a45666e29b58a269cab4176d41bedb2fd0"
   integrity sha512-LYVBrurg9Z2yHLfW62iWVMkVNlLIDiqUl/o7yo7vwlZFbdF5X5YKbui28SbxV2ikd6Crbwyb2KF45jx/Dzj2ZA==
   dependencies:
     "@aws-cdk/cloudformation-diff" "1.124.0"
@@ -619,7 +619,7 @@
 
 "@aws-cdk/assertions@~1.124.0":
   version "1.124.0"
-  resolved "https://registry.npmjs.org/@aws-cdk/assertions/-/assertions-1.124.0.tgz#4d61226f341cf4f8ba66238cf46fa9150cc87afb"
+  resolved "https://registry.yarnpkg.com/@aws-cdk/assertions/-/assertions-1.124.0.tgz#4d61226f341cf4f8ba66238cf46fa9150cc87afb"
   integrity sha512-jvJf701HizOu3gZHFeC0YQHED2P9aRzKuBk76kA07pAVxxLN7AWTbPrMBtC0ToCVnhazZ1sftxjnLOkxLyyloA==
   dependencies:
     "@aws-cdk/cloud-assembly-schema" "1.124.0"
@@ -1364,7 +1364,7 @@
 
 "@aws-cdk/cfnspec@1.124.0":
   version "1.124.0"
-  resolved "https://registry.npmjs.org/@aws-cdk/cfnspec/-/cfnspec-1.124.0.tgz#68c8272417a6e1c5cdfcd7d14ba33829ddacb481"
+  resolved "https://registry.yarnpkg.com/@aws-cdk/cfnspec/-/cfnspec-1.124.0.tgz#68c8272417a6e1c5cdfcd7d14ba33829ddacb481"
   integrity sha512-H0Yhx9I8hHLBvoRclOj61kALh3jYQssHK6iL9wlEHPs51Gq32GjWJCwqBx+2pEbp6oUpSsUIPw4XbGCEpj7PuA==
   dependencies:
     md5 "^2.3.0"
@@ -1379,7 +1379,7 @@
 
 "@aws-cdk/cloudformation-diff@1.124.0", "@aws-cdk/cloudformation-diff@~1.124.0":
   version "1.124.0"
-  resolved "https://registry.npmjs.org/@aws-cdk/cloudformation-diff/-/cloudformation-diff-1.124.0.tgz#3cd7d6229220ea5bd1e4200bce6916ac12ecdec7"
+  resolved "https://registry.yarnpkg.com/@aws-cdk/cloudformation-diff/-/cloudformation-diff-1.124.0.tgz#3cd7d6229220ea5bd1e4200bce6916ac12ecdec7"
   integrity sha512-gUmhwfHE/AolTiVtjPCJGf0Gsp5nV+PDAtcJ7ZtjrLMJ2vIKonT29qbeFclyw8EBCCfX5SLH7ByeaUiFFocj2w==
   dependencies:
     "@aws-cdk/cfnspec" "1.124.0"
@@ -8781,7 +8781,7 @@
 
 "@types/node@^10.17.60":
   version "10.17.60"
-  resolved "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
   integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
 
 "@types/node@^12.12.6":
@@ -10293,6 +10293,21 @@ aws-appsync@^4.1.4:
     url "^0.11.0"
     uuid "3.x"
 
+aws-cdk-lib@^2.41.0:
+  version "2.41.0"
+  resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.41.0.tgz#5bcff1b075dd8eb3df6346ba11940a1d75d993d5"
+  integrity sha512-wh6lDaarzb8B+43TMxEBg+yHcXU9omlUGJz9zSdgjrmeQWBV8SD0jIvrERhDFvQLmRY4Vzy7FXxkI0mU+adDHQ==
+  dependencies:
+    "@balena/dockerignore" "^1.0.2"
+    case "1.6.3"
+    fs-extra "^9.1.0"
+    ignore "^5.2.0"
+    jsonschema "^1.4.1"
+    minimatch "^3.1.2"
+    punycode "^2.1.1"
+    semver "^7.3.7"
+    yaml "1.10.2"
+
 aws-sdk-mock@^5.6.2:
   version "5.6.2"
   resolved "https://registry.npmjs.org/aws-sdk-mock/-/aws-sdk-mock-5.6.2.tgz#664771462953ca8d3806d5a50a63b4a6dbd5290f"
@@ -11954,6 +11969,11 @@ constant-case@^3.0.4:
     tslib "^2.0.3"
     upper-case "^2.0.2"
 
+constructs@^10.0.5:
+  version "10.1.96"
+  resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.1.96.tgz#c52cae505773f528f8ed356a739e60b240c4682e"
+  integrity sha512-i0wEjeSAtdLMC57EZIroEU4f2nMqa5oQW+pZe2yHqFZuVOEV7AXFy5+axguCI4vb/uD7XmjPArx10jA0AF84Ng==
+
 constructs@^3.3.125, constructs@^3.3.69:
   version "3.3.166"
   resolved "https://registry.npmjs.org/constructs/-/constructs-3.3.166.tgz#0d8ff31366cbe3c15df6f7aeba15b4d5e81f0087"
@@ -17369,6 +17389,11 @@ jsonschema@^1.4.0:
   resolved "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2"
   integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw==
 
+jsonschema@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
+  integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
+
 jsonwebtoken@^8.5.1:
   version "8.5.1"
   resolved "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
@@ -22858,7 +22883,7 @@ table@^6.0.9:
 
 table@^6.7.1:
   version "6.8.0"
-  resolved "https://registry.npmjs.org/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
   integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
   dependencies:
     ajv "^8.0.1"