Skip to content

Commit a9f5d79

Browse files
am29dam29d
committed
Merge branch 'main' into feat/parser
2 parents d81445d + d18ffde commit a9f5d79

File tree

230 files changed

+8973
-7050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+8973
-7050
lines changed

‎.devcontainer/Dockerfile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.212.0/containers/javascript-node/.devcontainer/base.Dockerfile
2-
# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
3-
ARG VARIANT="18-bullseye"
4-
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
2+
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node@sha256:4dbf8b626669df834ca18dbe4b0dc49fcd521b1e0c59b1e56ba47abb39364e2c
53

6-
# This section to install additional OS packages.
7-
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
8-
&& apt-get -y install --no-install-recommends bash-completion
4+
# Install fnm to manage Node.js versions
5+
RUN curl -fsSL https://fnm.vercel.app/install -o /tmp/install \
6+
&& chmod a+x /tmp/install \
7+
&& /tmp/install \
8+
&& rm /tmp/install
99

10-
RUN wget https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
11-
&& unzip aws-sam-cli-linux-x86_64.zip -d sam-installation \
12-
&& sudo ./sam-installation/install \
13-
&& rm -rf sam-installation aws-sam-cli-linux-*
10+
# Install AWS SAM CLI
11+
RUN curl -LO https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
12+
&& unzip -q aws-sam-cli-linux-x86_64.zip -d sam-installation \
13+
&& sudo ./sam-installation/install \
14+
&& rm -rf sam-installation aws-sam-cli-linux-*

‎.devcontainer/devcontainer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88
// Append -bullseye or -buster to pin to an OS version.
99
// Use -bullseye variants on local arm64/Apple Silicon.
1010
"args": {
11-
"VARIANT": "18-bullseye"
11+
"VARIANT": "20-bullseye"
1212
}
1313
},
1414
"customizations": {
1515
// Add the ids of extensions you want installed when the container is created.
1616
"extensions": [
1717
"dbaeumer.vscode-eslint",
1818
"esbenp.prettier-vscode",
19-
"firsttris.vscode-jest-runner",
20-
"amazonwebservices.aws-toolkit-vscode"
19+
"firsttris.vscode-jest-runner"
2120
],
2221
"vscode": {
2322
"git.enableCommitSigning": true

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
22

3-
* @aws-powertools/lambda-typescript-core
3+
* @aws-powertools/lambda-typescript-core @aws-powertools/core

‎.github/actions/cached-node-modules/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: 'Cached Node Modules'
22
description: 'A simple action to cache node_modules or install them if they are not cached'
33
inputs:
4-
nodeVersion: # id of input
4+
nodeVersion: # id of input
55
description: 'Node.js version to use in the cache key'
6-
default: '18'
6+
default: '20'
77
build:
88
description: 'Whether to build the packages or not'
99
default: 'true'
@@ -15,11 +15,12 @@ runs:
1515
using: "composite"
1616
steps:
1717
- name: Install npm
18+
# We need to keep this npm version until we drop Node.js 16 support because Node.js 16 doesn't support npm 10
1819
run: npm i -g npm@next-9
1920
shell: bash
2021
- name: Cache node modules
2122
id: cache-node-modules
22-
uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6
23+
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
2324
with:
2425
path: '**/node_modules'
2526
# Use the combo between node version, name, and SHA-256 hash of the lock file as cache key so that
@@ -44,6 +45,5 @@ runs:
4445
npm run build -w packages/parameters & \
4546
npm run build -w packages/idempotency & \
4647
npm run build -w packages/batch & \
47-
npm run build -w packages/parser & \
4848
npm run build -w packages/testing
4949
shell: bash

‎.github/actions/create-pr/action.yml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
name: "Create PR custom action"
2+
description: "Create a PR and a temporary branch, close duplicates"
3+
4+
# PROCESS
5+
#
6+
# 1. Setup git client using Powertools for AWS Lambda bot username
7+
# 2. Pushes staged files to a temporary branch
8+
# 3. Creates a PR from temporary branch against a target branch (typically trunk: develop, main, etc.)
9+
# 4. Searches for duplicate PRs with the same title
10+
# 5. If duplicates are found, link to the most recent one, close and delete their branches so we keep a single PR
11+
# 6. In the event of failure, we delete the now orphaned branch (if any), and propagate the failure
12+
13+
# REQUIREMENTS
14+
# You need to enable "Allow GitHub Actions to create and approve pull requests" in your repository settings
15+
# You need to have "skip-changelog" label in your repository to skip changelog generation.
16+
17+
# USAGE
18+
#
19+
# - name: Create PR
20+
# id: create-pr
21+
# uses: ./.github/actions/create-pr
22+
# with:
23+
# files: "CHANGELOG.md"
24+
# temp_branch_prefix: "ci-changelog"
25+
# pull_request_title: "chore(ci): changelog rebuild"
26+
# github_token: ${{ secrets.GITHUB_TOKEN }}
27+
# - name: Step to demonstrate how to access outputs (no need for this)
28+
# run: |
29+
# echo "PR number: ${PR_ID}"
30+
# echo "Branch: ${BRANCH}"
31+
# env:
32+
# PR_ID: ${{ steps.create-pr.outputs.pull_request_id}}
33+
# BRANCH: ${{ steps.create-pr.outputs.temp_branch}}
34+
35+
inputs:
36+
files:
37+
description: "Files to add separated by space"
38+
required: true
39+
temp_branch_prefix:
40+
description: "Prefix for temporary git branch to be created, e.g, ci-docs"
41+
required: true
42+
pull_request_title:
43+
description: "Pull Request title to use"
44+
required: true
45+
github_token:
46+
description: "GitHub token for GitHub CLI"
47+
required: true
48+
target_branch:
49+
description: "Branch to target when creating a PR against (main, by default)"
50+
required: false
51+
default: main
52+
53+
outputs:
54+
pull_request_id:
55+
description: "Pull request ID created"
56+
value: ${{ steps.create-pr.outputs.pull_request_id }}
57+
temp_branch:
58+
description: "Temporary branch created with staged changed"
59+
value: ${{ steps.create-pr.outputs.temp_branch }}
60+
61+
runs:
62+
using: "composite"
63+
steps:
64+
- id: adjust-path
65+
run: echo "${{ github.action_path }}" >> $GITHUB_PATH
66+
shell: bash
67+
- id: setup-git
68+
name: Git client setup and refresh tip
69+
run: |
70+
git config --global user.name 'aws-powertools-bot'
71+
git config --global user.email '[email protected]'
72+
git config pull.rebase true
73+
git config remote.origin.url >&-
74+
shell: bash
75+
- id: create-pr
76+
working-directory: ${{ env.GITHUB_WORKSPACE }}
77+
run: create_pr_for_staged_changes.sh "${FILES}"
78+
env:
79+
FILES: ${{ inputs.files }}
80+
TEMP_BRANCH_PREFIX: ${{ inputs.temp_branch_prefix }}
81+
PR_TITLE: ${{ inputs.pull_request_title }}
82+
BASE_BRANCH: ${{ inputs.target_branch }}
83+
GH_TOKEN: ${{ inputs.github_token }}
84+
shell: bash
85+
- id: cleanup
86+
name: Cleanup orphaned branch
87+
if: failure()
88+
run: git push origin --delete "${TEMP_BRANCH_PREFIX}-${GITHUB_RUN_ID}" || echo "Must have failed before creating temporary branch; no cleanup needed."
89+
env:
90+
TEMP_BRANCH_PREFIX: ${{ inputs.temp_branch_prefix }}
91+
GITHUB_RUN_ID: ${{ github.run_id }}
92+
shell: bash

‎.github/actions/create-pr/create_pr_for_staged_changes.sh

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
#!/bin/bash
2+
set -uo pipefail # prevent accessing unset env vars, prevent masking pipeline errors to the next command
3+
4+
#docs
5+
#title :create_pr_for_staged_changes.sh
6+
#description :This script will create a PR for staged changes, detect and close duplicate PRs. All PRs will be omitted from Release Notes and Changelogs
7+
#author :@heitorlessa
8+
#date :May 8th 2023
9+
#version :0.1
10+
#usage :bash create_pr_for_staged_changes.sh {git_staged_files_or_directories_separated_by_space}
11+
#notes :Meant to use in GitHub Actions only. Temporary branch will be named $TEMP_BRANCH_PREFIX-$GITHUB_RUN_ID
12+
#os_version :Ubuntu 22.04.2 LTS
13+
#required_env_vars :PR_TITLE, TEMP_BRANCH_PREFIX, GH_TOKEN
14+
#==============================================================================
15+
16+
# Sets GitHub Action with error message to ease troubleshooting
17+
function error() {
18+
echo "::error file=${FILENAME}::$1"
19+
exit 1
20+
}
21+
22+
function debug() {
23+
TIMESTAMP=$(date -u "+%FT%TZ") # 2023-05-10T07:53:59Z
24+
echo ""${TIMESTAMP}" - $1"
25+
}
26+
27+
function notice() {
28+
echo "::notice file=${FILENAME}::$1"
29+
}
30+
31+
function start_span() {
32+
echo "::group::$1"
33+
}
34+
35+
function end_span() {
36+
echo "::endgroup::"
37+
}
38+
39+
function has_required_config() {
40+
start_span "Validating required config"
41+
test -z "${TEMP_BRANCH_PREFIX}" && error "TEMP_BRANCH_PREFIX env must be set to create a PR"
42+
test -z "${PR_TITLE}" && error "PR_TITLE env must be set"
43+
test -z "${GH_TOKEN}" && error "GH_TOKEN env must be set for GitHub CLI"
44+
45+
# Default GitHub Actions Env Vars: https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
46+
debug "Are we running in GitHub Action environment?"
47+
test -z "${GITHUB_RUN_ID}" && error "GITHUB_RUN_ID env must be set to trace Workflow Run ID back to PR"
48+
test -z "${GITHUB_SERVER_URL}" && error "GITHUB_SERVER_URL env must be set to trace Workflow Run ID back to PR"
49+
test -z "${GITHUB_REPOSITORY}" && error "GITHUB_REPOSITORY env must be set to trace Workflow Run ID back to PR"
50+
51+
debug "Config validated successfully!"
52+
set_environment_variables
53+
end_span
54+
}
55+
56+
function set_environment_variables() {
57+
start_span "Setting environment variables"
58+
export readonly WORKFLOW_URL="${GITHUB_SERVER_URL}"/"${GITHUB_REPOSITORY}"/actions/runs/"${GITHUB_RUN_ID}" # e.g., heitorlessa/aws-lambda-powertools-test/actions/runs/4913570678
59+
export readonly TEMP_BRANCH="${TEMP_BRANCH_PREFIX}"-"${GITHUB_RUN_ID}" # e.g., ci-changelog-4894658712
60+
export readonly BASE_BRANCH="${BASE_BRANCH:-main}" # e.g., main, defaults to develop if missing
61+
export readonly PR_BODY="This is an automated PR created from the following workflow"
62+
export readonly FILENAME=".github/scripts/$(basename "$0")"
63+
export readonly NO_DUPLICATES_MESSAGE="No duplicated PRs found"
64+
export readonly SKIP_LABEL="skip-changelog"
65+
66+
end_span
67+
}
68+
69+
function has_anything_changed() {
70+
start_span "Validating git staged files"
71+
HAS_ANY_SOURCE_CODE_CHANGED="$(git status --porcelain)"
72+
73+
test -z "${HAS_ANY_SOURCE_CODE_CHANGED}" && debug "Nothing to update; exitting early" && exit 0
74+
end_span
75+
}
76+
77+
function create_temporary_branch_with_changes() {
78+
start_span "Creating temporary branch: "${TEMP_BRANCH}""
79+
git checkout -b "${TEMP_BRANCH}"
80+
81+
debug "Committing staged files: $*"
82+
echo "$@" | xargs -n1 git add || error "Failed to add staged changes: "$@""
83+
git commit -m "${PR_TITLE}"
84+
85+
git push origin "${TEMP_BRANCH}" || error "Failed to create new temporary branch"
86+
end_span
87+
}
88+
89+
function create_pr() {
90+
start_span "Creating PR against ${TEMP_BRANCH} branch"
91+
# TODO: create label
92+
NEW_PR_URL=$(gh pr create --title "${PR_TITLE}" --body "${PR_BODY}: ${WORKFLOW_URL}" --base "${BASE_BRANCH}" --label "${SKIP_LABEL}" || error "Failed to create PR") # e.g, https://github.com/aws-powertools/powertools-lambda-python/pull/13
93+
94+
# greedy remove any string until the last URL path, including the last '/'. https://opensource.com/article/17/6/bash-parameter-expansion
95+
debug "Extracing PR Number from PR URL: "${NEW_PR_URL}""
96+
NEW_PR_ID="${NEW_PR_URL##*/}" # 13
97+
export NEW_PR_URL
98+
export NEW_PR_ID
99+
end_span
100+
}
101+
102+
function close_duplicate_prs() {
103+
start_span "Searching for duplicate PRs"
104+
DUPLICATE_PRS=$(gh pr list --search "${PR_TITLE}" --json number --jq ".[] | select(.number != ${NEW_PR_ID}) | .number") # e.g, 13\n14
105+
106+
if [ -z "${DUPLICATE_PRS}" ]; then
107+
debug "No duplicate PRs found"
108+
DUPLICATE_PRS="${NO_DUPLICATES_MESSAGE}"
109+
else
110+
debug "Closing duplicated PRs: "${DUPLICATE_PRS}""
111+
echo "${DUPLICATE_PRS}" | xargs -L1 gh pr close --delete-branch --comment "Superseded by #${NEW_PR_ID}"
112+
fi
113+
114+
export readonly DUPLICATE_PRS
115+
end_span
116+
}
117+
118+
function report_job_output() {
119+
start_span "Updating job outputs"
120+
echo pull_request_id="${NEW_PR_ID}" >>"$GITHUB_OUTPUT"
121+
echo temp_branch="${TEMP_BRANCH}" >>"$GITHUB_OUTPUT"
122+
end_span
123+
}
124+
125+
function report_summary() {
126+
start_span "Creating job summary"
127+
echo "### Pull request created successfully :rocket: ${NEW_PR_URL} <br/><br/> Closed duplicated PRs: ${DUPLICATE_PRS}" >>"$GITHUB_STEP_SUMMARY"
128+
129+
notice "PR_URL is: ${NEW_PR_URL}"
130+
notice "PR_BRANCH is: ${TEMP_BRANCH}"
131+
notice "PR_DUPLICATES are: ${DUPLICATE_PRS}"
132+
end_span
133+
}
134+
135+
function main() {
136+
# Sanity check
137+
has_anything_changed
138+
has_required_config
139+
140+
create_temporary_branch_with_changes "$@"
141+
create_pr
142+
close_duplicate_prs
143+
144+
report_job_output
145+
report_summary
146+
}
147+
148+
main "$@"

‎.github/boring-cyborg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ labelPRBasedOnFilePath:
158158

159159
##### Greetings ########################################################################################################
160160
firstPRWelcomeComment: >
161-
Thanks a lot for your first contribution! Please check out our [contributing guidelines](https://github.com/aws-powertools/powertools-lambda-typescript/blob/chore/pr_automation/CONTRIBUTING.md) and don't hesitate to ask whatever you need.
161+
Thanks a lot for your first contribution! Please check out our [contributing guidelines](https://github.com/aws-powertools/powertools-lambda-typescript/blob/main/CONTRIBUTING.md) and don't hesitate to ask whatever you need.
162162
163163
In the meantime, check out the #typescript channel on our Powertools for AWS Lambda Discord: [Invite link](https://discord.gg/B8zZKbbyET)
164164

‎.github/dependabot.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: docker
4+
directory: /.devcontainer
5+
labels: [ ]
6+
schedule:
7+
interval: daily
8+
9+
- package-ecosystem: github-actions
10+
directory: /
11+
labels: [ ]
12+
schedule:
13+
interval: daily
14+
15+
- package-ecosystem: docker
16+
directory: /docs
17+
labels: [ ]
18+
schedule:
19+
interval: daily
20+
21+
- package-ecosystem: pip
22+
directory: /docs
23+
labels: [ ]
24+
schedule:
25+
interval: daily
26+
ignore:
27+
- dependency-name: "mike"
28+
update-types: ["version-update:semver-major"]
29+
30+
- package-ecosystem: npm
31+
directory: /
32+
labels: [ ]
33+
schedule:
34+
interval: daily
35+
versioning-strategy: increase
36+
ignore:
37+
- dependency-name: "@middy/core"
38+
update-types: [ "version-update:semver-major" ]
39+
groups:
40+
aws-sdk:
41+
patterns:
42+
- "@aws-sdk/**"
43+
- "@smithy/**"
44+
- "aws-sdk-client-mock"
45+
- "aws-sdk-client-mock-jest"
46+
aws-cdk:
47+
patterns:
48+
- "@aws-cdk/**"
49+
- "aws-cdk-lib"
50+
- "aws-cdk"

0 commit comments

Comments
 (0)