Merge remote-tracking branch 'origin/dev' into fix_override_tsc_script

aws-amplify · Jan 30, 2025 · 73715e3 · 73715e3
2 parents 3a645fe + a274b64
commit 73715e3
Show file tree

Hide file tree

Showing 112 changed files with 2,715 additions and 7,029 deletions.
diff --git a/.circleci/local_publish_helpers_codebuild.sh b/.circleci/local_publish_helpers_codebuild.sh
@@ -139,10 +139,10 @@ function verifyPkgCli {
       fi
     }
 
-    verifySinglePkg "amplify-pkg-linux-x64" "amplify-pkg-linux-x64.tgz" $((830 * 1024 * 1024))
-    verifySinglePkg "amplify-pkg-macos-x64" "amplify-pkg-macos-x64.tgz" $((835 * 1024 * 1024))
-    verifySinglePkg "amplify-pkg-win-x64.exe" "amplify-pkg-win-x64.tgz" $((820 * 1024 * 1024))
-    verifySinglePkg "amplify-pkg-linux-arm64" "amplify-pkg-linux-arm64.tgz" $((670 * 1024 * 1024))
+    verifySinglePkg "amplify-pkg-linux-x64" "amplify-pkg-linux-x64.tgz" $((870 * 1024 * 1024))
+    verifySinglePkg "amplify-pkg-macos-x64" "amplify-pkg-macos-x64.tgz" $((875 * 1024 * 1024))
+    verifySinglePkg "amplify-pkg-win-x64.exe" "amplify-pkg-win-x64.tgz" $((860 * 1024 * 1024))
+    verifySinglePkg "amplify-pkg-linux-arm64" "amplify-pkg-linux-arm64.tgz" $((710 * 1024 * 1024))
 }
 
 function unsetNpmRegistryUrl {

diff --git a/.github/actions/run-smoke-tests/action.yml b/.github/actions/run-smoke-tests/action.yml
@@ -4,6 +4,9 @@ inputs:
   role-to-assume:
     description: an IAM role to use in tests
     required: true
+  cli-version:
+    description: version of Amplify CLI
+    required: true
   region:
     description: an AWS region to run in
     required: false
@@ -66,8 +69,8 @@ runs:
         CIRCLECI: true
 
     - name: Upload Report
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
+      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 #v4.6.0
       if: always()
       with:
-        name: test report ${{ runner.os }}
+        name: test report ${{ runner.os }} ${{ inputs.cli-version }}
         path: packages/amplify-e2e-tests/amplify-e2e-reports
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -41,6 +41,13 @@ jobs:
         with:
           python-version: '3.11'
 
+      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # version 4.0.2
+        if: runner.os == 'Windows'
+        with:
+          # Pin node to version before 18.20.2 due to https://github.com/nodejs/node/issues/52554
+          # Amplify App tries to spawn npm.cmd here https://github.com/aws-amplify/amplify-cli/blob/9571383521e6536ecf6568876609654393b27abb/packages/amplify-app/src/index.js#L88-L93
+          node-version: 18.20.0
+
       - name: Install Amplify CLI
         uses: ./.github/actions/install-cli
         with:
@@ -50,3 +57,4 @@ jobs:
         uses: ./.github/actions/run-smoke-tests
         with:
           role-to-assume: ${{ secrets.SMOKE_TESTS_ROLE_ARN }}
+          cli-version: ${{ matrix.cli-version }}
diff --git a/codebuild_specs/amplify_migration_tests_multi_env_layers.yml b/codebuild_specs/amplify_migration_tests_multi_env_layers.yml
diff --git a/codebuild_specs/amplify_migration_tests_non_multi_env_layers.yml b/codebuild_specs/amplify_migration_tests_non_multi_env_layers.yml
diff --git a/codebuild_specs/e2e_workflow.yml b/codebuild_specs/e2e_workflow.yml
@@ -172,18 +172,6 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
       depend-on:
         - upb
-    - identifier: amplify_migration_tests_non_multi_env_layers
-      buildspec: codebuild_specs/amplify_migration_tests_non_multi_env_layers.yml
-      env:
-        compute-type: BUILD_GENERAL1_MEDIUM
-      depend-on:
-        - upb
-    - identifier: amplify_migration_tests_multi_env_layers
-      buildspec: codebuild_specs/amplify_migration_tests_multi_env_layers.yml
-      env:
-        compute-type: BUILD_GENERAL1_MEDIUM
-      depend-on:
-        - upb
     - identifier: aggregate_e2e_reports
       buildspec: codebuild_specs/aggregate_e2e_reports.yml
       env:

diff --git a/codebuild_specs/e2e_workflow_base.yml b/codebuild_specs/e2e_workflow_base.yml
@@ -130,14 +130,6 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
       depend-on:
         - upb
-    - identifier: amplify_migration_tests_non_multi_env_layers
-      buildspec: codebuild_specs/amplify_migration_tests_non_multi_env_layers.yml
-      depend-on:
-        - upb
-    - identifier: amplify_migration_tests_multi_env_layers
-      buildspec: codebuild_specs/amplify_migration_tests_multi_env_layers.yml
-      depend-on:
-        - upb
     - identifier: amplify_general_config_tests
       buildspec: codebuild_specs/amplify_general_config_tests.yml
       env:

diff --git a/codebuild_specs/e2e_workflow_generated.yml b/codebuild_specs/e2e_workflow_generated.yml
@@ -130,14 +130,6 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
       depend-on:
         - upb
-    - identifier: amplify_migration_tests_non_multi_env_layers
-      buildspec: codebuild_specs/amplify_migration_tests_non_multi_env_layers.yml
-      depend-on:
-        - upb
-    - identifier: amplify_migration_tests_multi_env_layers
-      buildspec: codebuild_specs/amplify_migration_tests_multi_env_layers.yml
-      depend-on:
-        - upb
     - identifier: amplify_general_config_tests
       buildspec: codebuild_specs/amplify_general_config_tests.yml
       env:
@@ -2320,78 +2312,6 @@ batch:
       depend-on:
         - build_windows
         - upb
-    - identifier: l_api_key_migration_v8
-      buildspec: codebuild_specs/migration_tests_v8.yml
-      env:
-        variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/migration_tests/transformer_migration/api.key.migration.test.ts
-      depend-on:
-        - upb
-    - identifier: l_api_key_migration_2_v8
-      buildspec: codebuild_specs/migration_tests_v8.yml
-      env:
-        variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/migration_tests/transformer_migration/api.key.migration-2.test.ts
-      depend-on:
-        - upb
-    - identifier: l_auth_app_client_secret_migration_v12
-      buildspec: codebuild_specs/migration_tests_v12.yml
-      env:
-        variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/migration_tests_v12/auth-app-client-secret-migration.test.ts
-      depend-on:
-        - upb
-    - identifier: l_auth_hosted_ui_lambda_migration_1_v12
-      buildspec: codebuild_specs/migration_tests_v12.yml
-      env:
-        variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/migration_tests_v12/auth-hosted-ui-lambda-migration-1.test.ts
-      depend-on:
-        - upb
-    - identifier: l_auth_hosted_ui_lambda_migration_2_v12
-      buildspec: codebuild_specs/migration_tests_v12.yml
-      env:
-        variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/migration_tests_v12/auth-hosted-ui-lambda-migration-2.test.ts
-      depend-on:
-        - upb
-    - identifier: l_auth_lambda_callout_migration_rollback_v12
-      buildspec: codebuild_specs/migration_tests_v12.yml
-      env:
-        variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/migration_tests_v12/auth-lambda-callout-migration-rollback.test.ts
-      depend-on:
-        - upb
-    - identifier: l_auth_lambda_callout_migration_v12
-      buildspec: codebuild_specs/migration_tests_v12.yml
-      env:
-        variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/migration_tests_v12/auth-lambda-callout-migration.test.ts
-      depend-on:
-        - upb
-    - identifier: l_auth_oauth_lambda_migration_v12
-      buildspec: codebuild_specs/migration_tests_v12.yml
-      env:
-        variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/migration_tests_v12/auth-oauth-lambda-migration.test.ts
-      depend-on:
-        - upb
-    - identifier: l_auth_migration_v12
-      buildspec: codebuild_specs/migration_tests_v12.yml
-      env:
-        variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/migration_tests_v12/auth.migration.test.ts
-      depend-on:
-        - upb
     - identifier: aggregate_e2e_reports
       env:
         compute-type: BUILD_GENERAL1_MEDIUM

diff --git a/codebuild_specs/migration_tests_v12.yml b/codebuild_specs/migration_tests_v12.yml
diff --git a/codebuild_specs/migration_tests_v8.yml b/codebuild_specs/migration_tests_v8.yml
diff --git a/codebuild_specs/run_e2e_tests_windows.yml b/codebuild_specs/run_e2e_tests_windows.yml
@@ -25,7 +25,6 @@ env:
 phases:
   build:
     commands:
-      - choco install -fy jq
       - git config --global core.longpaths true
       - bash ./codebuild_specs/scripts-windows/load-e2e-cache.sh
       - bash ./codebuild_specs/scripts-windows/rename-packaged-cli.sh