Skip to content

CCM-19812: Fix eventpub queue names #224

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

Open
simonlabarere wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CCM-19812: Fix eventpub queue names #224

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
1 change: 0 additions & 1 deletion infrastructure/terraform/modules/eventpub/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@

| Name | Description |
|------|-------------|
| <a name="output_dlq"></a> [dlq](#output\_dlq) | EventPub DLQ name and ARN |
| <a name="output_publishing_anomaly_alarm"></a> [publishing\_anomaly\_alarm](#output\_publishing\_anomaly\_alarm) | CloudWatch anomaly detection alarm details for SNS publishing |
| <a name="output_s3_bucket_event_cache"></a> [s3\_bucket\_event\_cache](#output\_s3\_bucket\_event\_cache) | S3 Bucket ARN and Name for event cache |
| <a name="output_sns_topic"></a> [sns\_topic](#output\_sns\_topic) | SNS Topic ARN and Name |
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/terraform/modules/eventpub/cloudwatch_metric_alarm_dlq_alarm.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ resource "aws_cloudwatch_metric_alarm" "dlq_alarm" {
treat_missing_data = "notBreaching"

dimensions = {
QueueName = aws_sqs_queue.dlq.name
QueueName = module.sqs_queue.sqs_dlq_name
}
}
2 changes: 1 addition & 1 deletion infrastructure/terraform/modules/eventpub/iam_role_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ data "aws_iam_policy_document" "lambda" {
]

resources = [
aws_sqs_queue.dlq.arn
module.sqs_queue.sqs_dlq_arn
]
}

Expand Down
2 changes: 1 addition & 1 deletion infrastructure/terraform/modules/eventpub/lambda_function.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resource "aws_lambda_function" "main" {
variables = {
DATA_PLANE_EVENT_BUS_ARN = var.data_plane_bus_arn
CONTROL_PLANE_EVENT_BUS_ARN = var.control_plane_bus_arn
DLQ_URL = aws_sqs_queue.dlq.url
DLQ_URL = module.sqs_queue.sqs_dlq_url
THROTTLE_DELAY_MS = "0"
}
}
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/terraform/modules/eventpub/module_sqs_queue.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module "sqs_queue" {
environment = var.environment
project = var.project
region = var.region
name = local.csi
name = var.name
create_dlq = true
sqs_kms_key_arn = var.kms_key_arn
sqs_policy_overload = data.aws_iam_policy_document.allow_sns_send.json
Expand Down
8 changes: 0 additions & 8 deletions infrastructure/terraform/modules/eventpub/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ output "sns_topic" {
}
}

output "dlq" {
description = "EventPub DLQ name and ARN"
value = {
arn = aws_sqs_queue.dlq.arn
name = aws_sqs_queue.dlq.name
}
}

output "sqs_queue" {
description = "EventPub SQS queue name, ARN, and DLQ details"
value = {
Expand Down
7 changes: 0 additions & 7 deletions infrastructure/terraform/modules/eventpub/sqs_queue_dlq.tf
View file
Open in desktop

This file was deleted.