Skip to content

Commit 1371153

Browse files
committed
fix: Remove fifo queues
1 parent bfc4e79 commit 1371153

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

examples/default/main.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ module "runners" {
8484
delay_webhook_event = 5
8585
runners_maximum_count = 2
8686

87-
# set up a fifo queue to remain order
88-
enable_fifo_build_queue = true
89-
9087
# override scaling down
9188
scale_down_schedule_expression = "cron(* * * * ? *)"
9289

main.tf

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,11 @@ resource "aws_sqs_queue_policy" "build_queue_policy" {
5353
}
5454

5555
resource "aws_sqs_queue" "queued_builds" {
56-
name = "${var.prefix}-queued-builds"
57-
delay_seconds = var.delay_webhook_event
58-
visibility_timeout_seconds = var.runners_scale_up_lambda_timeout
59-
message_retention_seconds = var.job_queue_retention_in_seconds
60-
fifo_queue = var.enable_fifo_build_queue
61-
receive_wait_time_seconds = 0
62-
content_based_deduplication = var.enable_fifo_build_queue
56+
name = "${var.prefix}-queued-builds"
57+
delay_seconds = var.delay_webhook_event
58+
visibility_timeout_seconds = var.runners_scale_up_lambda_timeout
59+
message_retention_seconds = var.job_queue_retention_in_seconds
60+
receive_wait_time_seconds = 0
6361
redrive_policy = var.redrive_build_queue.enabled ? jsonencode({
6462
deadLetterTargetArn = aws_sqs_queue.queued_builds_dlq[0].arn,
6563
maxReceiveCount = var.redrive_build_queue.maxReceiveCount
@@ -85,7 +83,6 @@ resource "aws_sqs_queue" "queued_builds_dlq" {
8583
sqs_managed_sse_enabled = var.queue_encryption.sqs_managed_sse_enabled
8684
kms_master_key_id = var.queue_encryption.kms_master_key_id
8785
kms_data_key_reuse_period_seconds = var.queue_encryption.kms_data_key_reuse_period_seconds
88-
fifo_queue = var.enable_fifo_build_queue
8986
tags = var.tags
9087
}
9188

variables.tf

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -640,17 +640,6 @@ variable "lambda_principals" {
640640
default = []
641641
}
642642

643-
variable "enable_fifo_build_queue" {
644-
description = "(FEATURE REMOVED) Enable a FIFO queue to keep the order of events received by the webhook. Recommended for repo level runners."
645-
type = bool
646-
default = false
647-
648-
validation {
649-
condition = var.enable_fifo_build_queue == false
650-
error_message = "The feature for FIFO build queue is not supported anymore."
651-
}
652-
}
653-
654643
variable "redrive_build_queue" {
655644
description = "Set options to attach (optional) a dead letter queue to the build queue, the queue between the webhook and the scale up lambda. You have the following options. 1. Disable by setting `enabled` to false. 2. Enable by setting `enabled` to `true`, `maxReceiveCount` to a number of max retries."
656645
type = object({

0 commit comments

Comments
 (0)