Merge remote-tracking branch 'upstream/dev' into pr/acusti/11854

Author: edwardfoyle

.circleci/config.base.yml

@@ -16,7 +16,7 @@ parameters:
 executors:
   w_medium: &windows-e2e-executor-medium
     machine:
-      image: 'windows-server-2019-vs2019:stable'
+      image: 'windows-server-2022-gui:current'
       resource_class: 'windows.medium'
       shell: bash.exe
     working_directory: ~/repo
@@ -26,7 +26,7 @@ executors:
 
   w_xlarge: &windows-e2e-executor-xlarge
     machine:
-      image: 'windows-server-2019-vs2019:stable'
+      image: 'windows-server-2022-gui:current'
       resource_class: 'windows.xlarge'
       shell: bash.exe
     working_directory: ~/repo
@@ -35,7 +35,7 @@ executors:
       AMPLIFY_PATH: C:/home/circleci/repo/out/amplify.exe
   l_xlarge: &linux-e2e-executor-xlarge
     docker:
-      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
     working_directory: ~/repo
     resource_class: xlarge
     environment:
@@ -44,7 +44,7 @@ executors:
   # If you update this name, make sure to update it in split-e2e-tests.ts as well
   l_large: &linux-e2e-executor-large
     docker:
-      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
     working_directory: ~/repo
     resource_class: large
     environment:
@@ -53,7 +53,7 @@ executors:
   # If you update this name, make sure to update it in split-e2e-tests.ts as well
   l_medium: &linux-e2e-executor-medium
     docker:
-      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
     working_directory: ~/repo
     resource_class: medium
     environment:
@@ -135,7 +135,7 @@ jobs:
       - checkout
       - run: yarn config set registry https://registry.npmjs.org
       - run: yarn config set script-shell $(which bash)
-      - run: yarn install
+      - run: yarn install --network-concurrency 1
       - run:
           name: Build tests
           command: yarn build-tests
@@ -150,7 +150,7 @@ jobs:
           condition:
             equal: [*windows-e2e-executor-xlarge, << parameters.os >>]
           steps:
-            - install_node14_windows
+            - install_node_windows
             - checkout
             - run: yarn config set script-shell $(which bash)
             - run: yarn run production-build
@@ -177,7 +177,7 @@ jobs:
           name: Collect code coverage
           command: yarn coverage
     environment:
-      NODE_OPTIONS: --max-old-space-size=4096
+      NODE_OPTIONS: --max-old-space-size=5120
 
   validate_cdk_version:
     <<: *linux-e2e-executor-medium
@@ -201,6 +201,8 @@ jobs:
       - run: yarn lint-check
       - run: yarn lint-check-package-json
       - run: yarn prettier-check
+    environment:
+      NODE_OPTIONS: --max-old-space-size=5120
 
   verify-api-extract:
     <<: *linux-e2e-executor-xlarge
@@ -347,6 +349,8 @@ jobs:
           key: amplify-pkg-binaries-linux-{{ .Branch }}-{{ .Revision }}
           paths:
             - ~/repo/out
+      - store_artifacts:
+          path: ~/repo/out
 
   build_pkg_binaries_macos:
     <<: *linux-e2e-executor-large
@@ -370,6 +374,8 @@ jobs:
           key: amplify-pkg-binaries-macos-{{ .Branch }}-{{ .Revision }}
           paths:
             - ~/repo/out
+      - store_artifacts:
+          path: ~/repo/out
 
   build_pkg_binaries_win:
     <<: *linux-e2e-executor-large
@@ -393,6 +399,8 @@ jobs:
           key: amplify-pkg-binaries-win-{{ .Branch }}-{{ .Revision }}
           paths:
             - ~/repo/out
+      - store_artifacts:
+          path: ~/repo/out
 
   build_pkg_binaries_arm:
     <<: *linux-e2e-executor-large
@@ -416,6 +424,8 @@ jobs:
           key: amplify-pkg-binaries-arm-{{ .Branch }}-{{ .Revision }}
           paths:
             - ~/repo/out
+      - store_artifacts:
+          path: ~/repo/out
 
   verify_pkg_binaries:
     <<: *linux-e2e-executor-large
@@ -445,9 +455,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: |
@@ -459,6 +466,30 @@ jobs:
             unsetSudoNpmRegistryUrl
             amplify version
 
+  amplify_install_test:
+    <<: *defaults
+    steps:
+      - restore_cache:
+          key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-pkg-binaries-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Start verdaccio and Install Amplify CLI
+          command: |
+            source .circleci/local_publish_helpers.sh
+            startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
+            setNpmRegistryUrlToLocal
+            changeNpmGlobalPath
+            # limit memory for new processes to 1GB
+            # this is to make sure that install can work on small VMs
+            # i.e. not buffer content in memory while installing binary
+            ulimit -Sv 1000000
+            npm install -g @aws-amplify/cli
+            unsetNpmRegistryUrl
+            amplify version
+
   amplify_e2e_tests_pkg:
     parameters:
       os:
@@ -471,7 +502,7 @@ jobs:
           condition:
             equal: [*windows-e2e-executor-medium, << parameters.os >>]
           steps:
-            - install_node14_windows
+            - install_node_windows
             - attach_workspace:
                 at: ~/.
             - run:
@@ -989,7 +1020,6 @@ workflows:
                 - beta
                 - release
                 - /release_rc\/.*/
-                - /tagged-release-without-e2e-tests\/.*/
                 - /run-e2e\/.*/
       - verify-api-extract:
           requires:
@@ -1093,6 +1123,17 @@ workflows:
                 - /run-e2e-with-rc\/.*/
                 - /tagged-release\/.*/
                 - /run-e2e\/.*/
+      - amplify_install_test:
+          context: amplify-ecr-image-pull
+          requires:
+            - upload_pkg_binaries
+          filters:
+            branches:
+              only:
+                - dev
+                - /run-e2e-with-rc\/.*/
+                - /tagged-release\/.*/
+                - /run-e2e\/.*/
       - cleanup_resources:
           context:
             - cleanup-resources
@@ -1271,6 +1312,7 @@ workflows:
             - integration_test
             - amplify_e2e_tests_pkg
             - amplify_sudo_install_test
+            - amplify_install_test
             - amplify_console_integration_tests
             - amplify_migration_tests_v10
             - amplify_migration_tests_v6
@@ -1413,15 +1455,15 @@ commands:
               exit 1
             fi
           when: always
-  install_node14_windows:
-    description: Install Node 14 on Windows
+  install_node_windows:
+    description: Install Node 18 on Windows
     steps:
       - run:
-          name: Install Node 14
+          name: Install Node 18
           command: |
             nvm version
-            nvm install 14.18
-            nvm use 14.18
+            nvm install 18.15.0
+            nvm use 18.15.0
             nvm ls
       - run:
           name: Check Node, install yarn

.circleci/config.yml

@@ -27,15 +27,15 @@ parameters:
 executors:
   l_large: &linux-e2e-executor-large
     docker:
-      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
     working_directory: ~/repo
     resource_class: large
     environment:
       AMPLIFY_DIR: /home/circleci/repo/out
       AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux-x64
   l_xlarge: &linux-e2e-executor-xlarge
     docker:
-      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
     working_directory: ~/repo
     resource_class: xlarge
     environment:
@@ -82,7 +82,7 @@ jobs:
             equal:
               - docker:
                   - image: >-
-                      public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+                      public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
                 working_directory: ~/repo
                 resource_class: xlarge
                 environment:
@@ -95,7 +95,7 @@ jobs:
                 paths: .
   publish_to_local_registry:
     docker:
-      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
     working_directory: ~/repo
     resource_class: large
     environment:
@@ -186,7 +186,7 @@ jobs:
             ~/repo/packages/amplify-console-integration-tests/console-integration-reports
   cleanup_resources:
     docker:
-      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:node18
     working_directory: ~/repo
     resource_class: large
     environment:

.circleci/local_publish_helpers.sh

@@ -80,22 +80,22 @@ function generatePkgCli {
   cp package.json ../build/node_modules/package.json
 
   if [[ "$@" =~ 'arm' ]]; then
-    npx pkg --no-bytecode --public-packages "*" --public -t node14-linux-arm64 ../build/node_modules -o ../out/amplify-pkg-linux-arm64
+    npx pkg --no-bytecode --public-packages "*" --public -t node18-linux-arm64 ../build/node_modules -o ../out/amplify-pkg-linux-arm64
     tar -czvf ../out/amplify-pkg-linux-arm64.tgz ../out/amplify-pkg-linux-arm64
   fi
 
   if [[ "$@" =~ 'linux' ]]; then
-    npx pkg -t node14-linux-x64 ../build/node_modules -o ../out/amplify-pkg-linux-x64
+    npx pkg -t node18-linux-x64 ../build/node_modules -o ../out/amplify-pkg-linux-x64
     tar -czvf ../out/amplify-pkg-linux-x64.tgz ../out/amplify-pkg-linux-x64
   fi
 
   if [[ "$@" =~ 'macos' ]]; then
-    npx pkg -t node14-macos-x64 ../build/node_modules -o ../out/amplify-pkg-macos-x64
+    npx pkg -t node18-macos-x64 ../build/node_modules -o ../out/amplify-pkg-macos-x64
     tar -czvf ../out/amplify-pkg-macos-x64.tgz ../out/amplify-pkg-macos-x64
   fi
 
   if [[ "$@" =~ 'win' ]]; then
-    npx pkg -t node14-win-x64 ../build/node_modules -o ../out/amplify-pkg-win-x64.exe
+    npx pkg -t node18-win-x64 ../build/node_modules -o ../out/amplify-pkg-win-x64.exe
     tar -czvf ../out/amplify-pkg-win-x64.tgz ../out/amplify-pkg-win-x64.exe
   fi
 

.eslint-dictionary.json

@@ -124,8 +124,6 @@
   "doctype",
   "dotenv",
   "dotnet",
-  "dotnetcore3",
-  "dotnetcore31",
   "durations",
   "dynamodb",
   "ecluster",

.eslintrc.js

@@ -38,6 +38,7 @@ module.exports = {
     },
   },
   rules: {
+    '@typescript-eslint/switch-exhaustiveness-check': 'error',
     '@typescript-eslint/no-var-requires': 'off',
     '@typescript-eslint/no-floating-promises': 'error',
     '@typescript-eslint/no-misused-promises': 'error',

.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"
 }