merging dev into feature branch

.circleci/config.base.yml

@@ -384,25 +384,7 @@ jobs:
           command: |
             source .circleci/local_publish_helpers.sh
             verifyPkgCli
-
-  graphql_e2e_tests:
-    <<: *defaults
-    steps:
-      - restore_cache:
-          key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
-      - restore_cache:
-          key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - run:
-          name: Run GraphQL end-to-end tests
-          command: |
-            source .circleci/local_publish_helpers.sh
-            cd packages/graphql-transformers-e2e-tests/
-            retry yarn e2e --maxWorkers=3 $TEST_SUITE
-          environment:
-            AMPLIFY_CLI_DISABLE_LOGGING: 'true'
-          no_output_timeout: 90m
-      - store_test_results:
-          path: ~/repo/packages/graphql-transformers-e2e-tests/
+
   amplify_sudo_install_test:
     <<: *defaults
     steps:
@@ -490,8 +472,8 @@ jobs:
             source .circleci/local_publish_helpers.sh
             changeNpmGlobalPath
             cd packages/amplify-migration-tests
-            retry yarn run migration_v5.2.0 --maxWorkers=3 $TEST_SUITE
-          no_output_timeout: 90m
+            retry yarn run migration_v5.2.0 --no-cache --maxWorkers= $TEST_SUITE
+          no_output_timeout: 65m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
           path: ~/repo/packages/amplify-migration-tests/
@@ -520,8 +502,8 @@ jobs:
             source .circleci/local_publish_helpers.sh
             changeNpmGlobalPath
             cd packages/amplify-migration-tests
-            retry yarn run migration_v6.1.0 --maxWorkers=3 $TEST_SUITE
-          no_output_timeout: 90m
+            retry yarn run migration_v6.1.0 --no-cache --maxWorkers=3 $TEST_SUITE
+          no_output_timeout: 65m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
           path: ~/repo/packages/amplify-migration-tests/
@@ -552,8 +534,8 @@ jobs:
             cd packages/amplify-migration-tests
             unset IS_AMPLIFY_CI
             echo $IS_AMPLIFY_CI
-            retry yarn run migration_v10.5.1 --maxWorkers=3 $TEST_SUITE
-          no_output_timeout: 90m
+            retry yarn run migration_v10.5.1 --no-cache --maxWorkers=3 $TEST_SUITE
+          no_output_timeout: 65m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
           path: ~/repo/packages/amplify-migration-tests/
@@ -582,7 +564,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             changeNpmGlobalPath
             cd packages/amplify-migration-tests
-            retry yarn run migration_v4.28.2_nonmultienv_layers --maxWorkers=3 $TEST_SUITE
+            retry yarn run migration_v4.28.2_nonmultienv_layers --no-cache --maxWorkers=3 $TEST_SUITE
           no_output_timeout: 90m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
@@ -612,7 +594,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             changeNpmGlobalPath
             cd packages/amplify-migration-tests
-            retry yarn run migration_v4.52.0_multienv_layers --maxWorkers=3 $TEST_SUITE
+            retry yarn run migration_v4.52.0_multienv_layers --no-cache --maxWorkers=3 $TEST_SUITE
           no_output_timeout: 90m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
@@ -640,7 +622,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             amplify -v
             cd packages/amplify-console-integration-tests
-            retry yarn run console-integration --maxWorkers=3
+            retry yarn run console-integration --no-cache --maxWorkers=3
           name: 'Run Amplify Console integration tests'
           no_output_timeout: 90m
       - run: *scan_e2e_test_artifacts
@@ -886,6 +868,13 @@ jobs:
                   sleep 60
                 done
           no_output_timeout: 180m
+      - run:
+          name: 'Collect Results'
+          command: yarn workflow-results
+      - run: *scan_e2e_test_artifacts
+      - store_artifacts:
+          path: ~/repo/artifacts
+
     working_directory: ~/repo
 
 workflows:
@@ -947,18 +936,6 @@ workflows:
                 - beta
                 - release
                 - /tagged-release-without-e2e-tests\/.*/
-      - graphql_e2e_tests:
-          context:
-            - e2e-test-context
-          filters:
-            branches:
-              only:
-                - dev
-                - /run-e2e-with-rc\/.*/
-                - /tagged-release\/.*/
-                - /run-e2e\/.*/
-          requires:
-            - upload_pkg_binaries
       - integration_test:
           context:
             - e2e-test-context
@@ -1184,7 +1161,6 @@ workflows:
           requires:
             - test
             - mock_e2e_tests
-            - graphql_e2e_tests
             - integration_test
             - amplify_e2e_tests_pkg
             - amplify_sudo_install_test
@@ -1290,9 +1266,11 @@ commands:
                 shell: bash.exe
                 command: |
                   source .circleci/local_publish_helpers.sh
+                  source $BASH_ENV
+                  amplify version
                   cd packages/amplify-e2e-tests
-                  retry yarn run e2e --force-exit --detectOpenHandles --maxWorkers=3 $TEST_SUITE
-                no_output_timeout: 60m
+                  retry yarn run e2e --no-cache --maxWorkers=3 $TEST_SUITE
+                no_output_timeout: 65m
       - when:
           condition:
             or:
@@ -1306,7 +1284,7 @@ commands:
                   source $BASH_ENV
                   amplify version
                   retry runE2eTest
-                no_output_timeout: 90m
+                no_output_timeout: 65m
   scan_e2e_test_artifacts:
     description: 'Scan And Cleanup E2E Test Artifacts'
     parameters:

.circleci/config.yml

@@ -159,7 +159,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             amplify -v
             cd packages/amplify-console-integration-tests
-            retry yarn run console-integration --maxWorkers=3
+            retry yarn run console-integration --no-cache --maxWorkers=3
           name: Run Amplify Console integration tests
           no_output_timeout: 90m
       - run:

.circleci/local_publish_helpers.sh

@@ -250,8 +250,8 @@ function setAwsAccountCredentials {
     export AWS_ACCESS_KEY_ID_ORIG=$AWS_ACCESS_KEY_ID
     export AWS_SECRET_ACCESS_KEY_ORIG=$AWS_SECRET_ACCESS_KEY
     export AWS_SESSION_TOKEN_ORIG=$AWS_SESSION_TOKEN
-    # introduce a delay of up to 5 minutes to allow for more even spread aws list-accounts calls due to throttling
-    sleep $[ ( $RANDOM % 300 )  + 1 ]s
+    # introduce a delay of up to 1 minute to allow for more even spread aws list-accounts calls due to throttling
+    sleep $[ ( $RANDOM % 60 )  + 1 ]s
     if [[ "$OSTYPE" == "msys" ]]; then
         # windows provided by circleci has this OSTYPE
         useChildAccountCredentials
@@ -276,11 +276,10 @@ function runE2eTest {
 
     if [ -f  $FAILED_TEST_REGEX_FILE ]; then
         # read the content of failed tests
-        failedTests=$(<$FAILED_TEST_REGEX_FILE)
-        # adding --force-exit per https://github.com/facebook/jest/issues/9473
-        yarn run e2e --force-exit --detectOpenHandles --maxWorkers=3 $TEST_SUITE -t "$failedTests"
+        failedTests=$(<$FAILED_TEST_REGEX_FILE)=
+        yarn run e2e --no-cache --maxWorkers=3 $TEST_SUITE -t "$failedTests"
     else
-        yarn run e2e --force-exit --detectOpenHandles --maxWorkers=3 $TEST_SUITE
+        yarn run e2e --no-cache --maxWorkers=3 $TEST_SUITE
     fi
 }
 

.eslintrc.js

@@ -20,6 +20,7 @@ module.exports = {
     ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features
     sourceType: 'module', // Allows for the use of imports
     project: ['tsconfig.base.json', 'packages/amplify-cli/tsconfig.json'],
+    tsconfigRootDir: __dirname,
     ecmaFeatures: {
       jsx: true, // Allows for the parsing of JSX
       arrowFunctions: true,

.gitignore

@@ -1,5 +1,9 @@
 **/.DS_Store
 .circleci/generated_config.yml
+scripts/cci-job.data.json
+scripts/cci-test.data.json
+artifacts/cci-workflow-results.json
+artifacts/cci-workflow-results.html
 build
 !packages/amplify-graphql-model-transformer/src/__tests__/overrides/build/
 !packages/amplify-graphql-function-transformer/src/__tests__/overrides/build/

.vscode/settings.json

@@ -3,8 +3,7 @@
   "files.exclude": {
     "**/.git": true,
     "**/node_modules": true,
-    "**/build": true,
-    "**/coverage": true
+    "**/build": true
   },
   "editor.formatOnSave": true,
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],

artifacts/readme.md

@@ -0,0 +1,3 @@
+CircleCI Workflow results are stored in this artifacts directory.
+
+After each e2e run, you can locate the artifact file here & observe the workflow results summary.

package.json

@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "description": "amplify-cli",
   "scripts": {
+    "coverage:collect": "ts-node ./scripts/collect-test-coverage.ts",
     "addwords": "node ./scripts/add-to-dict.js",
     "test-changed": "nx affected --target=test",
     "test": "nx run-many --target=test --all",
@@ -28,6 +29,8 @@
     "link-win": "node ./scripts/link-bin.js packages/amplify-cli/bin/amplify amplify-dev",
     "link-aa-win": "node ./scripts/link-bin.js packages/amplify-app/bin/amplify-app amplify-app-dev",
     "setup-dev-win": "yarn dev-build && yarn link-win && yarn link-aa-win",
+    "update-test-timing-data": "ts-node ./scripts/cci-get-job-metrics.ts && ts-node ./scripts/cci-extract-test-timings-from-job-metrics.ts",
+    "workflow-results": "yarn ts-node ./scripts/cci-workflow-results.ts",
     "split-e2e-tests": "yarn ts-node ./scripts/split-e2e-tests.ts && git add .circleci/config.yml",
     "verify-commit": "yarn ts-node ./scripts/verify-commit.ts",
     "pkg-clean": "rimraf build out pkg/node_modules pkg/yarn.lock",
@@ -64,7 +67,7 @@
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-push": "yarn verify-api-extract:clean && yarn build-tests-changed && yarn split-e2e-tests",
+      "pre-push": "yarn build-tests-changed && yarn split-e2e-tests",
       "pre-commit": "yarn verify-commit"
     }
   },
@@ -96,7 +99,7 @@
     "@commitlint/prompt": "^16.2.3",
     "@microsoft/api-extractor": "^7.33.5",
     "@types/glob": "^7.1.1",
-    "@types/jest": "^26.0.20",
+    "@types/jest": "^27.0.0",
     "@types/js-yaml": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^5.34.0",
     "@typescript-eslint/parser": "^5.34.0",
@@ -111,7 +114,7 @@
     "eslint-import-resolver-typescript": "^2.0.0",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^26.1.1",
+    "eslint-plugin-jest": "^27.0.0",
     "eslint-plugin-jsdoc": "^37.9.6",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prefer-arrow": "^1.2.3",
@@ -120,8 +123,11 @@
     "execa": "^5.1.1",
     "glob": "^7.2.0",
     "husky": "^3.1.0",
-    "jest": "^26.6.3",
-    "jest-circus": "^26.6.3",
+    "istanbul-lib-coverage": "^3.2.0",
+    "istanbul-lib-report": "^3.0.0",
+    "istanbul-reports": "^3.1.5",
+    "jest": "^27.0.0",
+    "jest-circus": "^27.0.0",
     "jest-junit": "^12.0.0",
     "js-yaml": "^4.0.0",
     "lnk": "1.1.0",
@@ -130,7 +136,7 @@
     "nx": "^14.8.3",
     "pkg": "^5.4.1",
     "rimraf": "^3.0.0",
-    "ts-jest": "^26.4.4",
+    "ts-jest": "^27.0.0",
     "ts-node": "^8.10.1",
     "typescript": "^4.5.5"
   },

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.
 
+## [4.3.7](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.3.7) (2023-01-17)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
 ## [4.3.6](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.3.6) (2023-01-03)
 
 **Note:** Version bump only for package amplify-app

packages/amplify-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-app",
-  "version": "4.3.6",
+  "version": "4.3.7",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
   "dependencies": {
     "amplify-frontend-android": "3.4.0",
     "amplify-frontend-flutter": "1.3.5",
-    "amplify-frontend-ios": "3.5.6",
-    "amplify-frontend-javascript": "3.7.2",
+    "amplify-frontend-ios": "3.5.7",
+    "amplify-frontend-javascript": "3.7.3",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

packages/amplify-appsync-simulator/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.
 
+## [2.9.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-01-17)
+
+**Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator
+
+
+
+
+
 # [2.9.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-01-03)
 
 

packages/amplify-appsync-simulator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-appsync-simulator",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",
-    "amplify-cli-core": "3.5.0",
+    "amplify-cli-core": "3.5.1",
     "amplify-prompts": "2.6.2",
     "amplify-velocity-template": "1.4.8",
     "aws-sdk": "^2.1233.0",

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.
 
+## [4.3.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.3.1) (2023-01-17)
+
+**Note:** Version bump only for package amplify-category-analytics
+
+
+
+
+
 # [4.3.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@4.3.0) (2023-01-03)
 
 

packages/amplify-category-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-analytics",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -22,11 +22,10 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.3.0",
-    "amplify-cli-core": "3.5.0",
+    "@aws-amplify/amplify-environment-parameters": "1.3.1",
+    "amplify-cli-core": "3.5.1",
     "amplify-prompts": "2.6.2",
     "fs-extra": "^8.1.0",
-    "inquirer": "^7.3.3",
     "uuid": "^8.3.2"
   },
   "jest": {