From a61c7d9055e415770c810355cef8ec6b19141770 Mon Sep 17 00:00:00 2001 From: Andrea Sosso Date: Fri, 13 Oct 2023 14:29:42 +0200 Subject: [PATCH 1/2] Improve variable precedence in terraform global.auto.tfvars --- .../adf-build/shared/helpers/terraform/adf_terraform.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/helpers/terraform/adf_terraform.sh b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/helpers/terraform/adf_terraform.sh index 5e00a9d51..dc13262b2 100755 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/helpers/terraform/adf_terraform.sh +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/helpers/terraform/adf_terraform.sh @@ -16,7 +16,7 @@ tfinit(){ cp -R "${CURRENT}/tfvars/${TF_VAR_TARGET_ACCOUNT_ID}"/* "${CURRENT}/tmp/${TF_VAR_TARGET_ACCOUNT_ID}-${AWS_REGION}" fi if [ -f "${CURRENT}/tfvars/global.auto.tfvars" ]; then - cp -R "${CURRENT}/tfvars/global.auto.tfvars" "${CURRENT}/tmp/${TF_VAR_TARGET_ACCOUNT_ID}-${AWS_REGION}" + cp -R "${CURRENT}/tfvars/global.auto.tfvars" "${CURRENT}/tmp/${TF_VAR_TARGET_ACCOUNT_ID}-${AWS_REGION}/0-global.auto.tfvars" fi terraform init \ -backend-config "bucket=$S3_BUCKET_REGION_NAME" \ From 6ed457c9ba34e8315f86227717b31a9b1fa0c84e Mon Sep 17 00:00:00 2001 From: Andrea Sosso Date: Fri, 13 Oct 2023 17:10:19 +0200 Subject: [PATCH 2/2] Allow users to choose their preferred prefix naming conventions for *global.auto.tfvars --- .../adf-build/shared/helpers/terraform/adf_terraform.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/helpers/terraform/adf_terraform.sh b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/helpers/terraform/adf_terraform.sh index dc13262b2..68e890999 100755 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/helpers/terraform/adf_terraform.sh +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/helpers/terraform/adf_terraform.sh @@ -16,7 +16,7 @@ tfinit(){ cp -R "${CURRENT}/tfvars/${TF_VAR_TARGET_ACCOUNT_ID}"/* "${CURRENT}/tmp/${TF_VAR_TARGET_ACCOUNT_ID}-${AWS_REGION}" fi if [ -f "${CURRENT}/tfvars/global.auto.tfvars" ]; then - cp -R "${CURRENT}/tfvars/global.auto.tfvars" "${CURRENT}/tmp/${TF_VAR_TARGET_ACCOUNT_ID}-${AWS_REGION}/0-global.auto.tfvars" + cp -R "${CURRENT}/tfvars/*global.auto.tfvars" "${CURRENT}/tmp/${TF_VAR_TARGET_ACCOUNT_ID}-${AWS_REGION}" fi terraform init \ -backend-config "bucket=$S3_BUCKET_REGION_NAME" \