Skip to content

Commit

Permalink
Merge branch 'feature/custom-runtimes-to-defineFunction' into merge-main
Browse files Browse the repository at this point in the history
  • Loading branch information
MarlonJD authored Nov 25, 2024
2 parents 0e1d438 + a23f656 commit 6c625a1
Show file tree
Hide file tree
Showing 368 changed files with 23,071 additions and 5,048 deletions.
21 changes: 0 additions & 21 deletions .changeset/forty-buckets-visit.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/fresh-dancers-peel.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/great-otters-study.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-deployer': patch
---

add more forms of transform errors to cdk error mapping
5 changes: 5 additions & 0 deletions .changeset/orange-garlics-reflect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/platform-core': patch
---

Handle insufficient disk space errors
5 changes: 5 additions & 0 deletions .changeset/rude-wasps-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-deployer': patch
---

truncate large error messages before printing to customer
5 changes: 5 additions & 0 deletions .changeset/slimy-sheep-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-deployer': patch
---

handle not authorized to perform on resource error
2 changes: 0 additions & 2 deletions .changeset/stale-worms-pretend.md

This file was deleted.

14 changes: 0 additions & 14 deletions .changeset/strange-jobs-refuse.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/warm-garlics-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-deployer': patch
---

Handle invalid package.json error
12 changes: 0 additions & 12 deletions .changeset/yellow-jokes-kick.md

This file was deleted.

10 changes: 10 additions & 0 deletions .eslint_dictionary.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
"argv",
"arn",
"arns",
"aws",
"backends",
"birthdate",
"bundler",
"callee",
"cartesian",
"cdk",
"changelog",
"changeset",
Expand All @@ -38,6 +40,7 @@
"datasync",
"debounce",
"declarator",
"decrypt",
"deployer",
"deprecations",
"deprecator",
Expand Down Expand Up @@ -78,6 +81,7 @@
"idps",
"implementors",
"inheritdoc",
"instanceof",
"interop",
"invokable",
"invoker",
Expand All @@ -102,6 +106,7 @@
"mysql",
"namespace",
"namespaces",
"netstat",
"nodejs",
"nodenext",
"nodir",
Expand Down Expand Up @@ -131,6 +136,7 @@
"renderer",
"repo",
"resolvers",
"retryable",
"saml",
"scala",
"schema",
Expand All @@ -143,6 +149,7 @@
"sigint",
"signout",
"signup",
"SKey",
"sms",
"stderr",
"stdin",
Expand All @@ -156,6 +163,7 @@
"synthing",
"testname",
"testnamebucket",
"testuser",
"timestamps",
"tmpdir",
"todos",
Expand All @@ -168,6 +176,7 @@
"tslint",
"typename",
"typeof",
"ubuntu",
"unauth",
"unix",
"unlink",
Expand All @@ -186,6 +195,7 @@
"wildcards",
"workspace",
"writev",
"xlarge",
"yaml",
"yargs",
"zoneinfo"
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ module.exports = {
},
],
'jsdoc/require-param': 'off',
'jsdoc/require-yields': 'off',
'jsdoc/require-returns': 'off',
'spellcheck/spell-checker': [
'warn',
Expand Down
52 changes: 52 additions & 0 deletions .github/actions/setup_baseline_version/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: setup_baseline_version
description: Set up a baseline or "previous" version of the library for testing. Mostly useful for backwards compatibility
outputs:
baseline_dir:
description: 'Path where baseline project directory is setup'
value: ${{ steps.move_baseline_version.outputs.baseline_dir }}
runs:
using: composite
steps:
- name: Get baseline commit sha
id: get_baseline_commit_sha
shell: bash
env:
GH_TOKEN: ${{ github.token }}
run: |
if [[ ${{ github.event_name }} == 'push' ]]; then
# The SHA of the most recent commit on ref before the push.
baseline_commit_sha="${{ github.event.before }}"
elif [[ ${{ github.event_name }} == 'pull_request' ]]; then
# The SHA of the HEAD commit on base branch.
baseline_commit_sha="${{ github.event.pull_request.base.sha }}"
elif [[ ${{ github.event_name }} == 'schedule' ]] || [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then
# The SHA of the parent of HEAD commit on main branch.
# This assumes linear history of main branch, i.e. one parent.
# These events have only information about HEAD commit, hence the need for lookup.
baseline_commit_sha=$(gh api /repos/${{ github.repository }}/commits/${{ github.sha }} | jq -r '.parents[0].sha')
else
echo Unable to determine baseline commit sha;
exit 1;
fi
echo baseline commit sha is $baseline_commit_sha;
echo "baseline_commit_sha=$baseline_commit_sha" >> "$GITHUB_OUTPUT";
- name: Checkout baseline version
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # version 4.1.4
with:
ref: ${{ steps.get_baseline_commit_sha.outputs.baseline_commit_sha }}
- uses: ./.github/actions/setup_node
- name: Install and build baseline version
shell: bash
run: |
npm ci
npm run build
- name: Move baseline version
id: move_baseline_version
shell: bash
run: |
BASELINE_DIR=$(mktemp -d)
# Command below makes shell include .hidden files in file system commands (i.e. mv).
# This is to make sure that .git directory is moved with the repo content.
shopt -s dotglob
mv ./* $BASELINE_DIR
echo "baseline_dir=$BASELINE_DIR" >> "$GITHUB_OUTPUT";
7 changes: 7 additions & 0 deletions .github/actions/setup_node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 9 additions & 2 deletions .github/actions/setup_profile/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,15 @@ runs:
with:
role-to-assume: ${{ inputs.role-to-assume }}
aws-region: ${{ inputs.aws-region }}
output-credentials: true # places the credentials in the GH context object rather than setting env vars
# the AWS credentials action does not have an option to configure a profile, so this manually configures one
# Credentials with special characters are not handled correctly on Windows
# when put into profile files. This forces action to retry until credentials without special characters
# are retrieved
# See: https://github.com/aws-actions/configure-aws-credentials/issues/599
# and https://github.com/aws-actions/configure-aws-credentials/issues/528
special-characters-workaround: ${{ contains(runner.os, 'Windows') }}
# places the credentials in the GH context object rather than setting env vars
# the AWS credentials action does not have an option to configure a profile, so this manually configures one
output-credentials: true
- shell: bash
run: |
aws configure set aws_access_key_id ${{ steps.credentials.outputs.aws-access-key-id }} --profile ${{ inputs.profile-name }}
Expand Down
Loading

0 comments on commit 6c625a1

Please sign in to comment.