feat: converts auth and storage categories to cdk V2

aws-amplify · Sep 8, 2022 · e72a100 · e72a100
1 parent ca5030a
commit e72a100
Show file tree

Hide file tree

Showing 34 changed files with 989 additions and 576 deletions.
diff --git a/nx.json b/nx.json
@@ -11,7 +11,8 @@
           "lint",
           "package",
           "prepare"
-        ]
+        ],
+        "useDaemonProcess": false
       }
     }
   },
@@ -43,4 +44,4 @@
       "analyzeSourceFiles": false
     }
   }
-}
+}
diff --git 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"
     ]
   }
-}
+}
diff --git a/...__/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.test.ts b/...__/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');