Skip to content

Commit 0a8c85c

Browse files
npalmnpalm
authored
Merge pull request #2162 from philips-labs/develop
chore: Release
2 parents a75b4ad + b4dc706 commit 0a8c85c

File tree

8 files changed

+69
-68
lines changed

8 files changed

+69
-68
lines changed

‎modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
"@octokit/rest": "^18.12.0",
1919
"@trivago/prettier-plugin-sort-imports": "^3.2.0",
2020
"@types/jest": "^27.5.0",
21-
"@types/node": "^17.0.41",
21+
"@types/node": "^17.0.42",
2222
"@types/request": "^2.48.8",
2323
"@typescript-eslint/eslint-plugin": "^4.33.0",
2424
"@typescript-eslint/parser": "^4.33.0",
2525
"@vercel/ncc": "^0.34.0",
26-
"aws-sdk": "^2.1151.0",
26+
"aws-sdk": "^2.1153.0",
2727
"eslint": "^7.32.0",
2828
"eslint-plugin-prettier": "4.0.0",
2929
"jest": "^27.5.1",
30-
"jest-mock": "^28.1.0",
30+
"jest-mock": "^28.1.1",
3131
"prettier": "2.6.2",
3232
"ts-jest": "^27.1.4",
3333
"ts-node-dev": "^2.0.0",

‎modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/yarn.lock

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -611,10 +611,10 @@
611611
"@types/yargs" "^16.0.0"
612612
chalk "^4.0.0"
613613

614-
"@jest/types@^28.1.0":
615-
version "28.1.0"
616-
resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.0.tgz#508327a89976cbf9bd3e1cc74641a29fd7dfd519"
617-
integrity sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==
614+
"@jest/types@^28.1.1":
615+
version "28.1.1"
616+
resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.1.tgz#d059bbc80e6da6eda9f081f293299348bd78ee0b"
617+
integrity sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==
618618
dependencies:
619619
"@jest/schemas" "^28.0.2"
620620
"@types/istanbul-lib-coverage" "^2.0.0"
@@ -897,10 +897,10 @@
897897
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
898898
integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
899899

900-
"@types/node@*", "@types/node@^17.0.41":
901-
version "17.0.41"
902-
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.41.tgz#1607b2fd3da014ae5d4d1b31bc792a39348dfb9b"
903-
integrity sha512-xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw==
900+
"@types/node@*", "@types/node@^17.0.42":
901+
version "17.0.42"
902+
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.42.tgz#d7e8f22700efc94d125103075c074396b5f41f9b"
903+
integrity sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ==
904904

905905
"@types/prettier@^2.1.5":
906906
version "2.4.2"
@@ -1172,10 +1172,10 @@ asynckit@^0.4.0:
11721172
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
11731173
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
11741174

1175-
aws-sdk@^2.1151.0:
1176-
version "2.1151.0"
1177-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1151.0.tgz#8fcb41c3b919842a7b4e5c4cd9e124f6439b5b67"
1178-
integrity sha512-VvyzXAmWrX+klvwzA+9gSTY7blDnZOTl0UTKrqmFL4K7tOLieGLYTUkpUegcPxCjYgEg7JwvYolYUnUKiHa4oA==
1175+
aws-sdk@^2.1153.0:
1176+
version "2.1153.0"
1177+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1153.0.tgz#63394dff05166d12d29594beda909e85897aa56d"
1178+
integrity sha512-afuYFy5jc2eQ7fGL6bsMiDGJ74nSvQyCWwQ0j3lJp+9BbMCxqc03lozWh3W07tknr4xmL+5YhfkmViNLoz2huA==
11791179
dependencies:
11801180
buffer "4.9.2"
11811181
events "1.1.1"
@@ -2467,12 +2467,12 @@ jest-mock@^27.5.1:
24672467
"@jest/types" "^27.5.1"
24682468
"@types/node" "*"
24692469

2470-
jest-mock@^28.1.0:
2471-
version "28.1.0"
2472-
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.0.tgz#ccc7cc12a9b330b3182db0c651edc90d163ff73e"
2473-
integrity sha512-H7BrhggNn77WhdL7O1apG0Q/iwl0Bdd5E1ydhCJzL3oBLh/UYxAwR3EJLsBZ9XA3ZU4PA3UNw4tQjduBTCTmLw==
2470+
jest-mock@^28.1.1:
2471+
version "28.1.1"
2472+
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.1.tgz#37903d269427fa1ef5b2447be874e1c62a39a371"
2473+
integrity sha512-bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw==
24742474
dependencies:
2475-
"@jest/types" "^28.1.0"
2475+
"@jest/types" "^28.1.1"
24762476
"@types/node" "*"
24772477

24782478
jest-pnp-resolver@^1.2.2:

‎modules/runner-binaries-syncer/policies/lambda-syncer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"Action": [
77
"s3:GetObjectTagging",
88
"s3:GetObjectVersionTagging",
9-
"s3:PutObject*",
10-
"s3:RequestObjectTag*"
9+
"s3:PutObject",
10+
"s3:PutObjectTagging"
1111
],
1212
"Resource": ["${s3_resource_arn}"]
1313
}

‎modules/runner-binaries-syncer/runner-binaries-syncer.tf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ resource "aws_lambda_function" "syncer" {
4848

4949
resource "aws_iam_role_policy" "lambda_kms" {
5050
count = try(var.server_side_encryption_configuration.rule.apply_server_side_encryption_by_default.kms_master_key_id, null) != null ? 1 : 0
51-
name = "${var.environment}-lambda-kms-policy-syncer"
51+
name = "${var.prefix}-lambda-kms-policy-syncer"
5252
role = aws_iam_role.syncer_lambda.id
5353

5454
policy = templatefile("${path.module}/policies/lambda-kms.json", {
@@ -134,10 +134,11 @@ resource "aws_lambda_permission" "syncer" {
134134
###################################################################################
135135

136136
resource "aws_s3_object" "trigger" {
137-
bucket = aws_s3_bucket.action_dist.id
138-
key = "triggers/${aws_lambda_function.syncer.id}-trigger.json"
139-
source = "${path.module}/trigger.json"
140-
etag = filemd5("${path.module}/trigger.json")
137+
bucket = aws_s3_bucket.action_dist.id
138+
key = "triggers/${aws_lambda_function.syncer.id}-trigger.json"
139+
source = "${path.module}/trigger.json"
140+
etag = try(var.server_side_encryption_configuration.rule.apply_server_side_encryption_by_default.kms_master_key_id, null) == null ? filemd5("${path.module}/trigger.json") : null
141+
kms_key_id = try(var.server_side_encryption_configuration.rule.apply_server_side_encryption_by_default.kms_master_key_id, null)
141142

142143
depends_on = [aws_s3_bucket_notification.on_deploy]
143144
}

‎modules/runners/lambdas/runners/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"devDependencies": {
1919
"@trivago/prettier-plugin-sort-imports": "^3.2.0",
20-
"@types/aws-lambda": "^8.10.99",
20+
"@types/aws-lambda": "^8.10.100",
2121
"@types/express": "^4.17.11",
2222
"@types/jest": "^27.5.0",
2323
"@typescript-eslint/eslint-plugin": "^4.33.0",
@@ -40,10 +40,10 @@
4040
"@octokit/auth-app": "3.6.1",
4141
"@octokit/rest": "^18.12.0",
4242
"@octokit/types": "^6.34.0",
43-
"@types/aws-lambda": "^8.10.99",
43+
"@types/aws-lambda": "^8.10.100",
4444
"@types/express": "^4.17.11",
45-
"@types/node": "^17.0.41",
46-
"aws-sdk": "^2.1151.0",
45+
"@types/node": "^17.0.42",
46+
"aws-sdk": "^2.1153.0",
4747
"cron-parser": "^4.4.0",
4848
"tslog": "^3.3.3",
4949
"typescript": "^4.7.3"

‎modules/runners/lambdas/runners/yarn.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,10 +1498,10 @@
14981498
resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
14991499
integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
15001500

1501-
"@types/aws-lambda@^8.10.99":
1502-
version "8.10.99"
1503-
resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.99.tgz#14fb91e5ee54d517f5b3209b027edddee9900ba6"
1504-
integrity sha512-BLlr4HGGF9Ga5vvZumpuXuyFUIhnCZsOdjPWy/iCJi+NIYAw30jA3XC5tyVf2RfaXm5thMR2SC3DosDVIMhM5g==
1501+
"@types/aws-lambda@^8.10.100":
1502+
version "8.10.100"
1503+
resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.100.tgz#31442a71c09e0ef08e41b7342d62cf374fa268df"
1504+
integrity sha512-Qldp1LhbgQ4tEHewci0/q5qVRaDr8ylvsYfpitJ+FFixzAHpgitvM2NM449uYWt2tYo/iJy25aSRRUVvwIT+ng==
15051505

15061506
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
15071507
version "7.1.18"
@@ -1631,10 +1631,10 @@
16311631
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
16321632
integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
16331633

1634-
"@types/node@*", "@types/node@^17.0.41":
1635-
version "17.0.41"
1636-
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.41.tgz#1607b2fd3da014ae5d4d1b31bc792a39348dfb9b"
1637-
integrity sha512-xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw==
1634+
"@types/node@*", "@types/node@^17.0.42":
1635+
version "17.0.42"
1636+
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.42.tgz#d7e8f22700efc94d125103075c074396b5f41f9b"
1637+
integrity sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ==
16381638

16391639
"@types/prettier@^2.1.5":
16401640
version "2.4.3"
@@ -1904,10 +1904,10 @@ asynckit@^0.4.0:
19041904
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
19051905
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
19061906

1907-
aws-sdk@^2.1151.0:
1908-
version "2.1151.0"
1909-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1151.0.tgz#8fcb41c3b919842a7b4e5c4cd9e124f6439b5b67"
1910-
integrity sha512-VvyzXAmWrX+klvwzA+9gSTY7blDnZOTl0UTKrqmFL4K7tOLieGLYTUkpUegcPxCjYgEg7JwvYolYUnUKiHa4oA==
1907+
aws-sdk@^2.1153.0:
1908+
version "2.1153.0"
1909+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1153.0.tgz#63394dff05166d12d29594beda909e85897aa56d"
1910+
integrity sha512-afuYFy5jc2eQ7fGL6bsMiDGJ74nSvQyCWwQ0j3lJp+9BbMCxqc03lozWh3W07tknr4xmL+5YhfkmViNLoz2huA==
19111911
dependencies:
19121912
buffer "4.9.2"
19131913
events "1.1.1"

‎modules/webhook/lambdas/webhook/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
"devDependencies": {
1919
"@octokit/webhooks-definitions": "^3.67.3",
2020
"@trivago/prettier-plugin-sort-imports": "^3.2.0",
21-
"@types/aws-lambda": "^8.10.99",
21+
"@types/aws-lambda": "^8.10.100",
2222
"@types/express": "^4.17.11",
2323
"@types/jest": "^27.5.0",
24-
"@types/node": "^17.0.41",
24+
"@types/node": "^17.0.42",
2525
"@typescript-eslint/eslint-plugin": "^4.33.0",
2626
"@typescript-eslint/parser": "^4.33.0",
2727
"@vercel/ncc": "0.34.0",
28-
"aws-sdk": "^2.1151.0",
28+
"aws-sdk": "^2.1153.0",
2929
"body-parser": "^1.20.0",
3030
"eslint": "^7.32.0",
3131
"eslint-plugin-prettier": "4.0.0",
@@ -41,7 +41,7 @@
4141
"dependencies": {
4242
"@aws-sdk/client-ssm": "^3.105.0",
4343
"@octokit/rest": "^18.12.0",
44-
"@octokit/webhooks": "^9.25.0",
44+
"@octokit/webhooks": "^9.26.0",
4545
"aws-lambda": "^1.0.7",
4646
"tslog": "^3.3.3"
4747
}

‎modules/webhook/lambdas/webhook/yarn.lock

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,19 +1417,19 @@
14171417
resolved "https://registry.yarnpkg.com/@octokit/webhooks-methods/-/webhooks-methods-2.0.0.tgz#1108b9ea661ca6c81e4a8bfa63a09eb27d5bc2db"
14181418
integrity sha512-35cfQ4YWlnZnmZKmIxlGPUPLtbkF8lr/A/1Sk1eC0ddLMwQN06dOuLc+dI3YLQS+T+MoNt3DIQ0NynwgKPilig==
14191419

1420-
"@octokit/webhooks-types@5.7.1":
1421-
version "5.7.1"
1422-
resolved "https://registry.yarnpkg.com/@octokit/webhooks-types/-/webhooks-types-5.7.1.tgz#26452dcd72fa77ac85bb188fda2a5980eb292932"
1423-
integrity sha512-zabCzfWvvquxDzj1lU7GhJQteACGfGXnHfROJD4A7LKhRjlkaggoSkE5cWQJJ6nW2t/UI51dSFrEA+A4mhqfPw==
1420+
"@octokit/webhooks-types@5.8.0":
1421+
version "5.8.0"
1422+
resolved "https://registry.yarnpkg.com/@octokit/webhooks-types/-/webhooks-types-5.8.0.tgz#b76d1a3e3ad82cec5680d3c6c3443a620047a6ef"
1423+
integrity sha512-8adktjIb76A7viIdayQSFuBEwOzwhDC+9yxZpKNHjfzrlostHCw0/N7JWpWMObfElwvJMk2fY2l1noENCk9wmw==
14241424

1425-
"@octokit/webhooks@^9.25.0":
1426-
version "9.25.0"
1427-
resolved "https://registry.yarnpkg.com/@octokit/webhooks/-/webhooks-9.25.0.tgz#f1bd7815af59fb37892b87c86d2cb8625a570e9a"
1428-
integrity sha512-pyCraAmxHSnfTMe4K+QnNH/nSCJolCc++J2SAfYBwPFm6gg2WTGxWuegzuHul+Xm71+V9qL2NhIXX48U7MvTIA==
1425+
"@octokit/webhooks@^9.26.0":
1426+
version "9.26.0"
1427+
resolved "https://registry.yarnpkg.com/@octokit/webhooks/-/webhooks-9.26.0.tgz#cf453bb313da3b66f1a90c84464d978e1c625cce"
1428+
integrity sha512-foZlsgrTDwAmD5j2Czn6ji10lbWjGDVsUxTIydjG9KTkAWKJrFapXJgO5SbGxRwfPd3OJdhK3nA2YPqVhxLXqA==
14291429
dependencies:
14301430
"@octokit/request-error" "^2.0.2"
14311431
"@octokit/webhooks-methods" "^2.0.0"
1432-
"@octokit/webhooks-types" "5.7.1"
1432+
"@octokit/webhooks-types" "5.8.0"
14331433
aggregate-error "^3.1.0"
14341434

14351435
"@sinclair/typebox@^0.23.3":
@@ -1489,10 +1489,10 @@
14891489
resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
14901490
integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
14911491

1492-
"@types/aws-lambda@^8.10.99":
1493-
version "8.10.99"
1494-
resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.99.tgz#14fb91e5ee54d517f5b3209b027edddee9900ba6"
1495-
integrity sha512-BLlr4HGGF9Ga5vvZumpuXuyFUIhnCZsOdjPWy/iCJi+NIYAw30jA3XC5tyVf2RfaXm5thMR2SC3DosDVIMhM5g==
1492+
"@types/aws-lambda@^8.10.100":
1493+
version "8.10.100"
1494+
resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.100.tgz#31442a71c09e0ef08e41b7342d62cf374fa268df"
1495+
integrity sha512-Qldp1LhbgQ4tEHewci0/q5qVRaDr8ylvsYfpitJ+FFixzAHpgitvM2NM449uYWt2tYo/iJy25aSRRUVvwIT+ng==
14961496

14971497
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
14981498
version "7.1.16"
@@ -1605,10 +1605,10 @@
16051605
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
16061606
integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
16071607

1608-
"@types/node@*", "@types/node@^17.0.41":
1609-
version "17.0.41"
1610-
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.41.tgz#1607b2fd3da014ae5d4d1b31bc792a39348dfb9b"
1611-
integrity sha512-xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw==
1608+
"@types/node@*", "@types/node@^17.0.42":
1609+
version "17.0.42"
1610+
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.42.tgz#d7e8f22700efc94d125103075c074396b5f41f9b"
1611+
integrity sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ==
16121612

16131613
"@types/prettier@^2.1.5":
16141614
version "2.4.1"
@@ -1914,10 +1914,10 @@ aws-lambda@^1.0.7:
19141914
js-yaml "^3.14.1"
19151915
watchpack "^2.0.0-beta.10"
19161916

1917-
aws-sdk@^2.1151.0, aws-sdk@^2.814.0:
1918-
version "2.1151.0"
1919-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1151.0.tgz#8fcb41c3b919842a7b4e5c4cd9e124f6439b5b67"
1920-
integrity sha512-VvyzXAmWrX+klvwzA+9gSTY7blDnZOTl0UTKrqmFL4K7tOLieGLYTUkpUegcPxCjYgEg7JwvYolYUnUKiHa4oA==
1917+
aws-sdk@^2.1153.0, aws-sdk@^2.814.0:
1918+
version "2.1153.0"
1919+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1153.0.tgz#63394dff05166d12d29594beda909e85897aa56d"
1920+
integrity sha512-afuYFy5jc2eQ7fGL6bsMiDGJ74nSvQyCWwQ0j3lJp+9BbMCxqc03lozWh3W07tknr4xmL+5YhfkmViNLoz2huA==
19211921
dependencies:
19221922
buffer "4.9.2"
19231923
events "1.1.1"

0 commit comments

Comments
 (0)