Adjust networking reference for solutions

Author: LaurentLesle

app_services.tf

@@ -12,8 +12,8 @@ module "app_service_environments" {
   name                      = each.value.name
   kind                      = try(each.value.kind, "ASEV2")
   zone                      = try(each.value.zone, null)
-  subnet_id                 = local.vnets[each.value.vnet_key].subnets[each.value.subnet_key].id
-  subnet_name               = local.vnets[each.value.vnet_key].subnets[each.value.subnet_key].name
+  subnet_id                 = module.networking[each.value.vnet_key].subnets[each.value.subnet_key].id
+  subnet_name               = module.networking[each.value.vnet_key].subnets[each.value.subnet_key].name
   internalLoadBalancingMode = each.value.internalLoadBalancingMode
   front_end_size            = try(each.value.front_end_size, "Standard_D1_V2")
   diagnostic_profiles       = try(each.value.diagnostic_profiles, null)

compute.tf

@@ -10,7 +10,7 @@ module virtual_machines {
   settings                         = each.value
   resource_group_name              = azurerm_resource_group.rg[each.value.resource_group_key].name
   location                         = lookup(each.value, "region", null) == null ? azurerm_resource_group.rg[each.value.resource_group_key].location : var.global_settings.regions[each.value.region]
-  vnets                            = local.vnets
+  vnets                            = module.networking
   managed_identities               = try(azurerm_user_assigned_identity.msi, null)
   boot_diagnostics_storage_account = try(var.storage_accounts[each.value.boot_diagnostics_storage_account_key].primary_blob_endpoint, {})
   keyvault_id                      = try(module.keyvaults[each.value.keyvault_key].id, null)

container_registry.tf

@@ -10,7 +10,7 @@ module container_registry {
   sku                 = try(each.value.sku, "Basic")
   tags                = try(each.value.tags, {})
   network_rule_set    = try(each.value.network_rule_set, {})
-  vnets               = local.vnets
+  vnets               = module.networking
   georeplication_locations = [
     for region in try(each.value.georeplication_region_keys, []) : var.global_settings.regions[region]
   ]

keyvault.tf

@@ -8,7 +8,7 @@ module "keyvaults" {
   resource_groups = azurerm_resource_group.rg
   tenant_id       = local.client_config.tenant_id
   diagnostics     = local.diagnostics
-  vnets           = lookup(each.value, "network", null) == null ? {} : local.vnets
+  vnets           = lookup(each.value, "network", null) == null ? {} : module.networking
 }
 
 #

landingzones/caf_networking/main.tf

@@ -75,7 +75,9 @@ locals {
   vnets = merge(
     data.terraform_remote_state.caf_foundations.outputs.vnets,
     map(
-      "networking", try(module.landingzones_networking.vnets, {})
+        var.landingzone_name, 
+        try(module.landingzones_networking.vnets, {}
+      )
     )
   )
 

landingzones/caf_networking/output.tf

@@ -5,7 +5,7 @@ output azurerm_firewalls {
 
 output vnets {
   value     = local.vnets
-  sensitive = true
+  sensitive = false
 }
 
 output tfstates {

main.tf

@@ -58,8 +58,8 @@ locals {
     azure_container_registries = try(var.compute.azure_container_registries, {})
   }
 
-  vnets = merge(module.networking, try(var.networking.networking_objects, {}))
-
+  # vnets = merge(module.networking, try(var.networking.networking_objects, {}))
+  
   networking = {
     network_security_group_definition                       = try(var.networking.network_security_group_definition, {})
     public_ip_addresses                                     = try(var.networking.public_ip_addresses, {})

mssql_servers.tf

@@ -16,7 +16,7 @@ module "mssql_servers" {
   keyvault_id         = try(each.value.administrator_login_password, null) == null ? module.keyvaults[each.value.keyvault_key].id : null
   storage_accounts    = module.storage_accounts
   azuread_groups      = module.azuread_groups
-  vnets               = try(each.value.private_endpoints, {}) == {} ? null : local.vnets
+  vnets               = try(each.value.private_endpoints, {}) == {} ? null : module.networking
   private_endpoints   = try(each.value.private_endpoints, {})
   resource_groups     = try(each.value.private_endpoints, {}) == {} ? null : azurerm_resource_group.rg
   tfstates            = var.tfstates

storage_accounts.tf

@@ -7,7 +7,7 @@ module "storage_accounts" {
   storage_account     = each.value
   resource_group_name = azurerm_resource_group.rg[each.value.resource_group_key].name
   location            = lookup(each.value, "region", null) == null ? azurerm_resource_group.rg[each.value.resource_group_key].location : local.global_settings.regions[each.value.region]
-  vnets               = try(each.value.private_endpoints, {}) == {} ? null : local.vnets
+  vnets               = try(each.value.private_endpoints, {}) == {} ? null : module.networking
   private_endpoints   = try(each.value.private_endpoints, {})
   resource_groups     = try(each.value.private_endpoints, {}) == {} ? null : azurerm_resource_group.rg
   tfstates            = var.tfstates