Merge branch 'main' into date-1659358722

ministryofjustice · Aug 8, 2022 · d72e760 · d72e760
2 parents 12588a5 + ace4d02
commit d72e760
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/terraform/environments/nomis/application_variables.tf b/terraform/environments/nomis/application_variables.tf
@@ -65,20 +65,18 @@ locals {
           termination_protection = true
           oracle_sids            = ["T1CNMAUD"]
           tags = {
-            monitored = false // TODO: while the testing is going on to avoid alert spam
+            monitored = true
           }
         },
-        CNAUDT1DR = {
-          always_on              = true
-          restored_from_snapshot = true
-          ami_name               = "database-CNAUDT1-snapshot-20220803"
-          asm_data_capacity      = 200
-          asm_flash_capacity     = 2
-          description            = "Copy of Test NOMIS Audit database in Azure T1PDL0010, Restored from snapshot."
-          termination_protection = true
-          oracle_sids            = ["T1CNMAUD"]
+        CNOMT1TEST = {
+          always_on          = false
+          ami_name           = "nomis_db_STIG_CNOMT1-2022-04-21T11.33.39Z"
+          asm_data_capacity  = 100
+          asm_flash_capacity = 2
+          description        = "Test NOMIS T1 database with a dataset of T1PDL0009 (note: only NOMIS db, NDH db is not included."
+          oracle_sids        = ["CNOMT1"]
           tags = {
-            monitored = true
+            monitored = false
           }
         },
       },

diff --git a/terraform/environments/xhibit-portal/lambda.tf b/terraform/environments/xhibit-portal/lambda.tf
@@ -118,6 +118,7 @@ resource "aws_iam_role" "delete_snapshot_lambda" {
             "ec2:DescribeImageAttribute",
             "ec2:DeregisterImage",
             "ec2:DescribeImages",
+            "ec2:DescribeInstances",
             "ec2:DescribeSnapshotAttribute",
             "ec2:DescribeSnapshots",
             "ec2:DescribeTags",