Skip to content

Commit a21d017

Browse files
stuartp44stuartp44
authored
Merge branch 'main' into reject_user_action_when_org_enabled_v2
2 parents e7ceab7 + 7b911b2 commit a21d017

File tree

24 files changed

+610
-934
lines changed

24 files changed

+610
-934
lines changed

‎.github/dependabot.yml

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ updates:
3636
update-types: ["version-update:semver-major"]
3737
- dependency-name: "@octokit/*"
3838
update-types: ["version-update:semver-major"]
39-
- dependency-name: "@octokit/rest"
40-
- dependency-name: "@octokit/auth-app"
4139
- dependency-name: "eslint"
4240
update-types: ["version-update:semver-major"]
4341
commit-message:

‎.github/workflows/lambda.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Build distribution
3333
run: yarn build
3434
- name: Upload coverage report
35-
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v31.2
35+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v31.2
3636
if: ${{ failure() }}
3737
with:
3838
name: coverage-reports

‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## [5.14.1](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.14.0...v5.14.1) (2024-08-07)
4+
5+
6+
### Bug Fixes
7+
8+
* align inlince policies ([#4046](https://github.com/philips-labs/terraform-aws-github-runner/issues/4046)) ([7235cdc](https://github.com/philips-labs/terraform-aws-github-runner/commit/7235cdc40686f3218e1991ec9a8feeb900b719f1)), closes [#4045](https://github.com/philips-labs/terraform-aws-github-runner/issues/4045)
9+
* **lambda:** bump the aws group in /lambdas with 4 updates ([#4048](https://github.com/philips-labs/terraform-aws-github-runner/issues/4048)) ([e32b14b](https://github.com/philips-labs/terraform-aws-github-runner/commit/e32b14bc246463d50620c354ce84edc0751623c0))
10+
* **lambda:** bump the aws group in /lambdas with 5 updates ([#4035](https://github.com/philips-labs/terraform-aws-github-runner/issues/4035)) ([c15c99d](https://github.com/philips-labs/terraform-aws-github-runner/commit/c15c99db84132b11f886f6f8e5291af5e357b41e))
11+
* remove fetch override for octokit and versions ([#4042](https://github.com/philips-labs/terraform-aws-github-runner/issues/4042)) ([6ac19e6](https://github.com/philips-labs/terraform-aws-github-runner/commit/6ac19e6e4aa3a950d26fcaf496d08fe5508d8992))
12+
313
## [5.14.0](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.13.0...v5.14.0) (2024-08-01)
414

515

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
},
1818
"devDependencies": {
1919
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
20-
"@types/aws-lambda": "^8.10.142",
20+
"@types/aws-lambda": "^8.10.143",
2121
"@types/jest": "^29.5.12",
2222
"@types/node": "^22.0.2",
2323
"@typescript-eslint/eslint-plugin": "^7.18.0",
2424
"@typescript-eslint/parser": "^7.18.0",
2525
"@vercel/ncc": "^0.38.1",
26-
"aws-sdk-client-mock": "^3.1.0",
26+
"aws-sdk-client-mock": "^4.0.1",
2727
"aws-sdk-client-mock-jest": "^4.0.1",
2828
"eslint": "^8.57.0",
2929
"eslint-plugin-prettier": "5.2.1",
@@ -37,8 +37,8 @@
3737
"ts-node-dev": "^2.0.0"
3838
},
3939
"dependencies": {
40-
"@aws-sdk/client-ec2": "^3.624.0",
41-
"@aws-sdk/client-ssm": "^3.623.0",
40+
"@aws-sdk/client-ec2": "^3.629.0",
41+
"@aws-sdk/client-ssm": "^3.629.0",
4242
"@aws-sdk/types": "^3.609.0",
4343
"@terraform-aws-github-runner/aws-powertools-util": "*",
4444
"@terraform-aws-github-runner/aws-ssm-util": "*",

‎lambdas/functions/control-plane/jest.config.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ const config: Config = {
66
...defaultConfig,
77
coverageThreshold: {
88
global: {
9-
statements: 98.01,
10-
branches: 97.28,
11-
functions: 95.6,
12-
lines: 97.94,
9+
statements: 97.99,
10+
branches: 97.26,
11+
functions: 95.45,
12+
lines: 97.92,
1313
},
1414
},
1515
};

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

+5-6
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
},
1818
"devDependencies": {
1919
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
20-
"@types/aws-lambda": "^8.10.142",
20+
"@types/aws-lambda": "^8.10.143",
2121
"@types/jest": "^29.5.12",
2222
"@types/node": "^22.0.2",
2323
"@typescript-eslint/eslint-plugin": "^7.18.0",
2424
"@typescript-eslint/parser": "^7.18.0",
2525
"@vercel/ncc": "^0.38.1",
26-
"aws-sdk-client-mock": "^3.1.0",
26+
"aws-sdk-client-mock": "^4.0.1",
2727
"aws-sdk-client-mock-jest": "^4.0.1",
2828
"eslint": "^8.57.0",
2929
"eslint-plugin-prettier": "5.2.1",
@@ -38,17 +38,16 @@
3838
"ts-node-dev": "^2.0.0"
3939
},
4040
"dependencies": {
41-
"@aws-sdk/client-ec2": "^3.624.0",
41+
"@aws-sdk/client-ec2": "^3.629.0",
4242
"@aws-sdk/types": "^3.609.0",
4343
"@middy/core": "^4.7.0",
44-
"@octokit/auth-app": "6.0.3",
44+
"@octokit/auth-app": "6.1.1",
4545
"@octokit/core": "5.2.0",
4646
"@octokit/plugin-throttling": "8.2.0",
47-
"@octokit/rest": "20.0.2",
47+
"@octokit/rest": "20.1.1",
4848
"@octokit/types": "^13.5.0",
4949
"@terraform-aws-github-runner/aws-powertools-util": "*",
5050
"@terraform-aws-github-runner/aws-ssm-util": "*",
51-
"axios": "^1.7.2",
5251
"cron-parser": "^4.9.0",
5352
"typescript": "^5.5.4"
5453
},

‎lambdas/functions/control-plane/src/axios/fetch-override.test.ts

-31
This file was deleted.

‎lambdas/functions/control-plane/src/axios/fetch-override.ts

-19
This file was deleted.

‎lambdas/functions/control-plane/src/gh-auth/gh-auth.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ${decryptedValue}`,
9595

9696
// Assert
9797
expect(mockedCreatAppAuth).toBeCalledTimes(1);
98-
expect(mockedCreatAppAuth).toBeCalledWith({ ...authOptions, request: expect.anything() });
98+
expect(mockedCreatAppAuth).toBeCalledWith({ ...authOptions });
9999
});
100100

101101
test('Creates auth object for public GitHub', async () => {
@@ -121,7 +121,7 @@ ${decryptedValue}`,
121121
expect(getParameter).toBeCalledWith(PARAMETER_GITHUB_APP_KEY_BASE64_NAME);
122122

123123
expect(mockedCreatAppAuth).toBeCalledTimes(1);
124-
expect(mockedCreatAppAuth).toBeCalledWith({ ...authOptions, request: expect.anything() });
124+
expect(mockedCreatAppAuth).toBeCalledWith({ ...authOptions });
125125
expect(mockedAuth).toBeCalledWith({ type: authType });
126126
expect(result.token).toBe(token);
127127
});

‎lambdas/functions/control-plane/src/gh-auth/gh-auth.ts

+3-10
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ import { Octokit } from '@octokit/rest';
1313
import { throttling } from '@octokit/plugin-throttling';
1414
import { createChildLogger } from '@terraform-aws-github-runner/aws-powertools-util';
1515
import { getParameter } from '@terraform-aws-github-runner/aws-ssm-util';
16-
17-
import { axiosFetch } from '../axios/fetch-override';
16+
import { EndpointDefaults } from '@octokit/types';
1817

1918
const logger = createChildLogger('gh-auth');
2019

2120
export async function createOctoClient(token: string, ghesApiUrl = ''): Promise<Octokit> {
2221
const CustomOctokit = Octokit.plugin(throttling);
2322
const ocktokitOptions: OctokitOptions = {
2423
auth: token,
25-
request: { fetch: axiosFetch },
2624
};
2725
if (ghesApiUrl) {
2826
ocktokitOptions.baseUrl = ghesApiUrl;
@@ -32,12 +30,12 @@ export async function createOctoClient(token: string, ghesApiUrl = ''): Promise<
3230
return new CustomOctokit({
3331
...ocktokitOptions,
3432
throttle: {
35-
onRateLimit: (options: { method: string; url: string }) => {
33+
onRateLimit: (retryAfter: number, options: Required<EndpointDefaults>) => {
3634
logger.warn(
3735
`GitHub rate limit: Request quota exhausted for request ${options.method} ${options.url}. Requested `,
3836
);
3937
},
40-
onSecondaryRateLimit: (options: { method: string; url: string }) => {
38+
onSecondaryRateLimit: (retryAfter: number, options: Required<EndpointDefaults>) => {
4139
logger.warn(`GitHub rate limit: SecondaryRateLimit detected for request ${options.method} ${options.url}`);
4240
},
4341
},
@@ -82,12 +80,7 @@ async function createAuth(installationId: number | undefined, ghesApiUrl: string
8280
if (ghesApiUrl) {
8381
authOptions.request = request.defaults({
8482
baseUrl: ghesApiUrl,
85-
request: {
86-
fetch: axiosFetch,
87-
},
8883
});
89-
} else {
90-
authOptions.request = request.defaults({ request: { fetch: axiosFetch } });
9184
}
9285
return createAppAuth(authOptions);
9386
}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
},
1818
"devDependencies": {
1919
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
20-
"@types/aws-lambda": "^8.10.142",
20+
"@types/aws-lambda": "^8.10.143",
2121
"@types/jest": "^29.5.12",
2222
"@types/node": "^22.0.2",
2323
"@types/request": "^2.48.12",
2424
"@typescript-eslint/eslint-plugin": "^7.18.0",
2525
"@typescript-eslint/parser": "^7.18.0",
2626
"@vercel/ncc": "^0.38.1",
27-
"aws-sdk-client-mock": "^3.1.0",
27+
"aws-sdk-client-mock": "^4.0.1",
2828
"aws-sdk-client-mock-jest": "^4.0.1",
2929
"eslint": "^8.57.0",
3030
"eslint-plugin-prettier": "5.2.1",
@@ -36,11 +36,11 @@
3636
"typescript": "^5.5.4"
3737
},
3838
"dependencies": {
39-
"@aws-sdk/client-s3": "^3.623.0",
40-
"@aws-sdk/lib-storage": "^3.623.0",
39+
"@aws-sdk/client-s3": "^3.629.0",
40+
"@aws-sdk/lib-storage": "^3.629.0",
4141
"@aws-sdk/types": "^3.609.0",
4242
"@middy/core": "^4.7.0",
43-
"@octokit/rest": "20.0.2",
43+
"@octokit/rest": "20.1.1",
4444
"@terraform-aws-github-runner/aws-powertools-util": "*",
4545
"axios": "^1.7.2"
4646
},

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
},
1616
"devDependencies": {
1717
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
18-
"@types/aws-lambda": "^8.10.142",
18+
"@types/aws-lambda": "^8.10.143",
1919
"@types/jest": "^29.5.12",
2020
"@types/node": "^22.0.2",
2121
"@typescript-eslint/eslint-plugin": "^7.18.0",
2222
"@typescript-eslint/parser": "^7.18.0",
2323
"@vercel/ncc": "^0.38.1",
24-
"aws-sdk-client-mock": "^3.1.0",
24+
"aws-sdk-client-mock": "^4.0.1",
2525
"aws-sdk-client-mock-jest": "^4.0.1",
2626
"eslint": "^8.57.0",
2727
"eslint-plugin-prettier": "5.2.1",
@@ -35,7 +35,7 @@
3535
"ts-node-dev": "^2.0.0"
3636
},
3737
"dependencies": {
38-
"@aws-sdk/client-ec2": "^3.624.0",
38+
"@aws-sdk/client-ec2": "^3.629.0",
3939
"@aws-sdk/types": "^3.609.0",
4040
"@middy/core": "^4.7.0",
4141
"@terraform-aws-github-runner/aws-powertools-util": "*",

‎lambdas/functions/webhook/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"devDependencies": {
1919
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
20-
"@types/aws-lambda": "^8.10.142",
20+
"@types/aws-lambda": "^8.10.143",
2121
"@types/express": "^4.17.21",
2222
"@types/jest": "^29.5.12",
2323
"@types/node": "^22.0.2",
@@ -37,9 +37,9 @@
3737
"typescript": "^5.5.4"
3838
},
3939
"dependencies": {
40-
"@aws-sdk/client-sqs": "^3.623.0",
40+
"@aws-sdk/client-sqs": "^3.629.0",
4141
"@middy/core": "^4.7.0",
42-
"@octokit/rest": "20.0.2",
42+
"@octokit/rest": "20.1.1",
4343
"@octokit/types": "^13.5.0",
4444
"@octokit/webhooks": "^12.2.0",
4545
"@terraform-aws-github-runner/aws-powertools-util": "*",

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
18-
"@types/aws-lambda": "^8.10.142",
18+
"@types/aws-lambda": "^8.10.143",
1919
"@types/express": "^4.17.21",
2020
"@types/jest": "^29.5.12",
2121
"@types/node": "^22.0.2",
@@ -35,9 +35,9 @@
3535
"typescript": "^5.5.4"
3636
},
3737
"dependencies": {
38-
"@aws-lambda-powertools/logger": "^2.6.0",
39-
"@aws-lambda-powertools/metrics": "^2.6.0",
40-
"@aws-lambda-powertools/tracer": "^2.6.0",
38+
"@aws-lambda-powertools/logger": "^2.7.0",
39+
"@aws-lambda-powertools/metrics": "^2.7.0",
40+
"@aws-lambda-powertools/tracer": "^2.7.0",
4141
"aws-lambda": "^1.0.7"
4242
},
4343
"nx": {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
18-
"@types/aws-lambda": "^8.10.142",
18+
"@types/aws-lambda": "^8.10.143",
1919
"@types/express": "^4.17.21",
2020
"@types/jest": "^29.5.12",
2121
"@types/node": "^22.0.2",
@@ -35,7 +35,7 @@
3535
"typescript": "^5.5.4"
3636
},
3737
"dependencies": {
38-
"@aws-sdk/client-ssm": "^3.623.0",
38+
"@aws-sdk/client-ssm": "^3.629.0",
3939
"@aws-sdk/types": "^3.609.0",
4040
"@terraform-aws-github-runner/aws-powertools-util": "*"
4141
},

‎lambdas/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@octokit/types": "^13.0.0"
2222
},
2323
"devDependencies": {
24-
"@nx/eslint": "19.5.6",
24+
"@nx/eslint": "19.5.7",
2525
"@nx/jest": "19.5.4",
2626
"@nx/js": "^19.5.4",
2727
"@swc-node/register": "~1.10.9",

0 commit comments

Comments
 (0)