Skip to content

Commit d74bda8

Browse files
authored
Merge branch 'main' into reject_user_action_when_org_enabled
2 parents 2995182 + fd7681c commit d74bda8

File tree

16 files changed

+463
-445
lines changed

16 files changed

+463
-445
lines changed

.github/workflows/lambda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
working-directory: ./lambdas
2020

2121
steps:
22-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.2.0
22+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.2.0
2323
- name: Install dependencies
2424
run: yarn install --frozen-lockfile
2525
- name: Run prettier

.github/workflows/packer-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
working-directory: images/${{ matrix.image }}
2626
steps:
2727
- name: "Checkout"
28-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4
28+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
2929
- name: packer init
3030
run: packer init .
3131
- name: check packer formatting

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
1818
with:
1919
node-version: 20
20-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4
20+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
2121
- name: Build dist
2222
working-directory: lambdas
2323
run: yarn install --frozen-lockfile && yarn run test && yarn dist

.github/workflows/semantic-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: Semantic Commit Message Check
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4
17-
- uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # ratchet:amannn/action-semantic-pull-request@v5
16+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
17+
- uses: amannn/action-semantic-pull-request@cfb60706e18bc85e8aec535e3c577abe8f70378e # ratchet:amannn/action-semantic-pull-request@v5
1818
name: Check PR for Semantic Commit Message
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/terraform.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
image: hashicorp/terraform:${{ matrix.terraform }}
2424
steps:
2525
- name: "Checkout"
26-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
26+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
2727
- name: "Fake zip files" # Validate will fail if it cannot find the zip files
2828
run: |
2929
touch lambdas/functions/webhook/webhook.zip
@@ -89,7 +89,7 @@ jobs:
8989
container:
9090
image: hashicorp/terraform:${{ matrix.terraform }}
9191
steps:
92-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
92+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
9393
- name: terraform init
9494
run: terraform init -get -backend=false -input=false
9595
- if: contains(matrix.terraform, '1.3.')
@@ -147,7 +147,7 @@ jobs:
147147
container:
148148
image: hashicorp/terraform:${{ matrix.terraform }}
149149
steps:
150-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
150+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
151151
- name: terraform init
152152
run: terraform init -get -backend=false -input=false
153153
- if: contains(matrix.terraform, '1.5.')

.github/workflows/update-docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
org: philips-labs
2626

2727
- name: Checkout with GITHUB Action token
28-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4
28+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
2929
with:
3030
token: ${{ steps.app.outputs.token }}
3131

@@ -51,7 +51,7 @@ jobs:
5151
# change docs via PR in case of locked main branch
5252
- name: Create Pull Request (main branch only)
5353
if: github.ref == 'refs/heads/main' && github.repository_owner == 'philips-labs'
54-
uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83 # ratchet:peter-evans/[email protected].4
54+
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # ratchet:peter-evans/[email protected].5
5555
with:
5656
token: ${{ secrets.GITHUB_TOKEN }}
5757
commit-message: "docs: auto update terraform docs"
@@ -65,7 +65,7 @@ jobs:
6565
needs: [docs]
6666
runs-on: ubuntu-latest
6767
steps:
68-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4
68+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
6969
- name: Configure Git Credentials
7070
run: |
7171
git config user.name github-actions[bot]

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [5.10.4](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.10.3...v5.10.4) (2024-05-06)
4+
5+
6+
### Bug Fixes
7+
8+
* **lambda:** bump ejs from 3.1.9 to 3.1.10 in /lambdas ([#3887](https://github.com/philips-labs/terraform-aws-github-runner/issues/3887)) ([4cca21f](https://github.com/philips-labs/terraform-aws-github-runner/commit/4cca21fa5c44316e2ef2574563b24218f8ae090d))
9+
* **lambda:** bump the aws group across 1 directory with 6 updates ([#3890](https://github.com/philips-labs/terraform-aws-github-runner/issues/3890)) ([d1cd712](https://github.com/philips-labs/terraform-aws-github-runner/commit/d1cd712204b678a878f22eea75e540cb28d6a3ad))
10+
* Typo in env vars for scale-up lambda ([#3891](https://github.com/philips-labs/terraform-aws-github-runner/issues/3891)) ([f4ecf46](https://github.com/philips-labs/terraform-aws-github-runner/commit/f4ecf466014d7d51aed238aa851290908d3c7972))
11+
312
## [5.10.3](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.10.2...v5.10.3) (2024-05-03)
413

514

lambdas/functions/ami-housekeeper/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"ts-node-dev": "^2.0.0"
3838
},
3939
"dependencies": {
40-
"@aws-sdk/client-ec2": "^3.557.0",
41-
"@aws-sdk/client-ssm": "^3.556.0",
40+
"@aws-sdk/client-ec2": "^3.568.0",
41+
"@aws-sdk/client-ssm": "^3.568.0",
4242
"@aws-sdk/types": "^3.433.0",
4343
"@terraform-aws-github-runner/aws-powertools-util": "*",
4444
"@terraform-aws-github-runner/aws-ssm-util": "*",

lambdas/functions/control-plane/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"ts-node-dev": "^2.0.0"
3939
},
4040
"dependencies": {
41-
"@aws-sdk/client-ec2": "^3.557.0",
41+
"@aws-sdk/client-ec2": "^3.568.0",
4242
"@aws-sdk/types": "^3.433.0",
4343
"@middy/core": "^4.7.0",
4444
"@octokit/auth-app": "6.0.3",

lambdas/functions/gh-agent-syncer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"typescript": "^5.4.5"
3838
},
3939
"dependencies": {
40-
"@aws-sdk/client-s3": "^3.556.0",
41-
"@aws-sdk/lib-storage": "^3.556.0",
40+
"@aws-sdk/client-s3": "^3.568.0",
41+
"@aws-sdk/lib-storage": "^3.568.0",
4242
"@aws-sdk/types": "^3.433.0",
4343
"@middy/core": "^4.7.0",
4444
"@terraform-aws-github-runner/aws-powertools-util": "*",

lambdas/functions/termination-watcher/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"ts-node-dev": "^2.0.0"
3636
},
3737
"dependencies": {
38-
"@aws-sdk/client-ec2": "^3.557.0",
38+
"@aws-sdk/client-ec2": "^3.568.0",
3939
"@aws-sdk/types": "^3.433.0",
4040
"@middy/core": "^4.7.0",
4141
"@terraform-aws-github-runner/aws-powertools-util": "*",

lambdas/functions/webhook/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"typescript": "^5.4.5"
3939
},
4040
"dependencies": {
41-
"@aws-sdk/client-sqs": "^3.556.0",
41+
"@aws-sdk/client-sqs": "^3.568.0",
4242
"@middy/core": "^4.7.0",
4343
"@octokit/rest": "^20.0.1",
4444
"@octokit/types": "^12.5.0",

lambdas/libs/aws-ssm-util/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"typescript": "^5.4.5"
3737
},
3838
"dependencies": {
39-
"@aws-sdk/client-ssm": "^3.556.0",
39+
"@aws-sdk/client-ssm": "^3.568.0",
4040
"@aws-sdk/types": "^3.433.0",
4141
"@terraform-aws-github-runner/aws-powertools-util": "*"
4242
},

lambdas/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"@octokit/types": "^12.0.0"
2222
},
2323
"devDependencies": {
24-
"@nx/eslint": "18.0.4",
25-
"@nx/jest": "18.0.4",
24+
"@nx/eslint": "18.3.4",
25+
"@nx/jest": "18.3.4",
2626
"@nx/js": "^18.0.4",
2727
"@swc-node/register": "~1.8.0",
2828
"@swc/core": "~1.3.85",

0 commit comments

Comments
 (0)