Skip to content

Commit 864fc66

Browse files
npalmnpalm
authored
Merge branch 'main' into patch-1
2 parents 14c4856 + 2e69cfd commit 864fc66

File tree

13 files changed

+1323
-1138
lines changed

13 files changed

+1323
-1138
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
33+
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
3434
with:
3535
languages: ${{ matrix.language }}
3636
build-mode: ${{ matrix.build-mode }}
3737

3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
39+
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
4040
with:
4141
category: "/language:${{matrix.language}}"

‎CHANGELOG.md‎

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

3+
## [5.20.1](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.20.0...v5.20.1) (2024-12-09)
4+
5+
6+
### Bug Fixes
7+
8+
* **lambda:** bump @octokit/types from 13.6.1 to 13.6.2 in /lambdas in the octokit group ([#4291](https://github.com/philips-labs/terraform-aws-github-runner/issues/4291)) ([d8d7519](https://github.com/philips-labs/terraform-aws-github-runner/commit/d8d75191eb4573d07ce3ee7f78bfb246b46e1198))
9+
* **lambda:** bump the aws group across 1 directory with 7 updates ([#4288](https://github.com/philips-labs/terraform-aws-github-runner/issues/4288)) ([039f5db](https://github.com/philips-labs/terraform-aws-github-runner/commit/039f5dbeb8af6a02a4686572d8e3377e5048fb3b))
10+
* **lambda:** bump the aws group in /lambdas with 4 updates ([#4290](https://github.com/philips-labs/terraform-aws-github-runner/issues/4290)) ([eb9c123](https://github.com/philips-labs/terraform-aws-github-runner/commit/eb9c123e53c02b332f78c92aedb69b9267810410))
11+
* **lambda:** bump the aws-powertools group in /lambdas with 4 updates ([#4281](https://github.com/philips-labs/terraform-aws-github-runner/issues/4281)) ([e1f330b](https://github.com/philips-labs/terraform-aws-github-runner/commit/e1f330bb3c8321af875232e23ff1f4d053c684f5))
12+
* **lambda:** bump typescript from 5.6.3 to 5.7.2 in /lambdas ([#4293](https://github.com/philips-labs/terraform-aws-github-runner/issues/4293)) ([f6e4b92](https://github.com/philips-labs/terraform-aws-github-runner/commit/f6e4b926e6e73bddb7b0b2f78183d3542f26d023))
13+
314
## [5.20.0](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.19.0...v5.20.0) (2024-11-19)
415

516

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22

33
[![docs](https://img.shields.io/badge/docs-runners-blue.svg)](https://philips-labs.github.io/terraform-aws-github-runner) [![awesome-runners](https://img.shields.io/badge/listed%20on-awesome--runners-blue.svg)](https://github.com/jonico/awesome-runners) [![Terraform registry](https://img.shields.io/github/v/release/philips-labs/terraform-aws-github-runner?label=Terraform%20Registry)](https://registry.terraform.io/modules/philips-labs/github-runner/aws/) [![Terraform checks](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/terraform.yml/badge.svg)](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/terraform.yml) [![Lambdas](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/lambda.yml/badge.svg)](https://github.com/philips-labs/terraform-aws-github-runner/actions/workflows/lambda.yml)
44

5+
> 📢 We're moving `terraform-aws-github-runner` to a new organization https://github.com/github-aws-runners in January to foster growth and community ownership! 🎉 Join us on our new [Discord server](https://discord.gg/EwUScJy8) for discussions and updates. Please see #4298 for more details.
6+
57
> 📄 Extensive documentation is available via our [GitHub Pages Docs site](https://philips-labs.github.io/terraform-aws-github-runner/).
68
79
> 📢 We maintain the project as a truly open-source project. We maintain the project on a best effort basis. We welcome contributions from the community. Feel free to help us answering issues, reviewing PRs, or maintaining and improving the project.
810
9-
> 📢 [`v5`](https://github.com/philips-labs/terraform-aws-github-runner/pull/3552) replaces Amazon Linux 2 with Amazon Linux 2023 as default OS. Check the PR for more details and other changes.
10-
11-
> 📢 For contributions to older versions you can make a PR to the related branch, e.g. `v4`. We have no release process in place for older versions.
12-
1311
This [Terraform](https://www.terraform.io/) module creates the required infrastructure needed to host [GitHub Actions](https://github.com/features/actions) self-hosted, auto-scaling runners on [AWS spot instances](https://aws.amazon.com/ec2/spot/). It provides the required logic to handle the life cycle for scaling up and down using a set of AWS Lambda functions. Runners are scaled down to zero to avoid costs when no workflows are active.
1412

1513
<picture>

‎lambdas/functions/ami-housekeeper/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
"@types/aws-lambda": "^8.10.145",
2121
"@types/jest": "^29.5.14",
2222
"@types/node": "^22.9.0",
23-
"@typescript-eslint/eslint-plugin": "^8.15.0",
24-
"@typescript-eslint/parser": "^8.14.0",
25-
"@vercel/ncc": "^0.38.2",
23+
"@typescript-eslint/eslint-plugin": "^8.18.1",
24+
"@typescript-eslint/parser": "^8.16.0",
25+
"@vercel/ncc": "^0.38.3",
2626
"aws-sdk-client-mock": "^4.1.0",
2727
"aws-sdk-client-mock-jest": "^4.1.0",
2828
"eslint": "^8.57.0",
2929
"eslint-plugin-prettier": "5.2.1",
3030
"jest": "^29.7.0",
3131
"jest-mock": "^29.7.0",
3232
"jest-mock-extended": "^3.0.7",
33-
"nock": "^13.5.4",
33+
"nock": "^13.5.6",
3434
"prettier": "3.3.3",
3535
"ts-jest": "^29.2.5",
3636
"ts-node": "^10.9.2",
@@ -39,11 +39,11 @@
3939
"dependencies": {
4040
"@aws-github-runner/aws-powertools-util": "*",
4141
"@aws-github-runner/aws-ssm-util": "*",
42-
"@aws-sdk/client-ec2": "^3.694.0",
43-
"@aws-sdk/client-ssm": "^3.693.0",
44-
"@aws-sdk/types": "^3.692.0",
42+
"@aws-sdk/client-ec2": "^3.714.0",
43+
"@aws-sdk/client-ssm": "^3.714.0",
44+
"@aws-sdk/types": "^3.714.0",
4545
"cron-parser": "^4.9.0",
46-
"typescript": "^5.6.3"
46+
"typescript": "^5.7.2"
4747
},
4848
"nx": {
4949
"includedScripts": [

‎lambdas/functions/control-plane/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"@types/aws-lambda": "^8.10.145",
2121
"@types/jest": "^29.5.14",
2222
"@types/node": "^22.9.0",
23-
"@typescript-eslint/eslint-plugin": "^8.15.0",
24-
"@typescript-eslint/parser": "^8.14.0",
25-
"@vercel/ncc": "^0.38.2",
23+
"@typescript-eslint/eslint-plugin": "^8.18.1",
24+
"@typescript-eslint/parser": "^8.16.0",
25+
"@vercel/ncc": "^0.38.3",
2626
"aws-sdk-client-mock": "^4.1.0",
2727
"aws-sdk-client-mock-jest": "^4.1.0",
2828
"eslint": "^8.57.0",
@@ -31,7 +31,7 @@
3131
"jest-mock": "^29.7.0",
3232
"jest-mock-extended": "^3.0.7",
3333
"moment-timezone": "^0.5.46",
34-
"nock": "^13.5.4",
34+
"nock": "^13.5.6",
3535
"prettier": "3.3.3",
3636
"ts-jest": "^29.2.5",
3737
"ts-node": "^10.9.2",
@@ -40,18 +40,18 @@
4040
"dependencies": {
4141
"@aws-github-runner/aws-powertools-util": "*",
4242
"@aws-github-runner/aws-ssm-util": "*",
43-
"@aws-lambda-powertools/parameters": "^2.10.0",
44-
"@aws-sdk/client-ec2": "^3.694.0",
45-
"@aws-sdk/client-sqs": "^3.693.0",
46-
"@aws-sdk/types": "^3.692.0",
43+
"@aws-lambda-powertools/parameters": "^2.11.0",
44+
"@aws-sdk/client-ec2": "^3.714.0",
45+
"@aws-sdk/client-sqs": "^3.714.0",
46+
"@aws-sdk/types": "^3.714.0",
4747
"@middy/core": "^4.7.0",
4848
"@octokit/auth-app": "6.1.3",
4949
"@octokit/core": "5.2.0",
5050
"@octokit/plugin-throttling": "8.2.0",
5151
"@octokit/rest": "20.1.1",
52-
"@octokit/types": "^13.6.1",
52+
"@octokit/types": "^13.6.2",
5353
"cron-parser": "^4.9.0",
54-
"typescript": "^5.6.3"
54+
"typescript": "^5.7.2"
5555
},
5656
"nx": {
5757
"includedScripts": [

‎lambdas/functions/control-plane/src/scale-runners/scale-up.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ export async function isJobQueued(githubInstallationClient: Octokit, payload: Ac
148148
});
149149
metricGitHubAppRateLimit(jobForWorkflowRun.headers);
150150
isQueued = jobForWorkflowRun.data.status === 'queued';
151+
logger.debug(`The job ${payload.id} is${isQueued ? ' ' : 'not'} queued`);
151152
} else {
152153
throw Error(`Event ${payload.eventType} is not supported`);
153154
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"@types/jest": "^29.5.14",
2222
"@types/node": "^22.9.0",
2323
"@types/request": "^2.48.12",
24-
"@typescript-eslint/eslint-plugin": "^8.15.0",
25-
"@typescript-eslint/parser": "^8.14.0",
26-
"@vercel/ncc": "^0.38.2",
24+
"@typescript-eslint/eslint-plugin": "^8.18.1",
25+
"@typescript-eslint/parser": "^8.16.0",
26+
"@vercel/ncc": "^0.38.3",
2727
"aws-sdk-client-mock": "^4.1.0",
2828
"aws-sdk-client-mock-jest": "^4.1.0",
2929
"eslint": "^8.57.0",
@@ -33,16 +33,16 @@
3333
"prettier": "3.3.3",
3434
"ts-jest": "^29.2.5",
3535
"ts-node-dev": "^2.0.0",
36-
"typescript": "^5.6.3"
36+
"typescript": "^5.7.2"
3737
},
3838
"dependencies": {
3939
"@aws-github-runner/aws-powertools-util": "*",
40-
"@aws-sdk/client-s3": "^3.693.0",
41-
"@aws-sdk/lib-storage": "^3.693.0",
42-
"@aws-sdk/types": "^3.692.0",
40+
"@aws-sdk/client-s3": "^3.714.0",
41+
"@aws-sdk/lib-storage": "^3.714.0",
42+
"@aws-sdk/types": "^3.714.0",
4343
"@middy/core": "^4.7.0",
4444
"@octokit/rest": "20.1.1",
45-
"axios": "^1.7.7"
45+
"axios": "^1.7.9"
4646
},
4747
"nx": {
4848
"includedScripts": [

‎lambdas/functions/termination-watcher/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@
1818
"@types/aws-lambda": "^8.10.145",
1919
"@types/jest": "^29.5.14",
2020
"@types/node": "^22.9.0",
21-
"@typescript-eslint/eslint-plugin": "^8.15.0",
22-
"@typescript-eslint/parser": "^8.14.0",
23-
"@vercel/ncc": "^0.38.2",
21+
"@typescript-eslint/eslint-plugin": "^8.18.1",
22+
"@typescript-eslint/parser": "^8.16.0",
23+
"@vercel/ncc": "^0.38.3",
2424
"aws-sdk-client-mock": "^4.1.0",
2525
"aws-sdk-client-mock-jest": "^4.1.0",
2626
"eslint": "^8.57.0",
2727
"eslint-plugin-prettier": "5.2.1",
2828
"jest": "^29.7.0",
2929
"jest-mock": "^29.7.0",
3030
"jest-mock-extended": "^3.0.7",
31-
"nock": "^13.5.4",
31+
"nock": "^13.5.6",
3232
"prettier": "3.3.3",
3333
"ts-jest": "^29.2.5",
3434
"ts-node": "^10.9.2",
3535
"ts-node-dev": "^2.0.0"
3636
},
3737
"dependencies": {
3838
"@aws-github-runner/aws-powertools-util": "*",
39-
"@aws-sdk/client-ec2": "^3.694.0",
40-
"@aws-sdk/types": "^3.692.0",
39+
"@aws-sdk/client-ec2": "^3.714.0",
40+
"@aws-sdk/types": "^3.714.0",
4141
"@middy/core": "^4.7.0",
42-
"typescript": "^5.6.3"
42+
"typescript": "^5.7.2"
4343
},
4444
"nx": {
4545
"includedScripts": [

‎lambdas/functions/webhook/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,34 @@
1616
"all": "yarn build && yarn format && yarn lint && yarn test"
1717
},
1818
"devDependencies": {
19-
"@aws-sdk/client-eventbridge": "^3.693.0",
19+
"@aws-sdk/client-eventbridge": "^3.714.0",
2020
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
2121
"@types/aws-lambda": "^8.10.145",
2222
"@types/express": "^4.17.21",
2323
"@types/jest": "^29.5.14",
2424
"@types/node": "^22.9.0",
25-
"@typescript-eslint/eslint-plugin": "^8.15.0",
26-
"@typescript-eslint/parser": "^8.14.0",
27-
"@vercel/ncc": "0.38.2",
25+
"@typescript-eslint/eslint-plugin": "^8.18.1",
26+
"@typescript-eslint/parser": "^8.16.0",
27+
"@vercel/ncc": "0.38.3",
2828
"body-parser": "^1.20.3",
2929
"eslint": "^8.57.0",
3030
"eslint-plugin-prettier": "5.2.1",
3131
"express": "^4.21.1",
3232
"jest": "^29.7.0",
3333
"jest-mock": "^29.7.0",
34-
"nock": "^13.5.4",
34+
"nock": "^13.5.6",
3535
"prettier": "3.3.3",
3636
"ts-jest": "^29.2.5",
3737
"ts-node-dev": "^2.0.0",
38-
"typescript": "^5.6.3"
38+
"typescript": "^5.7.2"
3939
},
4040
"dependencies": {
4141
"@aws-github-runner/aws-powertools-util": "*",
4242
"@aws-github-runner/aws-ssm-util": "*",
43-
"@aws-sdk/client-sqs": "^3.693.0",
43+
"@aws-sdk/client-sqs": "^3.714.0",
4444
"@middy/core": "^4.7.0",
4545
"@octokit/rest": "20.1.1",
46-
"@octokit/types": "^13.6.1",
46+
"@octokit/types": "^13.6.2",
4747
"@octokit/webhooks": "^12.3.1",
4848
"aws-lambda": "^1.0.7"
4949
},

‎lambdas/libs/aws-powertools-util/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@
1919
"@types/express": "^4.17.21",
2020
"@types/jest": "^29.5.14",
2121
"@types/node": "^22.9.0",
22-
"@typescript-eslint/eslint-plugin": "^8.15.0",
23-
"@typescript-eslint/parser": "^8.14.0",
24-
"@vercel/ncc": "0.38.2",
22+
"@typescript-eslint/eslint-plugin": "^8.18.1",
23+
"@typescript-eslint/parser": "^8.16.0",
24+
"@vercel/ncc": "0.38.3",
2525
"body-parser": "^1.20.3",
2626
"eslint": "^8.57.0",
2727
"eslint-plugin-prettier": "5.2.1",
2828
"express": "^4.21.1",
2929
"jest": "^29.7.0",
3030
"jest-mock": "^29.7.0",
31-
"nock": "^13.5.4",
31+
"nock": "^13.5.6",
3232
"prettier": "3.3.3",
3333
"ts-jest": "^29.2.5",
3434
"ts-node-dev": "^2.0.0",
35-
"typescript": "^5.6.3"
35+
"typescript": "^5.7.2"
3636
},
3737
"dependencies": {
38-
"@aws-lambda-powertools/logger": "^2.10.0",
39-
"@aws-lambda-powertools/metrics": "^2.10.0",
40-
"@aws-lambda-powertools/tracer": "^2.10.0",
38+
"@aws-lambda-powertools/logger": "^2.11.0",
39+
"@aws-lambda-powertools/metrics": "^2.11.0",
40+
"@aws-lambda-powertools/tracer": "^2.11.0",
4141
"aws-lambda": "^1.0.7"
4242
},
4343
"nx": {

0 commit comments

Comments
 (0)