Skip to content

fix: remove cross-variable validation that broke tonumber("latest") #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LorisFriedel merged 1 commit into from
Apr 2, 2026
Merged

fix: remove cross-variable validation that broke tonumber("latest") #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ For complete usage examples demonstrating different configuration scenarios, see
| dd_max_workers | Max concurrent workers | `string` | `null` |
| dd_log_level | Log level | `string` | `null` |
| dd_store_failed_events | Store failed events in S3 | `bool` | `null` |
| dd_sqs_queue_url | SQS queue URL for failed event storage (takes priority over S3 when set, auto-enables `dd_store_failed_events`) | `string` | `null` |
| dd_sqs_queue_url | SQS queue URL for failed event storage (requires layer version >= 97; takes priority over S3 when set, auto-enables `dd_store_failed_events`) | `string` | `null` |
| dd_schedule_retry_failed_events | Periodically retry failed events (via AWS EventBridge) | `bool` | `null` |
| dd_schedule_retry_interval | Retry interval in hours for failed events | `number` | `6` |
| dd_forwarder_bucket_name | Custom S3 bucket name | `string` | `null` |
Expand Down
32 changes: 0 additions & 32 deletions tests/sqs_failed_events.tftest.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,38 +182,6 @@ run "s3_fallback_unchanged" {
}
}

# Test: SQS with old layer version fails validation
run "sqs_with_old_layer_version_fails" {
command = plan

variables {
dd_api_key = "test-api-key-value"
dd_site = "datadoghq.com"
dd_sqs_queue_url = "https://sqs.us-east-1.amazonaws.com/123456789012/my-failed-events-queue"
layer_version = "96"
}

expect_failures = [
var.dd_sqs_queue_url,
]
}

# Test: SQS with layer version 97 succeeds
run "sqs_with_layer_version_97" {
command = plan

variables {
dd_api_key = "test-api-key-value"
dd_site = "datadoghq.com"
dd_sqs_queue_url = "https://sqs.us-east-1.amazonaws.com/123456789012/my-failed-events-queue"
layer_version = "97"
}

assert {
condition = aws_lambda_function.forwarder.environment[0].variables.DD_SQS_QUEUE_URL == "https://sqs.us-east-1.amazonaws.com/123456789012/my-failed-events-queue"
error_message = "DD_SQS_QUEUE_URL should be set with layer version 97"
}
}

# Test: IAM SQS permissions are included when dd_sqs_queue_url is set
run "iam_sqs_permissions" {
Expand Down
5 changes: 0 additions & 5 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,11 +460,6 @@ variable "dd_sqs_queue_url" {
condition = var.dd_sqs_queue_url == null || can(regex("^https://sqs\\.[a-z0-9-]+\\.amazonaws\\.com[a-z.]*/[0-9]{12}/[a-zA-Z0-9_.-]+$", var.dd_sqs_queue_url))
error_message = "dd_sqs_queue_url must be a valid SQS queue URL (e.g. https://sqs.us-east-1.amazonaws.com/123456789012/my-queue)."
}

validation {
condition = var.dd_sqs_queue_url == null || var.layer_version == "latest" || (can(tonumber(var.layer_version)) && tonumber(var.layer_version) >= 97)
error_message = "dd_sqs_queue_url requires forwarder layer version >= 97 (forwarder 5.3.0+). Set layer_version = \"latest\" or a version >= 97."
}
}

variable "dd_schedule_retry_failed_events" {
Expand Down
Loading