Merge branch 'dev' into feat/replace-lambda-callouts

aws-amplify · May 3, 2023 · 2a46fd8 · 2a46fd8
2 parents 17b0a83 + 0d6bca4
commit 2a46fd8
Show file tree

Hide file tree

Showing 183 changed files with 2,698 additions and 1,098 deletions.
diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
@@ -447,9 +447,6 @@ jobs:
           key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
       - restore_cache:
           key: amplify-pkg-binaries-{{ .Branch }}-{{ .Revision }}
-      - run:
-          name: Update OS Packages
-          command: sudo apt-get update
       - run:
           name: Start verdaccio and Install Amplify CLI as sudo
           command: |
@@ -1023,7 +1020,6 @@ workflows:
                 - beta
                 - release
                 - /release_rc\/.*/
-                - /tagged-release-without-e2e-tests\/.*/
                 - /run-e2e\/.*/
       - verify-api-extract:
           requires:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,5 +15,6 @@
   },
   "prettier.requireConfig": true,
   "prettier.configPath": "./.prettierrc",
-  "prettier.prettierPath": "../node_modules/prettier"
+  "prettier.prettierPath": "../node_modules/prettier",
+  "jest.jestCommandLine": "./node_modules/.bin/jest"
 }
diff --git a/nx.json b/nx.json
@@ -43,6 +43,10 @@
       "inputs": ["default", "^default"],
       "dependsOn": ["^package"]
     },
+    "smoketest": {
+      "inputs": ["default", "^production"],
+      "dependsOn": ["build"]
+    },
     "test": {
       "inputs": ["default", "^production"],
       "dependsOn": ["build"]

diff --git a/package.json b/package.json
@@ -44,6 +44,9 @@
     "rm-dev-link": "rimraf -f \"$(yarn global bin)/amplify-dev\"",
     "setup-dev-win": "yarn dev-build && yarn link-win && yarn link-aa-win",
     "setup-dev": "yarn dev-build && yarn rm-dev-link && yarn link-dev && yarn rm-aa-dev-link && yarn link-aa-dev",
+    "smoketest": "nx run-many --parallel=1 --target=smoketest --all --output-style=stream-without-prefixes",
+    "smoketest@latest": "CLI_VERSION=latest nx run-many --parallel=1 --target=smoketest --all --output-style=stream-without-prefixes",
+    "smoketest@rc": "CLI_VERSION=rc nx run-many --parallel=1 --target=smoketest --all --output-style=stream-without-prefixes",
     "split-e2e-tests": "yarn ts-node ./scripts/split-e2e-tests.ts && git add .circleci/config.yml",
     "test-changed": "nx affected --target=test",
     "test-ci": "nx run-many --parallel=4 --target=test --all -- --ci --runInBand",

diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.3...@aws-amplify/amplify-app@5.0.4) (2023-04-24)
+
+**Note:** Version bump only for package @aws-amplify/amplify-app
+
+
+
+
+
 ## [5.0.3](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-app@5.0.1...@aws-amplify/amplify-app@5.0.3) (2023-04-14)
 
 **Note:** Version bump only for package @aws-amplify/amplify-app

diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-app",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
   "dependencies": {
     "@aws-amplify/amplify-frontend-android": "3.5.3",
     "@aws-amplify/amplify-frontend-flutter": "1.4.2",
-    "@aws-amplify/amplify-frontend-ios": "3.6.5",
-    "@aws-amplify/amplify-frontend-javascript": "3.9.3",
+    "@aws-amplify/amplify-frontend-ios": "3.6.6",
+    "@aws-amplify/amplify-frontend-javascript": "3.9.4",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/amplify-appsync-simulator/CHANGELOG.md b/packages/amplify-appsync-simulator/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.11.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.10.5...@aws-amplify/amplify-appsync-simulator@2.11.0) (2023-04-24)
+
+
+### Features
+
+* **amplify-util-uibuilder:** support StorageField ([#12386](https://github.com/aws-amplify/amplify-cli/issues/12386)) ([90fe1e4](https://github.com/aws-amplify/amplify-cli/commit/90fe1e4574c52eb4cacd110d50310f55bf913214))
+
+
+
+
+
 ## [2.10.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.10.3...@aws-amplify/amplify-appsync-simulator@2.10.5) (2023-04-14)
 
 **Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator

diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-appsync-simulator",
-  "version": "2.10.5",
+  "version": "2.11.0",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.0.3",
+    "@aws-amplify/amplify-cli-core": "4.0.4",
     "@aws-amplify/amplify-prompts": "2.6.8",
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",

diff --git a/packages/amplify-category-analytics/CHANGELOG.md b/packages/amplify-category-analytics/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.6](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.5...@aws-amplify/amplify-category-analytics@5.0.6) (2023-04-24)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
+
+
+
+
+
 ## [5.0.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-analytics@5.0.3...@aws-amplify/amplify-category-analytics@5.0.5) (2023-04-14)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-analytics

diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-analytics",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -25,8 +25,8 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.0.3",
-    "@aws-amplify/amplify-environment-parameters": "1.4.3",
+    "@aws-amplify/amplify-cli-core": "4.0.4",
+    "@aws-amplify/amplify-environment-parameters": "1.5.0",
     "@aws-amplify/amplify-prompts": "2.6.8",
     "fs-extra": "^8.1.0",
     "uuid": "^8.3.2"

diff --git a/packages/amplify-category-auth/CHANGELOG.md b/packages/amplify-category-auth/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.1.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.0.3...@aws-amplify/amplify-category-auth@3.1.0) (2023-04-24)
+
+
+### Features
+
+* **amplify-util-uibuilder:** support StorageField ([#12386](https://github.com/aws-amplify/amplify-cli/issues/12386)) ([90fe1e4](https://github.com/aws-amplify/amplify-cli/commit/90fe1e4574c52eb4cacd110d50310f55bf913214))
+
+
+
+
+
 ## [3.0.3](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@3.0.1...@aws-amplify/amplify-category-auth@3.0.3) (2023-04-14)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-auth

diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-auth",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -28,12 +28,12 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.0.3",
-    "@aws-amplify/amplify-environment-parameters": "1.4.3",
+    "@aws-amplify/amplify-cli-core": "4.0.4",
+    "@aws-amplify/amplify-environment-parameters": "1.5.0",
     "@aws-amplify/amplify-function-plugin-interface": "1.10.2",
     "@aws-amplify/amplify-prompts": "2.6.8",
-    "@aws-amplify/amplify-util-import": "2.4.2",
-    "@aws-amplify/cli-extensibility-helper": "3.0.3",
+    "@aws-amplify/amplify-util-import": "2.5.0",
+    "@aws-amplify/cli-extensibility-helper": "3.0.4",
     "amplify-headless-interface": "1.17.3",
     "amplify-util-headless-input": "1.9.12",
     "aws-cdk-lib": "~2.68.0",
@@ -50,9 +50,10 @@
     "ora": "^4.0.3",
     "promise-sequential": "^1.1.1",
     "uuid": "^8.3.2",
-    "vm2": "^3.9.8"
+    "vm2": "^3.9.16"
   },
   "devDependencies": {
+    "@aws-sdk/client-cognito-identity-provider": "^3.303.0",
     "@types/mime-types": "^2.1.1",
     "cloudform-types": "^4.2.0",
     "rimraf": "^3.0.2"

diff --git a/...mation/triggers/CreateAuthChallenge/cloudformation-templates/CreateAuthChallenge.json.ejs b/...mation/triggers/CreateAuthChallenge/cloudformation-templates/CreateAuthChallenge.json.ejs
@@ -104,7 +104,7 @@
                 }
             },
             "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-            "Runtime": "nodejs16.x",
+            "Runtime": "nodejs18.x",
             "Timeout": 25
           }
         },

diff --git a/.../awscloudformation/triggers/CustomMessage/cloudformation-templates/CustomMessage.json.ejs b/.../awscloudformation/triggers/CustomMessage/cloudformation-templates/CustomMessage.json.ejs
@@ -121,7 +121,7 @@
                 }
             },
             "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-            "Runtime": "nodejs16.x",
+            "Runtime": "nodejs18.x",
             "Timeout": 25
           }
         },

diff --git a/...mation/triggers/DefineAuthChallenge/cloudformation-templates/DefineAuthChallenge.json.ejs b/...mation/triggers/DefineAuthChallenge/cloudformation-templates/DefineAuthChallenge.json.ejs
@@ -97,7 +97,7 @@
                 }
             },
             "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-            "Runtime": "nodejs16.x",
+            "Runtime": "nodejs18.x",
             "Timeout": 25
           }
         },

diff --git a/...ormation/triggers/PostAuthentication/cloudformation-templates/PostAuthentication.json.ejs b/...ormation/triggers/PostAuthentication/cloudformation-templates/PostAuthentication.json.ejs
@@ -97,7 +97,7 @@
                 }
             },
             "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-            "Runtime": "nodejs16.x",
+            "Runtime": "nodejs18.x",
             "Timeout": 25
           }
         },

diff --git a/...-category-auth/provider-utils/awscloudformation/triggers/PostConfirmation/add-to-group.js b/...-category-auth/provider-utils/awscloudformation/triggers/PostConfirmation/add-to-group.js
@@ -1,8 +1,11 @@
-const aws = require('aws-sdk');
+const {
+  CognitoIdentityProviderClient,
+  AdminAddUserToGroupCommand,
+  GetGroupCommand,
+  CreateGroupCommand,
+} = require('@aws-sdk/client-cognito-identity-provider');
 
-const cognitoIdentityServiceProvider = new aws.CognitoIdentityServiceProvider({
-  apiVersion: '2016-04-18',
-});
+const cognitoIdentityServiceProvider = new CognitoIdentityProviderClient({});
 
 /**
  * @type {import('@types/aws-lambda').PostConfirmationTriggerHandler}
@@ -21,14 +24,14 @@ exports.handler = async (event) => {
    * Check if the group exists; if it doesn't, create it.
    */
   try {
-    await cognitoIdentityServiceProvider.getGroup(groupParams).promise();
+    await cognitoIdentityServiceProvider.send(new GetGroupCommand(groupParams));
   } catch (e) {
-    await cognitoIdentityServiceProvider.createGroup(groupParams).promise();
+    await cognitoIdentityServiceProvider.send(new CreateGroupCommand(groupParams));
   }
   /**
    * Then, add the user to the group.
    */
-  await cognitoIdentityServiceProvider.adminAddUserToGroup(addUserParams).promise();
+  await cognitoIdentityServiceProvider.send(new AdminAddUserToGroupCommand(addUserParams));
 
   return event;
 };
diff --git a/...oudformation/triggers/PostConfirmation/cloudformation-templates/PostConfirmation.json.ejs b/...oudformation/triggers/PostConfirmation/cloudformation-templates/PostConfirmation.json.ejs
@@ -104,7 +104,7 @@
                 }
             },
             "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-            "Runtime": "nodejs16.x",
+            "Runtime": "nodejs18.x",
             "Timeout": 25
           }
         },

diff --git a/...dformation/triggers/PreAuthentication/cloudformation-templates/PreAuthentication.json.ejs b/...dformation/triggers/PreAuthentication/cloudformation-templates/PreAuthentication.json.ejs
@@ -97,7 +97,7 @@
               }
           },
           "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-          "Runtime": "nodejs16.x",
+          "Runtime": "nodejs18.x",
           "Timeout": 25
         }
       },

diff --git a/...er-utils/awscloudformation/triggers/PreSignup/cloudformation-templates/PreSignup.json.ejs b/...er-utils/awscloudformation/triggers/PreSignup/cloudformation-templates/PreSignup.json.ejs
@@ -111,7 +111,7 @@
                 }
             },
             "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-            "Runtime": "nodejs16.x",
+            "Runtime": "nodejs18.x",
             "Timeout": 25
           }
         },

diff --git a/...ormation/triggers/PreTokenGeneration/cloudformation-templates/PreTokenGeneration.json.ejs b/...ormation/triggers/PreTokenGeneration/cloudformation-templates/PreTokenGeneration.json.ejs
@@ -97,7 +97,7 @@
               }
           },
           "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-          "Runtime": "nodejs16.x",
+          "Runtime": "nodejs18.x",
           "Timeout": 25
         }
       },

diff --git a/...VerifyAuthChallengeResponse/cloudformation-templates/VerifyAuthChallengeResponse.json.ejs b/...VerifyAuthChallengeResponse/cloudformation-templates/VerifyAuthChallengeResponse.json.ejs
@@ -105,7 +105,7 @@
                 }
             },
             "Role": { "Fn::GetAtt" : ["LambdaExecutionRole", "Arn"] },
-            "Runtime": "nodejs16.x",
+            "Runtime": "nodejs18.x",
             "Timeout": 25
           }
         },