From 34121c3f2664c9f0d9c5dda47280dea208d0b6f6 Mon Sep 17 00:00:00 2001 From: Jared Holgate Date: Tue, 7 Jan 2025 18:10:49 +0000 Subject: [PATCH] fix: missing slz fsi input (#63) * fix: missing slz fsi input * linting --- alz/azuredevops/locals.tf | 2 +- alz/azuredevops/main.tf | 12 ++++++------ alz/azuredevops/variables.hidden.tf | 2 +- alz/github/locals.tf | 2 +- alz/github/main.tf | 12 ++++++------ alz/github/variables.hidden.tf | 2 +- alz/local/locals.tf | 4 ++-- alz/local/main.tf | 12 ++++++------ alz/local/variables.hidden.tf | 2 +- modules/files/main.tf | 2 +- modules/files/variables.tf | 2 +- modules/template_architecture_definition/locals.tf | 6 +++--- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/alz/azuredevops/locals.tf b/alz/azuredevops/locals.tf index 5c28db0..76612a6 100644 --- a/alz/azuredevops/locals.tf +++ b/alz/azuredevops/locals.tf @@ -127,5 +127,5 @@ locals { locals { architecture_definition_name = var.architecture_definition_name - has_architecture_definition = var.architecture_definition_name != null + has_architecture_definition = var.architecture_definition_name != null && var.architecture_definition_name != "" } diff --git a/alz/azuredevops/main.tf b/alz/azuredevops/main.tf index 607abe2..b990c7e 100644 --- a/alz/azuredevops/main.tf +++ b/alz/azuredevops/main.tf @@ -18,12 +18,12 @@ module "architecture_definition" { } module "files" { - source = "../../modules/files" - starter_module_folder_path = local.starter_module_folder_path - additional_files = concat(var.additional_files) - configuration_file_path = var.configuration_file_path - built_in_configurartion_file_names = var.built_in_configurartion_file_names - additional_folders_path = var.additional_folders_path + source = "../../modules/files" + starter_module_folder_path = local.starter_module_folder_path + additional_files = concat(var.additional_files) + configuration_file_path = var.configuration_file_path + built_in_configuration_file_names = var.built_in_configuration_file_names + additional_folders_path = var.additional_folders_path } module "azure" { diff --git a/alz/azuredevops/variables.hidden.tf b/alz/azuredevops/variables.hidden.tf index 1e97593..7bed29c 100644 --- a/alz/azuredevops/variables.hidden.tf +++ b/alz/azuredevops/variables.hidden.tf @@ -64,7 +64,7 @@ variable "agent_container_zone_support" { default = true } -variable "built_in_configurartion_file_names" { +variable "built_in_configuration_file_names" { description = "Built-in configuration file name" type = list(string) default = ["config.yaml", "config-hub-and-spoke-vnet.yaml", "config-virtual-wan.yaml"] diff --git a/alz/github/locals.tf b/alz/github/locals.tf index 9f3af12..4c4bf98 100644 --- a/alz/github/locals.tf +++ b/alz/github/locals.tf @@ -115,5 +115,5 @@ locals { locals { architecture_definition_name = var.architecture_definition_name - has_architecture_definition = var.architecture_definition_name != null + has_architecture_definition = var.architecture_definition_name != null && var.architecture_definition_name != "" } diff --git a/alz/github/main.tf b/alz/github/main.tf index af2f82f..7d28f7d 100644 --- a/alz/github/main.tf +++ b/alz/github/main.tf @@ -18,12 +18,12 @@ module "architecture_definition" { } module "files" { - source = "../../modules/files" - starter_module_folder_path = local.starter_module_folder_path - additional_files = var.additional_files - configuration_file_path = var.configuration_file_path - built_in_configurartion_file_names = var.built_in_configurartion_file_names - additional_folders_path = var.additional_folders_path + source = "../../modules/files" + starter_module_folder_path = local.starter_module_folder_path + additional_files = var.additional_files + configuration_file_path = var.configuration_file_path + built_in_configuration_file_names = var.built_in_configuration_file_names + additional_folders_path = var.additional_folders_path } module "azure" { diff --git a/alz/github/variables.hidden.tf b/alz/github/variables.hidden.tf index 4bd54f1..6441ee0 100644 --- a/alz/github/variables.hidden.tf +++ b/alz/github/variables.hidden.tf @@ -1,4 +1,4 @@ -variable "built_in_configurartion_file_names" { +variable "built_in_configuration_file_names" { description = "Built-in configuration file name" type = list(string) default = ["config.yaml", "config-hub-and-spoke-vnet.yaml", "config-virtual-wan.yaml"] diff --git a/alz/local/locals.tf b/alz/local/locals.tf index 932a65e..73548a1 100644 --- a/alz/local/locals.tf +++ b/alz/local/locals.tf @@ -61,6 +61,6 @@ locals { locals { architecture_definition_name = var.architecture_definition_name - has_architecture_definition = var.architecture_definition_name != null - architecture_definition_file_destination = var.architecture_definition_name != null ? "${local.target_directory}/${var.root_module_folder_relative_path}/lib/architecture_definitions/${local.architecture_definition_name}.alz_architecture_definition.json" : "" + has_architecture_definition = var.architecture_definition_name != null && var.architecture_definition_name != "" + architecture_definition_file_destination = var.architecture_definition_name != null && var.architecture_definition_name != "" ? "${local.target_directory}/${var.root_module_folder_relative_path}/lib/architecture_definitions/${local.architecture_definition_name}.alz_architecture_definition.json" : "" } diff --git a/alz/local/main.tf b/alz/local/main.tf index ba780d3..9c04ba3 100644 --- a/alz/local/main.tf +++ b/alz/local/main.tf @@ -24,12 +24,12 @@ resource "local_file" "architecture_definition_file" { } module "files" { - source = "../../modules/files" - starter_module_folder_path = local.starter_module_folder_path - additional_files = var.additional_files - configuration_file_path = var.configuration_file_path - built_in_configurartion_file_names = var.built_in_configurartion_file_names - additional_folders_path = var.additional_folders_path + source = "../../modules/files" + starter_module_folder_path = local.starter_module_folder_path + additional_files = var.additional_files + configuration_file_path = var.configuration_file_path + built_in_configuration_file_names = var.built_in_configuration_file_names + additional_folders_path = var.additional_folders_path } module "azure" { diff --git a/alz/local/variables.hidden.tf b/alz/local/variables.hidden.tf index 2bac27c..fb8b997 100644 --- a/alz/local/variables.hidden.tf +++ b/alz/local/variables.hidden.tf @@ -10,7 +10,7 @@ variable "additional_folders_path" { default = [] } -variable "built_in_configurartion_file_names" { +variable "built_in_configuration_file_names" { description = "Built-in configuration file name" type = list(string) default = ["config.yaml", "config-hub-and-spoke-vnet.yaml", "config-virtual-wan.yaml"] diff --git a/modules/files/main.tf b/modules/files/main.tf index 687bcba..1b7c357 100644 --- a/modules/files/main.tf +++ b/modules/files/main.tf @@ -5,7 +5,7 @@ locals { locals { starter_module_files = { for file in fileset(var.starter_module_folder_path, "**") : file => { path = "${var.starter_module_folder_path}/${file}" - } if(!local.has_configuration_file || !contains(var.built_in_configurartion_file_names, file)) && !strcontains(file, var.starter_module_folder_path_exclusion) + } if(!local.has_configuration_file || !contains(var.built_in_configuration_file_names, file)) && !strcontains(file, var.starter_module_folder_path_exclusion) } additional_folders_files = length(var.additional_folders_path) != 0 ? merge( diff --git a/modules/files/variables.tf b/modules/files/variables.tf index 7457a41..ac806de 100644 --- a/modules/files/variables.tf +++ b/modules/files/variables.tf @@ -21,7 +21,7 @@ variable "configuration_file_path" { default = "" } -variable "built_in_configurartion_file_names" { +variable "built_in_configuration_file_names" { description = "Built-in configuration file name" type = list(string) default = ["config.yaml", "config-hub-and-spoke-vnet.yaml", "config-virtual-wan.yaml"] diff --git a/modules/template_architecture_definition/locals.tf b/modules/template_architecture_definition/locals.tf index acab72f..2ffcfab 100644 --- a/modules/template_architecture_definition/locals.tf +++ b/modules/template_architecture_definition/locals.tf @@ -1,9 +1,9 @@ locals { # Determine template architecture definition inputs from starter module tfvars starter_module_tfvars = jsondecode(file("${var.starter_module_folder_path}/terraform.tfvars.json")) - default_prefix = local.starter_module_tfvars.default_prefix - default_postfix = local.starter_module_tfvars.default_postfix - top_level_management_group_name = local.starter_module_tfvars.top_level_management_group_name + default_prefix = try(local.starter_module_tfvars.default_prefix, "alz") + default_postfix = try(local.starter_module_tfvars.default_postfix, "") + top_level_management_group_name = try(local.starter_module_tfvars.top_level_management_group_name, "alz") default_template_file_path = "${path.module}/templates/${var.architecture_definition_name}.alz_architecture_definition.json.tftpl" template_file_path = var.architecture_definition_template_path != "" ? var.architecture_definition_template_path : local.default_template_file_path