From e77d4621fde71c54f76c5afa7ad589249031cfaa Mon Sep 17 00:00:00 2001 From: cloudneutral Date: Mon, 8 Dec 2025 17:41:03 +0800 Subject: [PATCH] Fix bootstrap IAM defaults --- .../aws-cloud/bootstrap-iam/Makefile | 2 +- .../aws-cloud/bootstrap-iam/locals.tf | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/Makefile b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/Makefile index e93f6131..b8b6ba68 100644 --- a/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/Makefile +++ b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/Makefile @@ -1,7 +1,7 @@ account_name ?= region ?= role_name ?= - terraform_user_name ?= +terraform_user_name ?= TF_VARS := $(if $(account_name),-var="account_name=$(account_name)") $(if $(region),-var="region=$(region)") $(if $(role_name),-var="role_name=$(role_name)") $(if $(terraform_user_name),-var="terraform_user_name=$(terraform_user_name)") diff --git a/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/locals.tf b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/locals.tf index 71700a86..a85305b0 100644 --- a/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/locals.tf +++ b/iac-template/terraform-hcl-standard/aws-cloud/bootstrap-iam/locals.tf @@ -10,7 +10,10 @@ locals { } locals { - account = yamldecode( - file("${path.root}/../config/accounts/${local.config_account_name}.yaml") - ) + account_file_path = "${path.root}/../config/accounts/${local.config_account_name}.yaml" + account = fileexists(local.account_file_path) ? yamldecode(file(local.account_file_path)) : { + account_id = local.bootstrap.account_id + environment = local.environment + tags = local.extra_tags + } }