Merge branch 'main' into apiid-resolver

Author: Dane Pilcher

.changeset/few-candles-wink.md

@@ -0,0 +1,6 @@
+---
+'@aws-amplify/backend-data': patch
+'@aws-amplify/backend': patch
+---
+
+Allow apiKeyAuthorizationMode to be undefined if defaultAuthorizationMode is apiKey

.changeset/great-mugs-warn.md

@@ -101,6 +101,7 @@
   "lstat",
   "macos",
   "matchers",
+  "mebibytes",
   "mfas",
   "minify",
   "mkdtemp",

.changeset/itchy-flowers-reply.md

@@ -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'

.changeset/loud-dots-bathe.md renamed to .changeset/plenty-mugs-learn.md

@@ -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

.changeset/silent-files-appear.md

@@ -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

.eslint_dictionary.json

@@ -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