Merge pull request #6 from data-platform-hq/fix-virtual-network-link

owlleg6 · web-flow · commit eb4df355bdff · 2023-04-12T14:52:18.000+03:00
fix: vitual link name
diff --git a/main.tf b/main.tf
@@ -1,6 +1,6 @@
 locals {
-  prefix                     = length(var.prefix) == 0 ? "" : "${var.prefix}-"
-  private_dns_zone_vnet_link = var.custom_dns_zone_vnet_link_name == null ? "link-${local.prefix}" : "${local.prefix}${var.custom_dns_zone_vnet_link_name}"
+  prefix                     = length(var.prefix) == 0 ? "" : var.prefix
+  private_dns_zone_vnet_link = var.custom_dns_zone_vnet_link_name == null ? "link-${local.prefix}" : "${local.prefix}-${var.custom_dns_zone_vnet_link_name}"
 }
 
 resource "azurerm_private_dns_zone" "this" {
@@ -22,7 +22,7 @@ resource "azurerm_private_dns_zone_virtual_network_link" "this" {
 
   lifecycle {
     precondition {
-      condition     = length(var.dns_zone_name) == 0 && length(var.external_dns_zone_name) == 0 ? false : true
+      condition     = alltrue([length(var.dns_zone_name) == 0, length(var.external_dns_zone_name) == 0]) ? false : true
       error_message = "Provide either 'dns_zone_name' value to create new Private DNS Zone or 'external_dns_zone_name' value to create link with already existing Private DNS Zone"
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`locals {`
`2`		`- prefix = length(var.prefix) == 0 ? "" : "${var.prefix}-"`
`3`		`- private_dns_zone_vnet_link = var.custom_dns_zone_vnet_link_name == null ? "link-${local.prefix}" : "${local.prefix}${var.custom_dns_zone_vnet_link_name}"`
	`2`	`+ prefix = length(var.prefix) == 0 ? "" : var.prefix`
	`3`	`+ private_dns_zone_vnet_link = var.custom_dns_zone_vnet_link_name == null ? "link-${local.prefix}" : "${local.prefix}-${var.custom_dns_zone_vnet_link_name}"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`resource "azurerm_private_dns_zone" "this" {`
`@@ -22,7 +22,7 @@ resource "azurerm_private_dns_zone_virtual_network_link" "this" {`
`22`	`22`
`23`	`23`	`lifecycle {`
`24`	`24`	`precondition {`
`25`		`- condition = length(var.dns_zone_name) == 0 && length(var.external_dns_zone_name) == 0 ? false : true`
	`25`	`+ condition = alltrue([length(var.dns_zone_name) == 0, length(var.external_dns_zone_name) == 0]) ? false : true`
`26`	`26`	`error_message = "Provide either 'dns_zone_name' value to create new Private DNS Zone or 'external_dns_zone_name' value to create link with already existing Private DNS Zone"`
`27`	`27`	`}`
`28`	`28`	`}`