Merge pull request #1157 from NHSDigital/feat/DTOSS-00000-fix-circular-depedency-on-action-group

Fix circular dependency on infra module input

Author: josielsouzanordcloud

infrastructure/modules/container-apps/main.tf

@@ -63,5 +63,5 @@ module "azurerm_application_insights_standard_web_test" {
   location                = var.region
   action_group_id         = var.action_group_id
   application_insights_id = var.app_insights_id
-  target_url              = var.target_url
+  target_url              = "${local.external_url}healthcheck"
 }

infrastructure/modules/container-apps/variables.tf

@@ -159,11 +159,6 @@ variable "enable_alerting" {
   type        = bool
 }
 
-variable "target_url" {
-  description = "The external url"
-  type        = string
-}
-
 variable "alert_window_size" {
   type     = string
   nullable = false
@@ -223,6 +218,7 @@ locals {
   env_vars_from_yaml = yamldecode(
     file("${path.module}/../../environments/${var.env_config}/variables.yml")
   )
+  external_url = "https://${module.frontdoor_endpoint.custom_domains["${var.environment}-domain"].host_name}/"
   common_env = merge(
     local.env_vars_from_yaml,
     {
@@ -239,9 +235,9 @@ locals {
 
   azure_db_env = {
     AZURE_DB_CLIENT_ID = var.deploy_database_as_container ? null : module.db_connect_identity[0].client_id
-    DATABASE_HOST   = var.deploy_database_as_container ? null : module.postgres[0].host
-    DATABASE_NAME   = var.deploy_database_as_container ? null : module.postgres[0].database_names[0]
-    DATABASE_USER   = var.deploy_database_as_container ? null : module.db_connect_identity[0].name
+    DATABASE_HOST      = var.deploy_database_as_container ? null : module.postgres[0].host
+    DATABASE_NAME      = var.deploy_database_as_container ? null : module.postgres[0].database_names[0]
+    DATABASE_USER      = var.deploy_database_as_container ? null : module.db_connect_identity[0].name
   }
 
   storage_account_name = "st${var.app_short_name}${var.environment}uks"

infrastructure/modules/infra/main.tf

@@ -80,7 +80,7 @@ module "app_insights_audit" {
   log_analytics_workspace_id = module.log_analytics_workspace_audit.id
 
   # alerts
-  action_group_id = var.action_group_id
+  action_group_id = module.monitor_action_group.monitor_action_group.id
   enable_alerting = var.enable_alerting
 }
 

infrastructure/modules/infra/variables.tf

@@ -53,11 +53,6 @@ variable "enable_alerting" {
   type        = bool
 }
 
-variable "action_group_id" {
-  type        = string
-  description = "ID of the action group to notify."
-}
-
 variable "enable_relay" {
   description = "Whether to create Azure Relay resources."
   type        = bool

infrastructure/terraform/main.tf

@@ -19,7 +19,6 @@ module "infra" {
   vnet_address_space                        = var.vnet_address_space
   cae_zone_redundancy_enabled               = var.cae_zone_redundancy_enabled
   enable_alerting                           = var.enable_alerting
-  action_group_id                           = var.deploy_infra ? module.infra[0].monitor_action_group_id : data.azurerm_monitor_action_group.main[0].id
   enable_relay                              = var.enable_relay
   enable_service_bus                        = var.enable_service_bus
   service_bus_public_network_access_enabled = var.service_bus_public_network_access_enabled
@@ -79,7 +78,6 @@ module "container-apps" {
   use_apex_domain                       = var.use_apex_domain
   infra_key_vault_name                  = local.infra_key_vault_name
   infra_key_vault_rg                    = local.infra_key_vault_rg
-  target_url                            = var.deploy_container_apps ? "${module.container-apps[0].external_url}healthcheck" : null
   resource_group_name_infra             = local.resource_group_name
   container_memory                      = var.container_memory
   min_replicas                          = var.min_replicas