fix: webhook labels for workflow_job (#1133)

* fix: pass runner labels to webhook as json array * fix: log runner labels properly in webhook
philips-labs · Aug 26, 2021 · 4b39fb9 · 4b39fb9 · russmac · Aug 28, 2021
1 parent 03165d1
commit 4b39fb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/webhook/lambdas/webhook/src/webhook/handler.ts b/modules/webhook/lambdas/webhook/src/webhook/handler.ts
@@ -131,8 +131,8 @@ function isRunnerNotAllowed(job: WorkflowJob): boolean {
 
   console.debug(
     `Received workflow job event with labels: '${JSON.stringify(job.workflow_job.labels)}'. The event does ${
-      runnerMatch ? '' : 'NOT'
-    } match the configured labels: '${JSON.stringify(runnerLabels)}'`,
+      runnerMatch ? '' : 'NOT '
+    }match the configured labels: '${Array.from(runnerLabels).join(',')}'`,
   );
   return !runnerMatch;
 }
diff --git a/modules/webhook/webhook.tf b/modules/webhook/webhook.tf
@@ -15,7 +15,7 @@ resource "aws_lambda_function" "webhook" {
       ENVIRONMENT           = var.environment
       SQS_URL_WEBHOOK       = var.sqs_build_queue.id
       REPOSITORY_WHITE_LIST = jsonencode(var.repository_white_list)
-      RUNNER_LABELS         = jsonencode(var.runner_extra_labels)
+      RUNNER_LABELS         = jsonencode(split(",", var.runner_extra_labels))
     }
   }