Merge branch 'main' into feature/add-stack-mapping

aws-amplify · Jan 14, 2025 · 496d37d · 496d37d
2 parents fd678af + 2dab201
commit 496d37d
Show file tree

Hide file tree

Showing 492 changed files with 33,884 additions and 5,990 deletions.
diff --git a/.changeset/forty-buckets-visit.md b/.changeset/forty-buckets-visit.md
diff --git a/.changeset/fresh-dancers-peel.md b/.changeset/fresh-dancers-peel.md
diff --git a/.changeset/silver-tables-do.md b/.changeset/silver-tables-do.md
@@ -0,0 +1,10 @@
+---
+'@aws-amplify/backend-deployer': patch
+'create-amplify': patch
+'@aws-amplify/backend-cli': patch
+'@aws-amplify/cli-core': patch
+'@aws-amplify/platform-core': minor
+'@aws-amplify/plugin-types': minor
+---
+
+Report cdk versions
diff --git a/.changeset/stale-worms-pretend.md b/.changeset/stale-worms-pretend.md
diff --git a/.changeset/strange-jobs-refuse.md b/.changeset/strange-jobs-refuse.md
diff --git a/.changeset/yellow-jokes-kick.md b/.changeset/yellow-jokes-kick.md
diff --git a/.eslint_dictionary.json b/.eslint_dictionary.json
@@ -14,14 +14,17 @@
   "argv",
   "arn",
   "arns",
+  "aws",
   "backends",
   "birthdate",
   "bundler",
   "callee",
+  "cartesian",
   "cdk",
   "changelog",
   "changeset",
   "changesets",
+  "checksum",
   "chown",
   "claude",
   "cloudformation",
@@ -38,6 +41,8 @@
   "datasync",
   "debounce",
   "declarator",
+  "decrypt",
+  "dependabot",
   "deployer",
   "deprecations",
   "deprecator",
@@ -59,6 +64,7 @@
   "formatter",
   "frontend",
   "frontends",
+  "frontmatter",
   "fullname",
   "func",
   "geofence",
@@ -72,12 +78,16 @@
   "homedir",
   "hotfix",
   "hotswap",
+  "hotswappable",
   "hotswapped",
+  "hotswapping",
+  "href",
   "iamv2",
   "identitypool",
   "idps",
   "implementors",
   "inheritdoc",
+  "instanceof",
   "interop",
   "invokable",
   "invoker",
@@ -90,10 +100,12 @@
   "lang",
   "linux",
   "localhost",
+  "lockfile",
   "lsof",
   "lstat",
   "macos",
   "matchers",
+  "mebibytes",
   "mfas",
   "minify",
   "mkdtemp",
@@ -102,6 +114,7 @@
   "mysql",
   "namespace",
   "namespaces",
+  "netstat",
   "nodejs",
   "nodenext",
   "nodir",
@@ -131,6 +144,7 @@
   "renderer",
   "repo",
   "resolvers",
+  "retryable",
   "saml",
   "scala",
   "schema",
@@ -143,6 +157,7 @@
   "sigint",
   "signout",
   "signup",
+  "SKey",
   "sms",
   "stderr",
   "stdin",
@@ -154,8 +169,10 @@
   "subpath",
   "syncable",
   "synthing",
+  "testapp",
   "testname",
   "testnamebucket",
+  "testuser",
   "timestamps",
   "tmpdir",
   "todos",
@@ -168,6 +185,7 @@
   "tslint",
   "typename",
   "typeof",
+  "ubuntu",
   "unauth",
   "unix",
   "unlink",
@@ -186,6 +204,7 @@
   "wildcards",
   "workspace",
   "writev",
+  "xlarge",
   "yaml",
   "yargs",
   "zoneinfo"

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

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -8,3 +8,15 @@
 
 # GitHub actions/checks approval
 /.github/ @aws-amplify/amplify-backend-admins
+
+# Packages used by console team.
+/packages/backend-secret @aws-amplify/amplify-backend @aws-amplify/amplify-studio-uibuilder
+# API.md change always has related code change. Both teams are notified, but API approval by backend team is mandatory this way.
+/packages/backend-secret/API.md @aws-amplify/amplify-backend-api-approvers
+/packages/backend-secret/package.json @aws-amplify/amplify-backend-api-approvers @aws-amplify/amplify-studio-uibuilder
+/packages/client-config @aws-amplify/amplify-backend @aws-amplify/amplify-studio-uibuilder
+/packages/client-config/API.md @aws-amplify/amplify-backend-api-approvers
+/packages/client-config/package.json @aws-amplify/amplify-backend-api-approvers @aws-amplify/amplify-studio-uibuilder
+/packages/deployed-backend-client @aws-amplify/amplify-backend @aws-amplify/amplify-studio-uibuilder
+/packages/deployed-backend-client/API.md @aws-amplify/amplify-backend-api-approvers
+/packages/deployed-backend-client/package.json @aws-amplify/amplify-backend-api-approvers @aws-amplify/amplify-studio-uibuilder
diff --git a/.github/actions/build_with_cache/action.yml b/.github/actions/build_with_cache/action.yml
@@ -2,17 +2,36 @@ name: build_with_cache
 description: builds the source code if cache miss and caches the result
 inputs:
   node-version:
-    default: 18
+    required: true
+  cdk-version:
+    required: true
 runs:
   using: composite
   steps:
+    # Validate that non-blank inputs are provided.
+    # This is to ensure that inputs are plumbed and not defaulted accidentally in action call chains.
+    # The 'required' input property does not assert this if value is provided at runtime.
+    - name: Validate input
+      shell: bash
+      run: |
+        if [ -z "${{ inputs.cdk-version }}" ]; then
+          echo "CDK version must be provided"
+          exit 1;
+        fi
+        if [ -z "${{ inputs.node-version }}" ]; then
+          echo "Node version must be provided"
+          exit 1;
+        fi
     - uses: ./.github/actions/install_with_cache
+      with:
+        node-version: ${{ inputs.node-version }}
+        cdk-version: ${{ inputs.cdk-version }}
     # cache build output based on commit sha
     - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # version 4.0.2
       id: build-cache
       with:
         path: '**/lib'
-        key: ${{ github.sha }}-node${{ inputs.node-version }}
+        key: ${{ github.sha }}-node${{ inputs.node-version }}-cdk${{ inputs.cdk-version }}
         enableCrossOsArchive: true
     # only build if cache miss
     - if: steps.build-cache.outputs.cache-hit != 'true'

diff --git a/.github/actions/install_with_cache/action.yml b/.github/actions/install_with_cache/action.yml
@@ -2,19 +2,41 @@ name: install_with_cache
 description: installs node_modules if cache miss and stores in the cache
 inputs:
   node-version:
-    default: 18
+    required: true
+  cdk-version:
+    required: true
 runs:
   using: composite
   steps:
+    # Validate that non-blank inputs are provided.
+    # This is to ensure that inputs are plumbed and not defaulted accidentally in action call chains.
+    # The 'required' input property does not assert this if value is provided at runtime.
+    - name: Validate input
+      shell: bash
+      run: |
+        if [ -z "${{ inputs.cdk-version }}" ]; then
+          echo "CDK version must be provided"
+          exit 1;
+        fi
+        if [ -z "${{ inputs.node-version }}" ]; then
+          echo "Node version must be provided"
+          exit 1;
+        fi
     # cache node_modules based on package-lock.json hash
     - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # version 4.0.2
       id: npm-cache
       with:
         path: |
           node_modules
           packages/**/node_modules
-        key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}-node${{ inputs.node-version }}
+        key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}-node${{ inputs.node-version }}-cdk${{ inputs.cdk-version }}
     # only install if cache miss
     - if: steps.npm-cache.outputs.cache-hit != 'true'
       shell: bash
-      run: npm ci
+      run: |
+        npm ci
+        if [[ ${{ inputs.cdk-version }} != 'FROM_PACKAGE_LOCK' ]]; then
+          echo "Installing CDK version ${{ inputs.cdk-version }}"
+          npm install --no-save aws-cdk@${{ inputs.cdk-version }} aws-cdk-lib@${{ inputs.cdk-version }}
+          npx cdk --version
+        fi
diff --git a/.github/actions/restore_build_cache/action.yml b/.github/actions/restore_build_cache/action.yml
@@ -3,16 +3,35 @@ description: composes restoring node_modules and restoring build artifacts
 inputs:
   node-version:
     description: node version used to configure environment with
-    default: 18
+    required: true
+  cdk-version:
+    required: true
 runs:
   using: composite
   steps:
+    # Validate that non-blank inputs are provided.
+    # This is to ensure that inputs are plumbed and not defaulted accidentally in action call chains.
+    # The 'required' input property does not assert this if value is provided at runtime.
+    - name: Validate input
+      shell: bash
+      run: |
+        if [ -z "${{ inputs.cdk-version }}" ]; then
+          echo "CDK version must be provided"
+          exit 1;
+        fi
+        if [ -z "${{ inputs.node-version }}" ]; then
+          echo "Node version must be provided"
+          exit 1;
+        fi
     - uses: ./.github/actions/restore_install_cache
+      with:
+        node-version: ${{ inputs.node-version }}
+        cdk-version: ${{ inputs.cdk-version }}
     # restore build output from cache
     - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # version 4.0.2
       id: build-cache
       with:
         path: '**/lib'
-        key: ${{ github.sha }}-node${{ inputs.node-version }}
+        key: ${{ github.sha }}-node${{ inputs.node-version }}-cdk${{ inputs.cdk-version }}
         fail-on-cache-miss: true
         enableCrossOsArchive: true
diff --git a/.github/actions/restore_install_cache/action.yml b/.github/actions/restore_install_cache/action.yml
@@ -3,16 +3,32 @@ description: restores node_modules from the cache and fails if no cache entry fo
 inputs:
   node-version:
     description: node version used to configure environment with
-    default: 18
+    required: true
+  cdk-version:
+    required: true
 runs:
   using: composite
   steps:
+    # Validate that non-blank inputs are provided.
+    # This is to ensure that inputs are plumbed and not defaulted accidentally in action call chains.
+    # The 'required' input property does not assert this if value is provided at runtime.
+    - name: Validate input
+      shell: bash
+      run: |
+        if [ -z "${{ inputs.cdk-version }}" ]; then
+          echo "CDK version must be provided"
+          exit 1;
+        fi
+        if [ -z "${{ inputs.node-version }}" ]; then
+          echo "Node version must be provided"
+          exit 1;
+        fi
     # restore node_modules from cache
     - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # version 4.0.2
       id: npm-cache
       with:
         path: |
           node_modules
           packages/**/node_modules
-        key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}-node${{ inputs.node-version }}
+        key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}-node${{ inputs.node-version }}-cdk${{ inputs.cdk-version }}
         fail-on-cache-miss: true