Update shared services and networking

caf_solution/landingzone.tf

@@ -24,7 +24,7 @@ module "solution" {
   resource_groups                       = var.resource_groups
   role_mapping                          = var.role_mapping
   security                              = var.security
-  shared_services                       = var.shared_services
+  shared_services                       = local.shared_services
   storage_accounts                      = var.storage_accounts
   subscription_billing_role_assignments = var.subscription_billing_role_assignments
   subscriptions                         = var.subscriptions

caf_solution/local.networking.tf

@@ -4,6 +4,7 @@ locals {
     {
       application_gateway_applications                        = var.application_gateway_applications
       application_gateways                                    = var.application_gateways
+      application_security_groups                             = var.application_security_groups
       azurerm_firewall_application_rule_collection_definition = var.azurerm_firewall_application_rule_collection_definition
       azurerm_firewall_nat_rule_collection_definition         = var.azurerm_firewall_nat_rule_collection_definition
       azurerm_firewall_network_rule_collection_definition     = var.azurerm_firewall_network_rule_collection_definition
@@ -12,15 +13,23 @@ locals {
       ddos_services                                           = var.ddos_services
       dns_zone_records                                        = var.dns_zone_records
       dns_zones                                               = var.dns_zones
+      domain_name_registrations                               = var.domain_name_registrations
       express_route_circuit_authorizations                    = var.express_route_circuit_authorizations
       express_route_circuits                                  = var.express_route_circuits
+      front_door_waf_policies                                 = var.front_door_waf_policies
+      front_doors                                             = var.front_doors
+      ip_groups                                               = var.ip_groups
+      local_network_gateways                                  = var.local_network_gateways
+      networking_interface_asg_associations                   = var.networking_interface_asg_associations
       network_security_group_definition                       = var.network_security_group_definition
+      network_watchers                                        = var.network_watchers
       private_dns                                             = var.private_dns
       private_endpoints                                       = var.private_endpoints
       public_ip_addresses                                     = var.public_ip_addresses
       load_balancers                                          = var.load_balancers
       route_tables                                            = var.route_tables
       vhub_peerings                                           = var.vhub_peerings
+      virtual_network_gateway_connections                     = var.virtual_network_gateway_connections
       virtual_network_gateways                                = var.virtual_network_gateways
       virtual_wans                                            = var.virtual_wans
       vnet_peerings                                           = var.vnet_peerings

caf_solution/local.shared_services.tf

@@ -0,0 +1,14 @@
+locals {
+  shared_services = merge(
+    var.shared_services,
+    {
+      automations     = var.automations
+      recovery_vaults = var.recovery_vaults
+      monitoring               = var.monitoring
+      shared_image_galleries   = var.shared_image_galleries
+      image_definitions        = var.image_definitions
+      packer_service_principal = var.packer_service_principal
+      packer_managed_identity  = var.packer_managed_identity
+    }
+  )
+}

caf_solution/variables.networking.tf

@@ -5,6 +5,9 @@ variable "application_gateways" {
 variable "application_gateway_applications" {
   default = {}
 }
+variable "application_security_groups" {
+  default = {}
+}
 variable "azurerm_firewalls" {
   default = {}
 }
@@ -29,6 +32,9 @@ variable "dns_zones" {
 variable "dns_zone_records" {
   default = {}
 }
+variable "domain_name_registrations" {
+  default = {}
+}
 variable "express_route_circuits" {
   default = {}
 }
@@ -45,6 +51,21 @@ variable "networking" {
   default = {}
   type    = map(any)
 }
+variable "front_door_waf_policies" {
+  default = {}
+}
+variable "front_doors" {
+  default = {}
+}
+variable "ip_groups" {
+  default = {}
+}
+variable "local_network_gateways" {
+  default = {}
+}
+variable "networking_interface_asg_associations" {
+  default = {}
+}
 variable "network_security_group_definition" {
   default = {}
 }
@@ -60,6 +81,9 @@ variable "public_ip_addresses" {
 variable "route_tables" {
   default = {}
 }
+variable "virtual_network_gateway_connections" {
+  default = {}
+}
 variable "virtual_network_gateways" {
   default = {}
 }

caf_solution/variables.shared_services.tf

@@ -0,0 +1,37 @@
+# Shared services
+variable "shared_services" {
+  description = "Shared services configuration objects"
+  default = {
+    # automations = {}
+    # monitoring = {}
+    # recovery_vaults = {}
+  }
+}
+
+variable "automations" {
+  default = {}
+}
+
+variable "image_definitions" {
+  default = {}
+}
+
+variable "monitoring" {
+  default = {}
+}
+
+variable "packer_service_principal" {
+  default = {}
+}
+
+variable "packer_managed_identity" {
+  default = {}
+}
+
+variable "recovery_vaults" {
+  default = {}
+}
+
+variable "shared_image_galleries" {
+  default = {}
+}

caf_solution/variables.tf

@@ -234,35 +234,6 @@ variable "diagnostic_storage_accounts" {
   default = {}
 }
 
-# Shared services
-variable "shared_services" {
-  description = "Shared services configuration objects"
-  default = {
-    # automations = {}
-    # monitoring = {}
-    # recovery_vaults = {}
-  }
-}
-
-variable "automations" {
-  default = {}
-}
-
-variable "shared_image_galleries" {
-  default = {}
-}
-
-variable "image_definitions" {
-  default = {}
-}
-
-variable "packer_service_principal" {
-  default = {}
-}
-
-variable "packer_managed_identity" {
-  default = {}
-}
 
 variable "keyvault_certificate_issuers" {
   default = {}