Fix outputs and tidy code

templates/platform_landing_zone/locals.tf

@@ -9,6 +9,7 @@ locals {
 }
 
 locals {
+  connectivity_enabled                    = var.connectivity_type != local.const.connectivity.none
   connectivity_virtual_wan_enabled        = var.connectivity_type == local.const.connectivity.virtual_wan
   connectivity_hub_and_spoke_vnet_enabled = var.connectivity_type == local.const.connectivity.hub_and_spoke_vnet
 }

templates/platform_landing_zone/modules/virtual-wan/outputs.tf

@@ -1,3 +1,3 @@
 output "dns_server_ip_addresses" {
-  value = { for key, value in local.virtual_hubs : key => try(module.hub_and_spoke_vnet.firewall_ip_addresses_by_hub_key[key].private_ip_address, null) }
+  value = { for key, value in local.virtual_hubs : key => try(module.virtual_wan.firewall_ip_addresses_by_hub_key[key].private_ip_address, null) }
 }

templates/platform_landing_zone/outputs.tf

@@ -1,3 +1,3 @@
 output "dns_server_ip_addresses" {
-  value = var.connectivity_type == "none" ? {} : (var.connectivity_type == "hub-and-spoke" ? module.hub_and_spoke_vnet.dns_server_ip_addresses : module.virtual_wan.dns_server_ip_addresses)
+  value = local.connectivity_enabled ? (local.connectivity_hub_and_spoke_vnet_enabled ? module.hub_and_spoke_vnet[0].dns_server_ip_addresses : module.virtual_wan[0].dns_server_ip_addresses) : {}
 }