From 0567c54ec6f856ddb3c4e5b29d35a6829cc58d6d Mon Sep 17 00:00:00 2001
From: johnko <279736+johnko@users.noreply.github.com>
Date: Thu, 6 Nov 2025 07:13:22 -0500
Subject: [PATCH 1/4] chore: reorganize tf.sh location

---
 .github/opentofu-validate.sh  |  2 +-
 .github/terraform-validate.sh |  2 +-
 github/johnko/tf.sh => tf.sh  | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)
 rename github/johnko/tf.sh => tf.sh (85%)

diff --git a/.github/opentofu-validate.sh b/.github/opentofu-validate.sh
index e6516d6..c2ee9c5 100644
--- a/.github/opentofu-validate.sh
+++ b/.github/opentofu-validate.sh
@@ -23,7 +23,7 @@ export IAC_BIN=tofu
 
 $IAC_BIN version
 
-for WORKSPACE in $(find . -name 'tf.sh' -print0 | xargs -0 -I{} dirname {} | sort -u); do
+for WORKSPACE in $(find . \( -name '*.tf' -o -name '*.otf' \) -print0 | xargs -0 -I{} dirname {} | sort -u); do
   pushd "$WORKSPACE"
   bash -e tf.sh validate
   popd
diff --git a/.github/terraform-validate.sh b/.github/terraform-validate.sh
index 73a0339..6204811 100644
--- a/.github/terraform-validate.sh
+++ b/.github/terraform-validate.sh
@@ -31,7 +31,7 @@ export IAC_BIN=terraform
 
 $IAC_BIN version
 
-for WORKSPACE in $(find . -name 'tf.sh' -print0 | xargs -0 -I{} dirname {} | sort -u); do
+for WORKSPACE in $(find . -name '*.tf' -print0 | xargs -0 -I{} dirname {} | sort -u); do
   pushd "$WORKSPACE"
   bash -e tf.sh validate
   popd
diff --git a/github/johnko/tf.sh b/tf.sh
similarity index 85%
rename from github/johnko/tf.sh
rename to tf.sh
index a264a3c..0264091 100755
--- a/github/johnko/tf.sh
+++ b/tf.sh
@@ -5,7 +5,18 @@ if [[ -z $IAC_BIN ]]; then
   export IAC_BIN=terraform
 fi
 
-ACTION="$1"
+WORKSPACE="$1"
+if [[ -z $WORKSPACE ]]; then
+  echo "ERROR: missing 'WORKSPACE' as 1st argument"
+  exit 1
+fi
+if [[ ! -d $WORKSPACE ]]; then
+  echo "ERROR: invalid 'WORKSPACE', received '$WORKSPACE'"
+  exit 1
+fi
+pushd "$WORKSPACE"
+
+ACTION="$2"
 if [[ -z $ACTION ]]; then
   echo "ERROR: missing 'ACTION' as 1st argument"
   exit 1
@@ -60,3 +71,4 @@ if [[ "APPLY" == "$SAFE_ACTION" || "AUTO" == "$SAFE_ACTION" ]]; then
   exit $TF_APPLY_EXIT_CODE
 fi
 set -e
+popd

From dcb71d4dd05fbe05f38e173b3071a2f10587ae27 Mon Sep 17 00:00:00 2001
From: johnko <279736+johnko@users.noreply.github.com>
Date: Thu, 6 Nov 2025 07:15:23 -0500
Subject: [PATCH 2/4] .

---
 .github/workflows/opentofu-checks.yml  | 1 +
 .github/workflows/terraform-checks.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/opentofu-checks.yml b/.github/workflows/opentofu-checks.yml
index d4d5c2d..0bd1b71 100644
--- a/.github/workflows/opentofu-checks.yml
+++ b/.github/workflows/opentofu-checks.yml
@@ -24,3 +24,4 @@ on:
       - .github/workflows/opentofu-checks.yml
       - '**.otf'
       - '**.tf'
+      - 'tf.sh'
diff --git a/.github/workflows/terraform-checks.yml b/.github/workflows/terraform-checks.yml
index 794cd85..cafeaef 100644
--- a/.github/workflows/terraform-checks.yml
+++ b/.github/workflows/terraform-checks.yml
@@ -23,3 +23,4 @@ on:
       - .github/terraform-fmt.sh
       - .github/workflows/terraform-checks.yml
       - '**.tf'
+      - 'tf.sh'

From ce00ae17160186c467415221dc33fee66b56f567 Mon Sep 17 00:00:00 2001
From: johnko <279736+johnko@users.noreply.github.com>
Date: Thu, 6 Nov 2025 07:16:05 -0500
Subject: [PATCH 3/4] ..

---
 .github/opentofu-validate.sh  | 4 +---
 .github/terraform-validate.sh | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/opentofu-validate.sh b/.github/opentofu-validate.sh
index c2ee9c5..9cee8e8 100644
--- a/.github/opentofu-validate.sh
+++ b/.github/opentofu-validate.sh
@@ -24,7 +24,5 @@ export IAC_BIN=tofu
 $IAC_BIN version
 
 for WORKSPACE in $(find . \( -name '*.tf' -o -name '*.otf' \) -print0 | xargs -0 -I{} dirname {} | sort -u); do
-  pushd "$WORKSPACE"
-  bash -e tf.sh validate
-  popd
+  bash -e tf.sh "$WORKSPACE" validate
 done
diff --git a/.github/terraform-validate.sh b/.github/terraform-validate.sh
index 6204811..24fafeb 100644
--- a/.github/terraform-validate.sh
+++ b/.github/terraform-validate.sh
@@ -32,7 +32,5 @@ export IAC_BIN=terraform
 $IAC_BIN version
 
 for WORKSPACE in $(find . -name '*.tf' -print0 | xargs -0 -I{} dirname {} | sort -u); do
-  pushd "$WORKSPACE"
-  bash -e tf.sh validate
-  popd
+  bash -e tf.sh "$WORKSPACE" validate
 done

From 329dd5f740394b47661d882597e6e01162ba090b Mon Sep 17 00:00:00 2001
From: johnko <279736+johnko@users.noreply.github.com>
Date: Thu, 6 Nov 2025 07:17:16 -0500
Subject: [PATCH 4/4] yq

---
 .github/workflows/opentofu-checks.yml  | 2 +-
 .github/workflows/terraform-checks.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/opentofu-checks.yml b/.github/workflows/opentofu-checks.yml
index 0bd1b71..a9d2eea 100644
--- a/.github/workflows/opentofu-checks.yml
+++ b/.github/workflows/opentofu-checks.yml
@@ -24,4 +24,4 @@ on:
       - .github/workflows/opentofu-checks.yml
       - '**.otf'
       - '**.tf'
-      - 'tf.sh'
+      - tf.sh
diff --git a/.github/workflows/terraform-checks.yml b/.github/workflows/terraform-checks.yml
index cafeaef..c42e4e5 100644
--- a/.github/workflows/terraform-checks.yml
+++ b/.github/workflows/terraform-checks.yml
@@ -23,4 +23,4 @@ on:
       - .github/terraform-fmt.sh
       - .github/workflows/terraform-checks.yml
       - '**.tf'
-      - 'tf.sh'
+      - tf.sh