revert changes to location and resource_group_name for private endpoi…

…int and main.tf
aztfmod · Aug 21, 2024 · 2c85031 · 2c85031
1 parent 86babd5
commit 2c85031
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/modules/databases/mysql_flexible_server/main.tf b/modules/databases/mysql_flexible_server/main.tf
@@ -11,6 +11,4 @@ locals {
     "module" = basename(abspath(path.module))
   }
   tags = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
-  location            = coalesce(var.location, var.resource_group.location)
-  resource_group_name = coalesce(var.resource_group_name, var.resource_group.name)  
 }
diff --git a/modules/databases/mysql_flexible_server/private_endpoints.tf b/modules/databases/mysql_flexible_server/private_endpoints.tf
@@ -4,10 +4,10 @@ module "private_endpoint" {
 
   resource_id = azurerm_mysql_flexible_server.mysql.id
   name        = each.value.name
-  location            = var.resource_groups[try(each.value.resource_group.lz_key, var.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
-  resource_group_name = var.resource_groups[try(each.value.resource_group.lz_key, var.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].name
-  # location            = var.location
-  # resource_group_name = var.resource_group_name
+  # location            = var.resource_groups[try(each.value.resource_group.lz_key, var.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
+  # resource_group_name = var.resource_groups[try(each.value.resource_group.lz_key, var.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].name
+  location            = var.location
+  resource_group_name = var.resource_group_name
 
   subnet_id = can(each.value.subnet_id) ? each.value.subnet_id : var.vnets[try(each.value.lz_key, var.client_config.landingzone_key)][each.value.vnet_key].subnets[each.value.subnet_key].id