Fix root directory for doing hash (must do .. from terraform root.dir)

wri · Sep 29, 2024 · 8a40fac · 8a40fac
1 parent c1dea6c
commit 8a40fac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/terraform/data.tf b/terraform/data.tf
@@ -193,6 +193,6 @@ data "template_file" "step_function_policy" {
 }
 
 data "external" "hash" {
- program = [coalesce(var.hash_script, "${path.module}/scripts/hash.sh"), var.root_dir, var.docker_path]
+  program = [coalesce(var.hash_script, "${path.module}/scripts/hash.sh"), "${var.root_dir}/../", var.docker_path]
 }
 
diff --git a/terraform/scripts/hash.sh b/terraform/scripts/hash.sh
@@ -33,8 +33,6 @@ if [ -f "$IGNORE" ]; then
     a=$(printf "! -regex ^./%s.* " `< .dockerignore`)
     b=${a//\/.//\\\.}
 
-    # Show files that hash depends on in stderr
-    find . -type f $b >&2
     file_hashes="$(
        find . -type f $b -exec md5sum {} \;
   )"
@@ -48,6 +46,4 @@ fi
 popd
 
 hash="$(echo "$file_hashes" | md5sum | cut -d' ' -f1)"
-# Echo has on stderr.
-echo "Hash: " $hash >&2
 echo '{ "hash": "'"$hash"'" }'