From 5f875f212e4fb47c3bdd12bcca00d9e8bbdcf6fa Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Thu, 4 Jul 2024 15:27:53 +0100 Subject: [PATCH] CCM-5100: Fix use of source for _terraform rule --- scripts/terraform/terraform.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/terraform/terraform.mk b/scripts/terraform/terraform.mk index 6339b19..05c0149 100644 --- a/scripts/terraform/terraform.mk +++ b/scripts/terraform/terraform.mk @@ -47,8 +47,9 @@ clean:: # Remove Terraform files (terraform) - optional: terraform_dir|dir=[path _terraform: # Terraform command wrapper - mandatory: cmd=[command to execute]; optional: dir=[path to a directory where the command will be executed, relative to the project's top-level directory, default is one of the module variables or the example directory, if not set], opts=[options to pass to the Terraform command, default is none/empty] dir=$(or ${dir}, ${TERRAFORM_STACK}) - source scripts/terraform/terraform.lib.sh - terraform-${cmd} # 'dir' and 'opts' are accessible by the function as environment variables, if set + echo terraform-${cmd} + . scripts/terraform/terraform.lib.sh && \ + terraform-${cmd} # 'dir' and 'opts' are accessible by the function as environment variables, if set # ============================================================================== # Quality checks - please DO NOT edit this section!