From 3581844390d79fe4cac2348bce950048e2aa757e Mon Sep 17 00:00:00 2001 From: cloudneutral Date: Wed, 24 Dec 2025 13:29:59 +0800 Subject: [PATCH] Simplify bootstrap config path input --- terraform-hcl-standard/aws-cloud/bootstrap/state/locals.tf | 6 +----- .../aws-cloud/bootstrap/state/variables.tf | 6 +++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/terraform-hcl-standard/aws-cloud/bootstrap/state/locals.tf b/terraform-hcl-standard/aws-cloud/bootstrap/state/locals.tf index d25ffbb7..1bc2be9d 100644 --- a/terraform-hcl-standard/aws-cloud/bootstrap/state/locals.tf +++ b/terraform-hcl-standard/aws-cloud/bootstrap/state/locals.tf @@ -1,9 +1,5 @@ locals { - config_root = coalesce(var.config_root, abspath("${path.module}/../../../../../gitops")) - bootstrap_config_path = coalesce( - var.bootstrap_config_path, - "${local.config_root}/config/accounts/bootstrap.yaml" - ) + bootstrap_config_path = abspath(var.bootstrap_config_path) bootstrap = yamldecode(file(local.bootstrap_config_path)) diff --git a/terraform-hcl-standard/aws-cloud/bootstrap/state/variables.tf b/terraform-hcl-standard/aws-cloud/bootstrap/state/variables.tf index 035f18eb..b89798a6 100644 --- a/terraform-hcl-standard/aws-cloud/bootstrap/state/variables.tf +++ b/terraform-hcl-standard/aws-cloud/bootstrap/state/variables.tf @@ -13,7 +13,11 @@ variable "region" { variable "bootstrap_config_path" { description = "Path to the bootstrap account configuration YAML" type = string - default = null + + validation { + condition = var.bootstrap_config_path != null && trim(var.bootstrap_config_path) != "" + error_message = "Set bootstrap_config_path to the GitHub Action environment input that points to the bootstrap YAML file." + } } variable "config_root" {