Merge pull request #1522 from ministryofjustice/lpal573_move_cloudwatch

LPAL-573 Move Cloudwatch Log Group to region
ministryofjustice · May 3, 2023 · d1762fa · d1762fa
2 parents 6361453 + edf22a1
commit d1762fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/terraform/account/cloudwatch.tf b/terraform/account/cloudwatch.tf
@@ -1,19 +1,5 @@
-#tfsec:ignore:aws-cloudwatch-log-group-customer-key
-resource "aws_cloudwatch_log_group" "online-lpa" {
-  name              = "online-lpa"
-  retention_in_days = local.account.retention_in_days
-
-  tags = merge(
-    local.shared_component_tag,
-    {
-      "Name" = "online-lpa"
-    },
-  )
-}
-
 data "aws_cloudwatch_log_group" "cloudtrail" {
-  name     = "online_lpa_cloudtrail_${local.account_name}"
-  provider = aws.eu-west-1
+  name = "online_lpa_cloudtrail_${local.account_name}"
 }
 
 resource "aws_cloudwatch_log_metric_filter" "breakglass_metric" {

diff --git a/terraform/region/modules/region/cloudwatch.tf b/terraform/region/modules/region/cloudwatch.tf
@@ -90,3 +90,16 @@ data "aws_iam_policy_document" "task_stopped_topic_policy" {
     resources = [aws_sns_topic.cloudwatch_to_account_ops_alerts.arn]
   }
 }
+
+#tfsec:ignore:aws-cloudwatch-log-group-customer-key
+resource "aws_cloudwatch_log_group" "online-lpa" {
+  name              = "online-lpa"
+  retention_in_days = local.account.retention_in_days
+
+  tags = merge(
+    local.shared_component_tag,
+    {
+      "Name" = "online-lpa"
+    },
+  )
+}