diff --git a/caf_launchpad/locals.remote_tfstates.tf b/caf_launchpad/locals.remote_tfstates.tf index 69ccffc8..db55b458 100644 --- a/caf_launchpad/locals.remote_tfstates.tf +++ b/caf_launchpad/locals.remote_tfstates.tf @@ -29,7 +29,7 @@ locals { tenant_id = value.tenant_id sas_token = try(value.sas_token, null) != null ? var.sas_token : null } if try(value.backend_type, "azurerm") == "azurerm" - } + } remote = { for key, value in try(var.landingzone.tfstates, {}) : key => { hostname = try(value.hostname, null) diff --git a/caf_launchpad/main.tf b/caf_launchpad/main.tf index 83e29399..b541d151 100644 --- a/caf_launchpad/main.tf +++ b/caf_launchpad/main.tf @@ -32,7 +32,7 @@ provider "azurerm" { partner_id = "ca4078f8-9bc4-471b-ab5b-3af6b86a42c8" 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 { diff --git a/caf_solution/add-ons/terraform_cloud/terraform_cloud.tf b/caf_solution/add-ons/terraform_cloud/terraform_cloud.tf index 8ccc501b..448e3e3f 100644 --- a/caf_solution/add-ons/terraform_cloud/terraform_cloud.tf +++ b/caf_solution/add-ons/terraform_cloud/terraform_cloud.tf @@ -93,7 +93,7 @@ resource "tfe_agent_pool" "tfe_agent_pools" { resource "tfe_agent_token" "tfe_agent_pool_tokens" { depends_on = [tfe_agent_pool.tfe_agent_pools] - for_each = try(var.tfe_agent_pool_tokens, {}) + for_each = try(var.tfe_agent_pool_tokens, {}) agent_pool_id = try(each.value.agent_pool_id, tfe_agent_pool.tfe_agent_pools[each.value.agent_pool_key].id) description = each.value.description diff --git a/caf_solution/local.networking.tf b/caf_solution/local.networking.tf index a404d3a9..2a258737 100644 --- a/caf_solution/local.networking.tf +++ b/caf_solution/local.networking.tf @@ -40,6 +40,7 @@ locals { network_interface_backend_address_pool_association = var.network_interface_backend_address_pool_association network_profiles = var.network_profiles network_security_group_definition = var.network_security_group_definition + network_security_security_rules = var.network_security_security_rules network_watchers = var.network_watchers networking_interface_asg_associations = var.networking_interface_asg_associations network_interface_backend_address_pool_association = var.network_interface_backend_address_pool_association diff --git a/caf_solution/local.remote.tf b/caf_solution/local.remote.tf index 1c3c9649..5fcdde97 100644 --- a/caf_solution/local.remote.tf +++ b/caf_solution/local.remote.tf @@ -160,6 +160,9 @@ locals { mssql_managed_instances = { for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].mssql_managed_instances, {})) } + mssql_managed_instances_secondary = { + for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].mssql_managed_instances_secondary, {})) + } mssql_servers = { for key, value in try(var.landingzone.tfstates, {}) : key => merge(try(data.terraform_remote_state.remote[key].outputs.objects[key].mssql_servers, {})) } diff --git a/caf_solution/variables.networking.tf b/caf_solution/variables.networking.tf index c71fb9a0..ff665379 100644 --- a/caf_solution/variables.networking.tf +++ b/caf_solution/variables.networking.tf @@ -102,6 +102,9 @@ variable "networking_interface_asg_associations" { variable "network_security_group_definition" { default = {} } +variable "network_security_security_rules" { + default = {} +} variable "private_endpoints" { default = {} }