Merge pull request #460 from raketham/feature/private-dns-resolver

add private dns resolver varaibles in local.networking.tf and variabl…

caf_solution/local.data_protection.tf

@@ -2,9 +2,9 @@ locals {
   data_protection = merge(
     var.data_protection,
     {
-      backup_vaults           = var.backup_vaults
-      backup_vault_policies   = var.backup_vault_policies
-      backup_vault_instances  = var.backup_vault_instances
+      backup_vaults          = var.backup_vaults
+      backup_vault_policies  = var.backup_vault_policies
+      backup_vault_instances = var.backup_vault_instances
     }
   )
 }

caf_solution/local.networking.tf

@@ -44,6 +44,12 @@ locals {
       networking_interface_asg_associations                   = var.networking_interface_asg_associations
       network_interface_backend_address_pool_association      = var.network_interface_backend_address_pool_association
       private_dns                                             = var.private_dns
+      private_dns_resolvers                                   = var.private_dns_resolvers
+      private_dns_resolver_inbound_endpoints                  = var.private_dns_resolver_inbound_endpoints
+      private_dns_resolver_outbound_endpoints                 = var.private_dns_resolver_outbound_endpoints
+      private_dns_resolver_dns_forwarding_rulesets            = var.private_dns_resolver_dns_forwarding_rulesets
+      private_dns_resolver_forwarding_rules                   = var.private_dns_resolver_forwarding_rules
+      private_dns_resolver_virtual_network_links              = var.private_dns_resolver_virtual_network_links
       private_dns_vnet_links                                  = var.private_dns_vnet_links
       private_endpoints                                       = var.private_endpoints
       public_ip_prefixes                                      = var.public_ip_prefixes

caf_solution/locals.remote_tfstates.tf

@@ -34,7 +34,7 @@ locals {
         sas_token            = try(value.sas_token, null) != null ? var.sas_token : null
         use_azuread_auth     = try(value.use_azuread_auth, true)
       } if try(value.backend_type, "azurerm") == "azurerm"
-    } 
+    }
     remote = {
       for key, value in try(var.landingzone.tfstates, {}) : key => {
         hostname     = try(value.hostname, var.tf_cloud_hostname)

caf_solution/main.tf

@@ -35,7 +35,7 @@ provider "azurerm" {
   # partner identifier for CAF Terraform landing zones.
   features {
     api_management {
-      purge_soft_delete_on_destroy         = var.provider_azurerm_features_api_management.purge_soft_delete_on_destroy
+      purge_soft_delete_on_destroy = var.provider_azurerm_features_api_management.purge_soft_delete_on_destroy
       # recover_soft_deleted_api_managements = var.provider_azurerm_features_api_management.recover_soft_deleted_api_managements
     }
     # application_insights {

caf_solution/variables.networking.tf

@@ -178,3 +178,24 @@ variable "public_ip_prefixes" {
   default = {}
 }
 
+variable "private_dns_resolvers" {
+  default = {}
+}
+variable "private_dns_resolver_inbound_endpoints" {
+  default = {}
+}
+variable "private_dns_resolver_outbound_endpoints" {
+  default = {}
+}
+variable "private_dns_resolver_dns_forwarding_rulesets" {
+  default = {}
+}
+
+variable "private_dns_resolver_forwarding_rules" {
+  default = {}
+}
+
+variable "private_dns_resolver_virtual_network_links" {
+  default = {}
+
+}

caf_solution/vmss_extensions.tf

@@ -2,11 +2,11 @@
 ## The moved instructions are supported Terraform 1.1 and are to be removed after a couple of release.
 
 moved {
-  from  = module.vmss_extension_custom_scriptextension
-  to    = module.solution.module.vmss_extension_custom_scriptextension
+  from = module.vmss_extension_custom_scriptextension
+  to   = module.solution.module.vmss_extension_custom_scriptextension
 }
 
 moved {
-  from  = module.vmss_extension_microsoft_azure_domainjoin
-  to    = module.solution.module.vmss_extension_microsoft_azure_domainjoin
+  from = module.vmss_extension_microsoft_azure_domainjoin
+  to   = module.solution.module.vmss_extension_microsoft_azure_domainjoin
 }