adding variables to csr and planet env modules (#5526)

Co-authored-by: Hope Aitchison <[email protected]>
ministryofjustice · Apr 2, 2024 · 0d48405 · 0d48405
1 parent f9a5b21
commit 0d48405
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/terraform/environments/corporate-staff-rostering/main.tf b/terraform/environments/corporate-staff-rostering/main.tf
@@ -145,10 +145,13 @@ module "baseline" {
 }
 
 module "cross_account_cloudwatch" {
-  source      = "../../modules/cross_account_cloudwatch"
-  environment = module.environment
-  options = merge(
+  source       = "../../modules/cross_account_cloudwatch"
+  environment  = module.environment
+  options      = merge(
     local.cloudwatch_monitoring_options,
     local.cloudwatch_local_environment_monitoring_options,
   )
+  monitoring_account_id              = module.environment.account_ids.corporate-staff-rostering-production
+  source_account_ids                 = [module.environment.account_ids.planetfm-production]
+  monitoring_account_sink_identifier = "arn:aws:oam:eu-west-2:${module.environment.account_ids.corporate-staff-rostering-production}:sink/c78e5972-8464-4244-949f-872b726bc563"
 }
diff --git a/terraform/environments/corporate-staff-rostering/variables.tf b/terraform/environments/corporate-staff-rostering/variables.tf
@@ -1,9 +1,14 @@
-# variable "monitoring_account_sink_identifier" {
+#  variable "monitoring_account_sink_identifier" {
+#    type    = string
+#    default = "arn:aws:oam:eu-west-2:${module.environment.account_ids.corporate-staff-rostering-production}:sink/c78e5972-8464-4244-949f-872b726bc563"
+#  }
+
+# variable "monitoring_account_id" {
 #   type    = string
-#   default = "arn:aws:oam:eu-west-2:775245656481:sink/7d4f9ba0-e432-49d1-8f34-1fda2d165bf8"
-# } TODO
+#   default = module.environment.account_ids.corporate-staff-rostering-production
+# }
 
-variable "monitoring_account_id" {
-  type    = string
-  default = "221841889672" # corporate-staff-rostering-production account
-}
+# variable "source_account_ids" {
+#   type    = list(string)
+#   default = [module.environment.account_ids.planetfm-production]
+# }
diff --git a/terraform/environments/planetfm/main.tf b/terraform/environments/planetfm/main.tf
@@ -139,11 +139,13 @@ module "baseline" {
 }
 
 module "cross_account_cloudwatch" {
-  source      = "../../modules/cross_account_cloudwatch"
-  environment = module.environment
-  options = merge(
+  source       = "../../modules/cross_account_cloudwatch"
+  environment  = module.environment
+  options      = merge(
     local.cloudwatch_monitoring_options,
     local.cloudwatch_local_environment_monitoring_options,
   )
+  monitoring_account_id              = module.environment.account_ids.corporate-staff-rostering-production
+  source_account_ids                 = [module.environment.account_ids.planetfm-production]
+  monitoring_account_sink_identifier = "arn:aws:oam:eu-west-2:${module.environment.account_ids.corporate-staff-rostering-production}:sink/c78e5972-8464-4244-949f-872b726bc563"
 }
-