Merge pull request #316 from aztfmod/AL-306-fix

Name composition update for #306
aztfmod · Mar 5, 2021 · 1ddbf4e · 1ddbf4e
2 parents 5e22873 + b5aa8ee
commit 1ddbf4e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/documentation/conventions.md b/documentation/conventions.md
@@ -85,7 +85,7 @@ resource "azurecaf_name" "caf_name_vnet" {
 
   name          = var.settings.vnet.name
   resource_type = "azurerm_virtual_network"
-  prefixes      = [var.global_settings.prefix]
+  prefixes      = var.global_settings.prefix
   random_length = var.global_settings.random_length
   clean_input   = true
   passthrough   = var.global_settings.passthrough

diff --git a/modules/compute/container_group/container_group.tf b/modules/compute/container_group/container_group.tf
@@ -1,7 +1,7 @@
 resource "azurecaf_name" "acg" {
   name          = var.settings.name
   resource_type = "azurerm_containerGroups"
-  prefixes      = [var.global_settings.prefix]
+  prefixes      = var.global_settings.prefix
   random_length = var.global_settings.random_length
   clean_input   = true
   passthrough   = var.global_settings.passthrough

diff --git a/modules/networking/front_door/front_door.tf b/modules/networking/front_door/front_door.tf
@@ -1,7 +1,7 @@
 resource "azurecaf_name" "frontdoor" {
   name          = var.settings.name
   resource_type = "azurerm_frontdoor"
-  prefixes      = [try(var.settings.global_settings.prefix, var.global_settings.prefix)]
+  prefixes      = try(var.settings.global_settings.prefix, var.global_settings.prefix)
   random_length = try(var.settings.global_settings.random_lenght, var.global_settings.random_length)
   clean_input   = true
   passthrough   = try(var.settings.global_settings.passthrough, var.global_settings.passthrough)

diff --git a/modules/networking/load_balancers/load_balancers.tf b/modules/networking/load_balancers/load_balancers.tf
@@ -1,7 +1,7 @@
 resource "azurecaf_name" "lb_name" {
   name          = var.settings.name
   resource_type = "azurerm_lb"
-  prefixes      = [var.global_settings.prefix]
+  prefixes      = var.global_settings.prefix
   random_length = var.global_settings.random_length
   clean_input   = true
   passthrough   = var.global_settings.passthrough