Merge pull request #1538 from ministryofjustice/MLPAB-2539-backup-pla…

…n-fix MLPAB-2539 - Fix backup plans on path to live
ministryofjustice · Oct 8, 2024 · ce4bbeb · ce4bbeb
2 parents 41a1c15 + 42b22a8
commit ce4bbeb
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 7 deletions.
diff --git a/terraform/account/backup_vaults.tf b/terraform/account/backup_vaults.tf
@@ -0,0 +1,15 @@
+module "aws_backup_vaults_eu_west_1" {
+  source = "./modules/aws_backup_vault"
+  providers = {
+    aws.region = aws.eu_west_1
+    aws.global = aws.global
+  }
+}
+
+module "aws_backup_vaults_eu_west_2" {
+  source = "./modules/aws_backup_vault"
+  providers = {
+    aws.region = aws.eu_west_2
+    aws.global = aws.global
+  }
+}
diff --git a/.../modules/aws_backup_vault/data_sources.tf → .../modules/aws_backup_vault/data_sources.tf b/.../modules/aws_backup_vault/data_sources.tf → .../modules/aws_backup_vault/data_sources.tf
diff --git a/...t/region/modules/aws_backup_vault/main.tf → .../account/modules/aws_backup_vault/main.tf b/...t/region/modules/aws_backup_vault/main.tf → .../account/modules/aws_backup_vault/main.tf
diff --git a/...gion/modules/aws_backup_vault/versions.tf → ...ount/modules/aws_backup_vault/versions.tf b/...gion/modules/aws_backup_vault/versions.tf → ...ount/modules/aws_backup_vault/versions.tf
diff --git a/terraform/account/refactoring.tf b/terraform/account/refactoring.tf
@@ -174,3 +174,23 @@ moved {
   from = aws_backup_vault.eu_west_1
   to   = module.eu_west_1[0].module.aws_backup_vaults.aws_backup_vault.main
 }
+
+moved {
+  from = module.eu_west_1[0].module.aws_backup_vaults.aws_backup_vault.main
+  to   = module.aws_backup_vaults_eu_west_1.aws_backup_vault.main
+}
+
+moved {
+  from = module.eu_west_1[0].module.aws_backup_vaults.aws_backup_vault_notifications.aws_backup_failure_events
+  to   = module.aws_backup_vaults_eu_west_1.aws_backup_vault_notifications.aws_backup_failure_events
+}
+
+moved {
+  from = module.eu_west_1[0].module.aws_backup_vaults.aws_sns_topic.aws_backup_failure_events
+  to   = module.aws_backup_vaults_eu_west_1.aws_sns_topic.aws_backup_failure_events
+}
+
+moved {
+  from = module.eu_west_1[0].module.aws_backup_vaults.aws_sns_topic_policy.aws_backup_failure_events
+  to   = module.aws_backup_vaults_eu_west_1.aws_sns_topic_policy.aws_backup_failure_events
+}
diff --git a/terraform/account/region/backup_vaults.tf b/terraform/account/region/backup_vaults.tf