diff --git a/lab/_envcommon/common-variables.hcl b/lab/_envcommon/common-variables.hcl index 0978f51..aa8af71 100644 --- a/lab/_envcommon/common-variables.hcl +++ b/lab/_envcommon/common-variables.hcl @@ -12,5 +12,4 @@ locals { state_table_name = "tf_remote_state" terraform = true terragrunt = true - versionshcl = try(read_terragrunt_config("./versions.hcl"), read_terragrunt_config(find_in_parent_folders("default_versions.hcl"))) } diff --git a/lab/root.hcl b/lab/root.hcl index 4ff045c..cba453a 100644 --- a/lab/root.hcl +++ b/lab/root.hcl @@ -5,19 +5,22 @@ # --------------------------------------------------------------------------------------------------------------------- locals { # Automatically load account-level variables (NOTE: In our environment account = environment so there is not separate environment layer) - account_vars = try(read_terragrunt_config(find_in_parent_folders("account.hcl"))) + account_vars = read_terragrunt_config(find_in_parent_folders("account.hcl")) # Automatically load _envcommon, cross account and environment common variables - common_vars = try(read_terragrunt_config(find_in_parent_folders("./_envcommon/common-variables.hcl"))) + common_vars = read_terragrunt_config(find_in_parent_folders("./_envcommon/common-variables.hcl")) + + # Automatically load versions + versions = read_terragrunt_config(find_in_parent_folders("./_envcommon/default-versions.hcl")) # Automatically load cluster-level variables - cluster_vars = try(read_terragrunt_config(find_in_parent_folders("cluster.hcl"))) + cluster_vars = read_terragrunt_config(find_in_parent_folders("cluster.hcl")) # Automatically load region-level variables - region_vars = try(read_terragrunt_config(find_in_parent_folders("region.hcl"))) + region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl")) # Automatically load vpc-level variables - vpc_vars = try(read_terragrunt_config(find_in_parent_folders("vpc.hcl"))) + vpc_vars = read_terragrunt_config(find_in_parent_folders("vpc.hcl")) # Extract the variables we need for easy access account_id = local.account_vars.locals.aws_account_id @@ -63,5 +66,6 @@ inputs = merge( local.cluster_vars.locals, local.common_vars.locals, local.region_vars.locals, + local.versions.locals, local.vpc_vars.locals )