fix: missing slz fsi input (#63)

* fix: missing slz fsi input

* linting

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 != ""
 }

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" {

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"]

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 != ""
 }

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" {

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"]

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" : ""
 }

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" {

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"]

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(

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"]

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