Tidy up

templates/complete_multi_region/locals-config.tf

@@ -46,4 +46,4 @@ locals {
     subscription_id_identity                                      = var.subscription_id_identity
     subscription_id_management                                    = var.subscription_id_management
   }
-}
+}

templates/complete_multi_region/locals-resource-groups.tf

@@ -3,4 +3,4 @@ locals {
   connectivity_resource_groups_json_templated = templatestring(local.connectivity_resource_groups_json, local.config_template_file_variables)
   connectivity_resource_groups_json_final     = replace(replace(local.connectivity_resource_groups_json_templated, "\"[", "["), "]\"", "]")
   connectivity_resource_groups                = jsondecode(local.connectivity_resource_groups_json_final)
-}
+}

templates/complete_multi_region/locals.tf

@@ -9,6 +9,7 @@ locals {
 }
 
 locals {
+  management_enabled                      = (var.management_settings_es) > 0
   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
   connectivity_none_enabled               = var.connectivity_type == local.const.connectivity.none

templates/complete_multi_region/management.tf

@@ -1,7 +1,7 @@
 module "management_groups" {
   source = "./modules/management-es"
 
-  count = var.management_use_avm ? 0 : 1
+  count = !var.skip_deploy && var.management_use_avm ? 0 : 1
 
   enable_telemetry = var.enable_telemetry
   settings         = local.management_settings_es

templates/complete_multi_region/modules/hub-and-spoke-vnet/locals.tf

@@ -22,7 +22,7 @@ locals {
 locals {
   private_dns_zones = { for key, value in var.hub_virtual_networks : key => merge({
     location = value.hub_virtual_network.location
-  }, value.private_dns_zones) if can(value.private_dns_zones) }
+  }, value.private_dns_zones) if can(value.private_dns_zones.resource_group_name) }
 
   private_dns_zones_virtual_network_links = {
     for key, value in module.hub_and_spoke_vnet.virtual_networks : key => {
@@ -52,6 +52,6 @@ locals {
 }
 
 locals {
-  ddos_protection_plan         = can(var.hub_and_spoke_networks_settings.ddos_protection_plan) ? var.hub_and_spoke_networks_settings.ddos_protection_plan : null
+  ddos_protection_plan         = can(var.hub_and_spoke_networks_settings.ddos_protection_plan.name) ? var.hub_and_spoke_networks_settings.ddos_protection_plan : null
   ddos_protection_plan_enabled = local.ddos_protection_plan != null
 }

templates/complete_multi_region/modules/hub-and-spoke-vnet/terraform.tf

@@ -10,5 +10,4 @@ terraform {
       version = "~> 1.13"
     }
   }
-  # backend "azurerm" {}
 }

templates/complete_multi_region/modules/management-es/main.tf

@@ -47,4 +47,4 @@ module "management_groups" {
     azurerm.connectivity = azurerm.connectivity
     azurerm.management   = azurerm.management
   }
-}
+}

templates/complete_multi_region/modules/management-es/terraform.tf

@@ -1,4 +1,5 @@
 terraform {
+  required_version = "~> 1.9"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
@@ -9,4 +10,4 @@ terraform {
       ]
     }
   }
-}
+}

templates/complete_multi_region/modules/management-es/variables.tf

@@ -5,4 +5,4 @@ variable "settings" {
 variable "enable_telemetry" {
   type    = bool
   default = true
-}
+}

templates/complete_multi_region/modules/virtual-wan/locals.tf

@@ -50,7 +50,7 @@ locals {
 locals {
   private_dns_zones = { for key, value in var.virtual_hubs : key => merge({
     location = value.hub.location
-  }, value.private_dns_zones) if can(value.private_dns_zones) }
+  }, value.private_dns_zones) if can(value.private_dns_zones.resource_group_name) }
 
   private_dns_zones_virtual_network_links = {
     for key, value in module.virtual_network_private_dns : key => {
@@ -80,6 +80,6 @@ locals {
 }
 
 locals {
-  ddos_protection_plan         = can(var.virtual_wan_settings.ddos_protection_plan) ? var.virtual_wan_settings.ddos_protection_plan : null
+  ddos_protection_plan         = can(var.virtual_wan_settings.ddos_protection_plan.name) ? var.virtual_wan_settings.ddos_protection_plan : null
   ddos_protection_plan_enabled = local.ddos_protection_plan != null
 }

templates/complete_multi_region/modules/virtual-wan/terraform.tf

@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.8"
+  required_version = "~> 1.9"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
@@ -10,5 +10,4 @@ terraform {
       version = "~> 1.13"
     }
   }
-  # backend "azurerm" {}
 }

templates/complete_multi_region/networking-hub-and-spoke-vnet.tf

@@ -1,7 +1,7 @@
 module "hub_and_spoke_vnet" {
   source = "./modules/hub-and-spoke-vnet"
 
-  count = local.connectivity_hub_and_spoke_vnet_enabled ? 1 : 0
+  count = !var.skip_deploy && local.connectivity_hub_and_spoke_vnet_enabled ? 1 : 0
 
   hub_and_spoke_networks_settings = local.hub_and_spoke_vnet_settings
   hub_virtual_networks            = local.hub_and_spoke_vnet_virtual_networks

templates/complete_multi_region/networking-virtual-wan.tf

@@ -1,7 +1,7 @@
 module "virtual_wan" {
   source = "./modules/virtual-wan"
 
-  count = local.connectivity_virtual_wan_enabled ? 1 : 0
+  count = !var.skip_deploy && local.connectivity_virtual_wan_enabled ? 1 : 0
 
   virtual_wan_settings = local.virtual_wan_settings
   virtual_hubs         = local.virtual_wan_virtual_hubs
@@ -15,4 +15,4 @@ module "virtual_wan" {
     module.management_groups,
     module.resource_groups
   ]
-}
+}

templates/complete_multi_region/resource-groups.tf

@@ -2,7 +2,7 @@ module "resource_groups" {
   source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
-  for_each = local.connectivity_resource_groups
+  for_each = var.skip_deploy ? {} : local.connectivity_resource_groups
 
   name             = each.value.name
   location         = each.value.location

templates/complete_multi_region/terraform.tf

@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.8"
+  required_version = "~> 1.9"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"

templates/complete_multi_region/variables.management.tf → templates/complete_multi_region/variables-management.tf

@@ -12,4 +12,4 @@ variable "management_settings_avm" {
 variable "management_settings_es" {
   type    = any
   default = {}
-}
+}

templates/complete_multi_region/variables.tf

@@ -35,3 +35,9 @@ variable "enable_telemetry" {
   default     = true
   description = "Flag to enable/disable telemetry"
 }
+
+variable "skip_deploy" {
+  type        = bool
+  default     = false
+  description = "Flag to skip deployment. This is used for testing and documentation generation purposes."
+}