From b5aa8ee72076a22f416214901c3485c26623e9a0 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Fri, 5 Mar 2021 01:54:44 +0000 Subject: [PATCH] Name composition update for #306 --- documentation/conventions.md | 2 +- modules/compute/container_group/container_group.tf | 2 +- modules/networking/front_door/front_door.tf | 2 +- modules/networking/load_balancers/load_balancers.tf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/conventions.md b/documentation/conventions.md index f6f07d2bce..add465ba5e 100644 --- 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 index 33ba1b8a10..b6de5808b5 100644 --- 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 index d2b985a2d5..04e611f2c9 100644 --- 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 index 489a2a9caf..565c06f2b3 100644 --- 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