Merge branch 'main' into e2e/vigy/clear-env-issue

Author: vigy02

.changeset/early-starfishes-impress.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-deployer': patch
+---
+
+Handle errors when checking CDK bootstrap.

.changeset/eleven-numbers-hide.md

@@ -19,6 +19,7 @@
   "birthdate",
   "bundler",
   "callee",
+  "cartesian",
   "cdk",
   "changelog",
   "changeset",
@@ -39,6 +40,7 @@
   "datasync",
   "debounce",
   "declarator",
+  "decrypt",
   "deployer",
   "deprecations",
   "deprecator",
@@ -79,6 +81,7 @@
   "idps",
   "implementors",
   "inheritdoc",
+  "instanceof",
   "interop",
   "invokable",
   "invoker",
@@ -145,6 +148,7 @@
   "sigint",
   "signout",
   "signup",
+  "SKey",
   "sms",
   "stderr",
   "stdin",
@@ -158,6 +162,7 @@
   "synthing",
   "testname",
   "testnamebucket",
+  "testuser",
   "timestamps",
   "tmpdir",
   "todos",
@@ -170,6 +175,7 @@
   "tslint",
   "typename",
   "typeof",
+  "ubuntu",
   "unauth",
   "unix",
   "unlink",
@@ -188,6 +194,7 @@
   "wildcards",
   "workspace",
   "writev",
+  "xlarge",
   "yaml",
   "yargs",
   "zoneinfo"

.changeset/modern-toys-jump.md

@@ -160,6 +160,7 @@ module.exports = {
       },
     ],
     'jsdoc/require-param': 'off',
+    'jsdoc/require-yields': 'off',
     'jsdoc/require-returns': 'off',
     'spellcheck/spell-checker': [
       'warn',

.eslint_dictionary.json

@@ -12,3 +12,10 @@ runs:
       with:
         node-version: ${{ inputs.node-version }}
         cache: 'npm'
+    - name: Hydrate npx cache
+      # This step hydrates npx cache with packages that we use in builds and tests upfront.
+      # Otherwise, concurrent attempt to use these tools with cache miss results in race conditions between
+      # two installations. That may result in corrupted npx cache.
+      shell: bash
+      run: |
+        npx which npx

.eslintrc.cjs

@@ -206,25 +206,34 @@ jobs:
           run: npm run test:dir packages/integration-tests/lib/test-e2e/amplify_outputs_backwards_compatibility.test.js
         env:
           BASELINE_DIR: ${{ steps.setup_baseline_version.outputs.baseline_dir }}
+  e2e_generate_deployment_tests_matrix:
+    if: needs.do_include_e2e.outputs.run_e2e == 'true'
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.generateMatrix.outputs.matrix }}
+    timeout-minutes: 5
+    needs:
+      - do_include_e2e
+      - build
+    steps:
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # version 4.1.4
+      - uses: ./.github/actions/restore_build_cache
+      - run: echo "$(npx tsx scripts/generate_sparse_test_matrix.ts 'packages/integration-tests/lib/test-e2e/deployment/*.deployment.test.js')"
+      - id: generateMatrix
+        run: echo "matrix=$(npx tsx scripts/generate_sparse_test_matrix.ts 'packages/integration-tests/lib/test-e2e/deployment/*.deployment.test.js')" >> "$GITHUB_OUTPUT"
   e2e_deployment:
     if: needs.do_include_e2e.outputs.run_e2e == 'true'
     strategy:
       # will finish running other test matrices even if one fails
       fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-14-xlarge, windows-latest]
-        node-version: [18, 20]
-        # skip multiple node version test on other os
-        exclude:
-          - os: macos-14-xlarge
-            node-version: 20
-          - os: windows-latest
-            node-version: 20
+      matrix: ${{ fromJson(needs.e2e_generate_deployment_tests_matrix.outputs.matrix) }}
     runs-on: ${{ matrix.os }}
+    name: e2e_deployment ${{ matrix.displayNames }} ${{ matrix.node-version }} ${{ matrix.os }}
     timeout-minutes: ${{ matrix.os == 'windows-latest' && 35 || 25 }}
     needs:
       - do_include_e2e
       - build
+      - e2e_generate_deployment_tests_matrix
     permissions:
       # these permissions are required for the configure-aws-credentials action to get a JWT from GitHub
       id-token: write
@@ -238,26 +247,35 @@ jobs:
           node_version: ${{ matrix.node-version }}
           link_cli: true
           run: |
-            npm run test:dir packages/integration-tests/lib/test-e2e/deployment.test.js
+            npm run test:dir ${{ matrix.testPaths }}
+  e2e_generate_sandbox_tests_matrix:
+    if: needs.do_include_e2e.outputs.run_e2e == 'true'
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.generateMatrix.outputs.matrix }}
+    timeout-minutes: 5
+    needs:
+      - do_include_e2e
+      - build
+    steps:
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # version 4.1.4
+      - uses: ./.github/actions/restore_build_cache
+      - run: echo "$(npx tsx scripts/generate_sparse_test_matrix.ts 'packages/integration-tests/lib/test-e2e/sandbox/*.sandbox.test.js')"
+      - id: generateMatrix
+        run: echo "matrix=$(npx tsx scripts/generate_sparse_test_matrix.ts 'packages/integration-tests/lib/test-e2e/sandbox/*.sandbox.test.js')" >> "$GITHUB_OUTPUT"
   e2e_sandbox:
     if: needs.do_include_e2e.outputs.run_e2e == 'true'
     strategy:
       # will finish running other test matrices even if one fails
       fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-14-xlarge, windows-latest]
-        node-version: [18, 20]
-        # skip multiple node version test on other os
-        exclude:
-          - os: macos-14-xlarge
-            node-version: 20
-          - os: windows-latest
-            node-version: 20
+      matrix: ${{ fromJson(needs.e2e_generate_sandbox_tests_matrix.outputs.matrix) }}
     runs-on: ${{ matrix.os }}
+    name: e2e_sandbox ${{ matrix.displayNames }} ${{ matrix.node-version }} ${{ matrix.os }}
     timeout-minutes: ${{ matrix.os == 'windows-latest' && 35 || 25 }}
     needs:
       - do_include_e2e
       - build
+      - e2e_generate_sandbox_tests_matrix
     permissions:
       # these permissions are required for the configure-aws-credentials action to get a JWT from GitHub
       id-token: write
@@ -270,7 +288,7 @@ jobs:
           e2e_test_accounts: ${{ vars.E2E_TEST_ACCOUNTS }}
           node_version: ${{ matrix.node-version }}
           link_cli: true
-          run: npm run test:dir packages/integration-tests/lib/test-e2e/sandbox.test.js
+          run: npm run test:dir ${{ matrix.testPaths }}
   e2e_backend_output:
     if: needs.do_include_e2e.outputs.run_e2e == 'true'
     runs-on: ubuntu-latest
@@ -411,7 +429,9 @@ jobs:
       - uses: ./.github/actions/setup_node
       - uses: ./.github/actions/restore_install_cache
       - run: git fetch origin
-      - run: npm run diff:check ${{ github.event.pull_request.base.sha }}
+      - run: npm run diff:check "$BASE_SHA"
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
   check_pr_changesets:
     if: github.event_name == 'pull_request' && github.event.pull_request.user.login != 'github-actions[bot]'
     runs-on: ubuntu-latest
@@ -425,9 +445,13 @@ jobs:
       - uses: ./.github/actions/setup_node
       - uses: ./.github/actions/restore_install_cache
       - name: Validate that PR has changeset
-        run: npx changeset status --since origin/${{ github.event.pull_request.base.ref }}
+        run: npx changeset status --since origin/"$BASE_REF"
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
       - name: Validate changeset is not missing packages
-        run: npx tsx scripts/check_changeset_completeness.ts ${{ github.event.pull_request.base.sha }}
+        run: npx tsx scripts/check_changeset_completeness.ts "$BASE_SHA"
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
       - name: Validate that changeset has necessary dependency updates
         run: |
           npx changeset version