Merge branch 'develop' into mcaulifn/app-tag

Author: mcaulifn

main.tf

@@ -9,6 +9,7 @@ locals {
   }
 
   default_runner_labels = "self-hosted,${var.runner_os},${var.runner_architecture}"
+  runner_labels         = var.runner_extra_labels != "" ? "${local.default_runner_labels},${var.runner_extra_labels}" : local.default_runner_labels
 }
 
 resource "random_string" "random" {
@@ -145,11 +146,10 @@ module "webhook" {
   # labels
   enable_workflow_job_labels_check = var.runner_enable_workflow_job_labels_check
   workflow_job_labels_check_all    = var.runner_enable_workflow_job_labels_check_all
-  runner_labels                    = var.runner_extra_labels != "" ? "${local.default_runner_labels},${var.runner_extra_labels}" : local.default_runner_labels
-
-  role_path                 = var.role_path
-  role_permissions_boundary = var.role_permissions_boundary
-  repository_white_list     = var.repository_white_list
+  runner_labels                    = local.runner_labels
+  role_path                        = var.role_path
+  role_permissions_boundary        = var.role_permissions_boundary
+  repository_white_list            = var.repository_white_list
 
   log_type  = var.log_type
   log_level = var.log_level

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

@@ -17,17 +17,17 @@
   "devDependencies": {
     "@octokit/rest": "^19.0.5",
     "@trivago/prettier-plugin-sort-imports": "^3.4.0",
-    "@types/jest": "^29.2.2",
+    "@types/jest": "^29.2.3",
     "@types/node": "^18.11.9",
     "@types/request": "^2.48.8",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "@vercel/ncc": "^0.34.0",
-    "aws-sdk": "^2.1250.0",
+    "aws-sdk": "^2.1256.0",
     "eslint": "^7.32.0",
     "eslint-plugin-prettier": "4.2.1",
     "jest": "^29.3",
-    "jest-mock": "^29.3.0",
+    "jest-mock": "^29.3.1",
     "prettier": "2.7.1",
     "ts-jest": "^29.0.3",
     "ts-node-dev": "^2.0.0",