From 3875196e0a0b8c2d16348f5fc76b27307378227f Mon Sep 17 00:00:00 2001 From: Rizbi Hassan Date: Tue, 27 Feb 2024 10:22:06 -0600 Subject: [PATCH 1/3] added prefix to SNS topics --- modules/sqs/main.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/sqs/main.tf b/modules/sqs/main.tf index 215bf025b..b484cc354 100644 --- a/modules/sqs/main.tf +++ b/modules/sqs/main.tf @@ -175,7 +175,7 @@ resource "aws_cloudwatch_metric_alarm" "archive_recovery_deadletter_alarm" { # SNS topic needed for cloudwatch alarm resource "aws_sns_topic" "archive_recovery_dlq_alarm" { - name = "archive_recovery_dlq_alarm_topic" + name = "${var.prefix}-archive_recovery_dlq_alarm_topic" kms_master_key_id = "alias/aws/sns" tags = var.tags @@ -279,7 +279,7 @@ resource "aws_cloudwatch_metric_alarm" "internal_report_deadletter_alarm" { # SNS topic needed for cloudwatch alarm resource "aws_sns_topic" "internal_report_dlq_alarm" { - name = "internal_report_dlq_alarm_topic" + name = "${var.prefix}-internal_report_dlq_alarm_topic" kms_master_key_id = "alias/aws/sns" tags = var.tags } @@ -393,7 +393,7 @@ resource "aws_cloudwatch_metric_alarm" "s3_inventory_deadletter_alarm" { # SNS topic needed for cloudwatch alarm resource "aws_sns_topic" "s3_inventory_dlq_alarm" { - name = "s3_inventory_dlq_alarm_topic" + name = "${var.prefix}-s3_inventory_dlq_alarm_topic" kms_master_key_id = "alias/aws/sns" tags = var.tags } @@ -481,7 +481,7 @@ resource "aws_cloudwatch_metric_alarm" "staged_recovery_deadletter_alarm" { # SNS topic needed for cloudwatch alarm resource "aws_sns_topic" "staged_recovery_dlq_alarm" { - name = "staged_recovery_dlq_alarm_topic" + name = "${var.prefix}-staged_recovery_dlq_alarm_topic" kms_master_key_id = "alias/aws/sns" tags = var.tags @@ -572,7 +572,7 @@ resource "aws_cloudwatch_metric_alarm" "status_update_deadletter_alarm" { # SNS topic needed for cloudwatch alarm resource "aws_sns_topic" "status_update_dlq_alarm" { - name = "status_update_dlq_alarm_topic" + name = "${var.prefix}-status_update_dlq_alarm_topic" kms_master_key_id = "alias/aws/sns" tags = var.tags } From 9dc3f3c4107a50bb24fd9b9e6c82b03ea32eb4b4 Mon Sep 17 00:00:00 2001 From: Rizbi Hassan Date: Wed, 28 Feb 2024 07:22:39 -0600 Subject: [PATCH 2/3] Updated changelog.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39da0828e..016c440c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,9 @@ If deployed correctly, the target group health checks should show as healthy. - *ORCA-441* - Updated policies for ORCA buckets and copy_to_archive to give them only the permissions needed to restrict unwanted/unintended actions. - *ORCA-746* - Enabled HTTPS listener in application load balancer for GraphQL server using AWS Certificate Manager. +- *ORCA-828* - Added prefix to ORCA SNS topic names to avoid `object already exists` errors. + + ### Deprecated From 515aa44308a25c99dd68f54b816aa6c60bddf098 Mon Sep 17 00:00:00 2001 From: rhassan Date: Wed, 28 Feb 2024 08:13:10 -0600 Subject: [PATCH 3/3] removed extra spaces --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 016c440c7..6f438200d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,9 +38,6 @@ If deployed correctly, the target group health checks should show as healthy. - *ORCA-746* - Enabled HTTPS listener in application load balancer for GraphQL server using AWS Certificate Manager. - *ORCA-828* - Added prefix to ORCA SNS topic names to avoid `object already exists` errors. - - - ### Deprecated ### Removed