From f2cf87661d7a7648b02709d7c0f18d16b039ceca Mon Sep 17 00:00:00 2001 From: Nick Henry Date: Thu, 21 Sep 2023 11:26:39 -0600 Subject: [PATCH] fix: Fix terraform_wrapper_module_for_each for when resource name contains 'variable' --- hooks/terraform_wrapper_module_for_each.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hooks/terraform_wrapper_module_for_each.sh b/hooks/terraform_wrapper_module_for_each.sh index 886b7080a..c6e636bf0 100755 --- a/hooks/terraform_wrapper_module_for_each.sh +++ b/hooks/terraform_wrapper_module_for_each.sh @@ -321,14 +321,14 @@ EOF # Get names of module variables in all terraform files # shellcheck disable=SC2207 - module_vars=($(echo "$all_tf_content" | hcledit block list | { grep variable. | cut -d'.' -f 2 | sort || true; })) + module_vars=($(echo "$all_tf_content" | hcledit block list | { grep "^\s*variable." | cut -d'.' -f 2 | sort || true; })) # Get names of module outputs in all terraform files # shellcheck disable=SC2207 - module_outputs=($(echo "$all_tf_content" | hcledit block list | { grep output. | cut -d'.' -f 2 || true; })) + module_outputs=($(echo "$all_tf_content" | hcledit block list | { grep "^\s*output." | cut -d'.' -f 2 || true; })) # Get names of module providers in all terraform files - module_providers=$(echo "$all_tf_content" | hcledit block list | { grep provider. || true; }) + module_providers=$(echo "$all_tf_content" | hcledit block list | { grep "^\s*provider." || true; }) if [[ $module_providers ]]; then common::colorify "yellow" "Skipping ${full_module_dir} because it is a legacy module which contains its own local provider configurations and so calls to it may not use the for_each argument."