From 985521136a5d86b835023a3b9b046659096b5e77 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:27:44 +0800
Subject: [PATCH 1/3] remove duplicate variable entry in email-service task
 definition

---
 terraform/031-email-service/task-definition-cron.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/terraform/031-email-service/task-definition-cron.json b/terraform/031-email-service/task-definition-cron.json
index 22ab7e6..6c956e0 100644
--- a/terraform/031-email-service/task-definition-cron.json
+++ b/terraform/031-email-service/task-definition-cron.json
@@ -19,10 +19,6 @@
         "name": "APP_ID",
         "value": "${appconfig_app_id}"
       },
-      {
-        "name": "AWS_REGION",
-        "value": "${aws_region}"
-      },
       {
         "name": "ENV_ID",
         "value": "${appconfig_env_id}"

From ad183693d1ba3d6e3fa9c38137fc03098da48245 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:42:34 +0800
Subject: [PATCH 2/3] change the SNS topic name to avoid collision

---
 terraform/032-db-backup/main.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/terraform/032-db-backup/main.tf b/terraform/032-db-backup/main.tf
index 07d43e2..97316c9 100644
--- a/terraform/032-db-backup/main.tf
+++ b/terraform/032-db-backup/main.tf
@@ -214,6 +214,7 @@ module "aws_backup" {
   source_arns         = [data.aws_db_instance.this.db_instance_arn]
   backup_schedule     = "cron(${var.aws_backup_cron_schedule})"
   notification_events = var.aws_backup_notification_events
+  sns_topic_name      = "${var.idp_name}-backup-vault-events"
 }
 
 data "aws_db_instance" "this" {

From b8f558566ed23e4a84f61eba7c689b93c57b7b9b Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:47:38 +0800
Subject: [PATCH 3/3] use idp_name instead of app_name to avoid naming
 collisions

---
 terraform/032-db-backup/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/032-db-backup/main.tf b/terraform/032-db-backup/main.tf
index 97316c9..c780375 100644
--- a/terraform/032-db-backup/main.tf
+++ b/terraform/032-db-backup/main.tf
@@ -209,7 +209,7 @@ module "aws_backup" {
   source  = "silinternational/backup/aws"
   version = "0.1.0"
 
-  app_name            = var.app_name
+  app_name            = var.idp_name
   app_env             = var.app_env
   source_arns         = [data.aws_db_instance.this.db_instance_arn]
   backup_schedule     = "cron(${var.aws_backup_cron_schedule})"