fix(multi-runner): Create DLQ only if requested (#2903)

mariusfilipowski · web-flow · commit 3d3374471581 · 2023-02-10T11:49:55.000+01:00
diff --git a/modules/multi-runner/queues.tf b/modules/multi-runner/queues.tf
@@ -55,7 +55,7 @@ resource "aws_sqs_queue_policy" "build_queue_policy" {
 }
 
 resource "aws_sqs_queue" "queued_builds_dlq" {
-  for_each = var.multi_runner_config
+  for_each = { for config, values in var.multi_runner_config : config => values if values.redrive_build_queue.enabled }
   name     = "${var.prefix}-${each.key}-queued-builds_dead_letter${each.value.fifo ? ".fifo" : ""}"
 
   sqs_managed_sse_enabled           = var.queue_encryption.sqs_managed_sse_enabled
@@ -66,7 +66,7 @@ resource "aws_sqs_queue" "queued_builds_dlq" {
 }
 
 resource "aws_sqs_queue_policy" "build_queue_dlq_policy" {
-  for_each  = var.multi_runner_config
+  for_each  = { for config, values in var.multi_runner_config : config => values if values.redrive_build_queue.enabled }
   queue_url = aws_sqs_queue.queued_builds_dlq[each.key].id
   policy    = data.aws_iam_policy_document.deny_unsecure_transport.json
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ resource "aws_sqs_queue_policy" "build_queue_policy" {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`resource "aws_sqs_queue" "queued_builds_dlq" {`
`58`		`- for_each = var.multi_runner_config`
	`58`	`+ for_each = { for config, values in var.multi_runner_config : config => values if values.redrive_build_queue.enabled }`
`59`	`59`	`name = "${var.prefix}-${each.key}-queued-builds_dead_letter${each.value.fifo ? ".fifo" : ""}"`
`60`	`60`
`61`	`61`	`sqs_managed_sse_enabled = var.queue_encryption.sqs_managed_sse_enabled`
`@@ -66,7 +66,7 @@ resource "aws_sqs_queue" "queued_builds_dlq" {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`resource "aws_sqs_queue_policy" "build_queue_dlq_policy" {`
`69`		`- for_each = var.multi_runner_config`
	`69`	`+ for_each = { for config, values in var.multi_runner_config : config => values if values.redrive_build_queue.enabled }`
`70`	`70`	`queue_url = aws_sqs_queue.queued_builds_dlq[each.key].id`
`71`	`71`	`policy = data.aws_iam_policy_document.deny_unsecure_transport.json`
`72`	`72`	`}`