Skip to content

Commit b4706fc

Browse files
authored
Merge branch 'main' into feat/metrics_custom_logger
2 parents 4634536 + c1080fb commit b4706fc

File tree

159 files changed

+3968
-2621
lines changed

Some content is hidden

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

159 files changed

+3968
-2621
lines changed

Diff for: .devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.212.0/containers/javascript-node/.devcontainer/base.Dockerfile
2-
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node@sha256:426f06d22e8a81d047d7cae9c08509907d2663bc137ccc6ba597ddd8a6808aa1
2+
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node@sha256:d493ef047b5ee96655fb543919e6e036dc87582509e6c622c9fe999b6eeb5148
33

44
# Install fnm to manage Node.js versions
55
RUN curl -fsSL https://fnm.vercel.app/install -o /tmp/install \

Diff for: .github/workflows/dependency-review.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: 'Checkout Repository'
20-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121
- name: 'Dependency Review'
22-
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
22+
uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0

Diff for: .github/workflows/label_pr_on_title.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
pull-requests: write # label respective PR
5050
steps:
5151
- name: Checkout repository
52-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
52+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5353
- name: "Label PR based on title"
5454
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
5555
env:

Diff for: .github/workflows/make-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ jobs:
4545
RELEASE_VERSION: ${{ steps.set-release-version.outputs.RELEASE_VERSION }}
4646
steps:
4747
- name: Checkout code
48-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4949
with:
5050
ref: ${{ github.sha }}
5151
- name: Setup NodeJS
52-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
52+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
5353
with:
5454
node-version: "20"
5555
cache: "npm"
@@ -75,7 +75,7 @@ jobs:
7575
runs-on: ubuntu-latest
7676
steps:
7777
- name: Checkout code
78-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
78+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7979
with:
8080
ref: ${{ github.sha }}
8181
- name: Git client setup

Diff for: .github/workflows/make-version.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ jobs:
1818
RELEASE_VERSION: ${{ steps.set-release-version.outputs.RELEASE_VERSION }}
1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
21+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222
with:
2323
ref: ${{ github.ref }}
2424
fetch-depth: 0 # fetch all history, commits and tags, lerna scans it to the last tag and looks at commits, we need all of it to determine the next version
2525
- name: Setup NodeJS
26-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
26+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
2727
with:
2828
node-version: "20"
2929
cache: "npm"
3030
- name: Setup dependencies
3131
uses: aws-powertools/actions/.github/actions/cached-node-modules@d406bac5563f1d8c793519a3eedfe620f6a14872
3232
- name: Version
3333
id: bump-version
34-
run: npx lerna version --conventional-commits --no-git-tag-version --no-push --no-commit-hooks --yes
34+
run: npx lerna version --conventional-commits --force-publish --no-git-tag-version --no-push --no-commit-hooks --yes
3535
- name: Update user agent version
3636
run: |
3737
VERSION=$(cat lerna.json | jq .version -r)

Diff for: .github/workflows/on_merged_pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
issues: write # label issue with pending-release
5050
if: needs.get_pr_details.outputs.prIsMerged == 'true'
5151
steps:
52-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
52+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5353
- name: "Label PR related issue for release"
5454
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
5555
env:

Diff for: .github/workflows/on_opened_pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
needs: get_pr_details
4848
runs-on: ubuntu-latest
4949
steps:
50-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
50+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5151
- name: "Ensure related issue is present"
5252
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
5353
env:
@@ -66,7 +66,7 @@ jobs:
6666
permissions:
6767
pull-requests: write # label and comment on PR if missing acknowledge section (requirement)
6868
steps:
69-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
69+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7070
- name: "Ensure acknowledgement section is present"
7171
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
7272
env:

Diff for: .github/workflows/ossf_scorecard.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: "Checkout code"
25-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
with:
2727
persist-credentials: false
2828

@@ -35,14 +35,14 @@ jobs:
3535
# repo_token: ${{ secrets.SCORECARD_TOKEN }} # read-only fine-grained token to read branch protection settings
3636

3737
- name: "Upload results"
38-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
38+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
3939
with:
4040
name: SARIF file
4141
path: results.sarif
4242
retention-days: 5
4343

4444
# Upload the results to GitHub's code scanning dashboard.
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
46+
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
4747
with:
4848
sarif_file: results.sarif

Diff for: .github/workflows/post-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
env:
2727
RELEASE_VERSION: ${{ inputs.versionNumber }}
2828
steps:
29-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
29+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030
- name: Get release version
3131
run: |
3232
# The code below does the following:

Diff for: .github/workflows/publish-package.yml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Publish Package
2+
3+
# This workflow publishes a single package to NPM
4+
5+
on:
6+
workflow_dispatch:
7+
inputs:
8+
package:
9+
description: 'The package to publish'
10+
type: choice
11+
required: true
12+
options:
13+
- packages/batch
14+
- packages/commons
15+
- packages/idempotency
16+
- packages/jmespath
17+
- packages/logger
18+
- packages/metrics
19+
- packages/tracer
20+
- packages/parameters
21+
- packages/parser
22+
23+
permissions:
24+
contents: read
25+
26+
27+
jobs:
28+
run-unit-tests:
29+
uses: ./.github/workflows/reusable-run-linting-check-and-unit-tests.yml
30+
publish-npm:
31+
needs: run-unit-tests
32+
permissions:
33+
id-token: write
34+
environment: Release
35+
runs-on: ubuntu-latest
36+
steps:
37+
- name: Checkout code
38+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
39+
with:
40+
ref: ${{ github.sha }}
41+
- name: Setup NodeJS
42+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
43+
with:
44+
node-version: "20"
45+
cache: "npm"
46+
- name: Setup auth tokens
47+
run: |
48+
npm set "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}"
49+
- name: Setup dependencies
50+
uses: aws-powertools/actions/.github/actions/cached-node-modules@d406bac5563f1d8c793519a3eedfe620f6a14872
51+
- name: Publish to npm
52+
run: |
53+
NPM_CONFIG_PROVENANCE=true npx lerna publish from-package --force-publish ${{ github.event.input.package }} --git-head ${{ github.sha }} --yes

Diff for: .github/workflows/publish_layer.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
if: ${{ (github.event.workflow_run.conclusion == 'success') || (github.event_name == 'workflow_dispatch') }}
3232
steps:
3333
- name: checkout
34-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
34+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
with:
3636
ref: ${{ github.sha }}
3737
- name: Setup Node.js
38-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
38+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
3939
with:
4040
node-version: "20"
4141
- name: Setup dependencies
@@ -45,7 +45,7 @@ jobs:
4545
- name: Zip output
4646
run: zip -r cdk.out.zip layers/cdk.out
4747
- name: Archive CDK artifacts
48-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
48+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
4949
with:
5050
name: cdk-layer-artifact
5151
path: cdk.out.zip
@@ -93,7 +93,7 @@ jobs:
9393
id-token: none
9494
steps:
9595
- name: Checkout repository # reusable workflows start clean, so we need to checkout again
96-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
96+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9797
with:
9898
ref: ${{ github.sha }}
9999
- name: Download CDK layer artifacts

Diff for: .github/workflows/record_pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
permissions:
4747
contents: read # NOTE: treat as untrusted location
4848
steps:
49-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
49+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5050
- name: "Extract PR details"
5151
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
5252
with:
5353
script: |
5454
const script = require('.github/scripts/save_pr_details.js')
5555
await script({github, context, core})
56-
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
56+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
5757
with:
5858
name: pr
5959
path: pr.txt

Diff for: .github/workflows/reusable-run-linting-check-and-unit-tests.yml

+17-18
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,17 @@ jobs:
4343
workspace: [
4444
"packages/batch",
4545
"packages/commons",
46-
"packages/jmespath",
46+
"packages/event-handler",
4747
"packages/idempotency",
48-
"packages/event-handler"
48+
"packages/jmespath",
49+
"packages/logger",
4950
]
5051
fail-fast: false
5152
steps:
5253
- name: Checkout code
53-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
54+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5455
- name: Setup NodeJS
55-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
56+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
5657
with:
5758
node-version: ${{ matrix.version }}
5859
cache: "npm"
@@ -76,9 +77,9 @@ jobs:
7677
fail-fast: false
7778
steps:
7879
- name: Checkout code
79-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
80+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8081
- name: Setup NodeJS
81-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
82+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
8283
with:
8384
node-version: ${{ matrix.version }}
8485
cache: "npm"
@@ -88,15 +89,13 @@ jobs:
8889
nodeVersion: ${{ matrix.version }}
8990
- name: Run linting
9091
run: |
91-
npm run lint -w packages/logger \
92-
-w packages/tracer \
92+
npm run lint -w -w packages/tracer \
9393
-w packages/metrics \
9494
-w packages/parameters \
9595
-w packages/parser
9696
- name: Run unit tests
9797
run: |
98-
npm t -w packages/logger \
99-
-w packages/tracer \
98+
npm t -w packages/tracer \
10099
-w packages/metrics \
101100
-w packages/parameters \
102101
-w packages/parser
@@ -113,9 +112,9 @@ jobs:
113112
working-directory: examples/${{ matrix.example }}
114113
steps:
115114
- name: Checkout code
116-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
115+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
117116
- name: Setup NodeJS
118-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
117+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
119118
with:
120119
node-version: 20
121120
cache: "npm"
@@ -131,9 +130,9 @@ jobs:
131130
NODE_ENV: dev
132131
steps:
133132
- name: Checkout code
134-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
133+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
135134
- name: Setup NodeJS
136-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
135+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
137136
with:
138137
node-version: 20
139138
cache: "npm"
@@ -149,9 +148,9 @@ jobs:
149148
NODE_ENV: dev
150149
steps:
151150
- name: Checkout code
152-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
151+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
153152
- name: Setup NodeJS
154-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
153+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
155154
with:
156155
node-version: 20
157156
cache: "npm"
@@ -165,9 +164,9 @@ jobs:
165164
NODE_ENV: dev
166165
steps:
167166
- name: Checkout code
168-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
167+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
169168
- name: Setup NodeJS
170-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
169+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
171170
with:
172171
node-version: 20
173172
cache: "npm"

Diff for: .github/workflows/reusable_deploy_layer_stack.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ jobs:
6464
]
6565
steps:
6666
- name: checkout
67-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
67+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6868
- name: aws credentials
6969
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
7070
with:
7171
aws-region: ${{ matrix.region }}
7272
role-to-assume: ${{ secrets.target-account-role }}
7373
mask-aws-account-id: true
7474
- name: Setup Node.js
75-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
75+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
7676
with:
7777
node-version: "20"
7878
- name: Setup dependencies
@@ -93,7 +93,7 @@ jobs:
9393
cat cdk-layer-stack/${{ matrix.region }}-layer-version.txt
9494
- name: Save Layer ARN artifact
9595
if: ${{ inputs.stage == 'PROD' }}
96-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
96+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
9797
with:
9898
name: cdk-layer-stack-${{ matrix.region }}
9999
path: ./cdk-layer-stack/* # NOTE: upload-artifact does not inherit working-directory setting.

Diff for: .github/workflows/reusable_export_pr_details.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
prLabels: ${{ steps.prLabels.outputs.prLabels }}
7676
steps:
7777
- name: Checkout repository # in case caller workflow doesn't checkout thus failing with file not found
78-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
78+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7979
- name: "Download previously saved PR"
8080
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
8181
env:

0 commit comments

Comments
 (0)