Merge pull request #325 from dflook/fix-root-tool-versions

Fix .tool-versions from workspace root
dflook · Jan 17, 2024 · a6cd6bb · a6cd6bb
2 parents 977562a + 6bc62f7
commit a6cd6bb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/test-version.yaml b/.github/workflows/test-version.yaml
@@ -103,7 +103,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Test terraform-version
+      - name: Test getting version from .tools-versions
         uses: ./terraform-version
         id: terraform-version
         with:
@@ -115,7 +115,22 @@ jobs:
       - name: Check the version
         run: |
           if [[ "${{ steps.terraform-version.outputs.terraform }}" != "0.12.11" ]]; then
-            echo "::error:: Terraform version not set from .terraform-version"
+            echo "::error:: Terraform version not set from .tool-versions"
+            exit 1
+          fi
+          
+          mv tests/workflows/test-version/asdf/.tool-versions .tool-versions
+
+      - name: Test getting version from root .tools-versions
+        uses: ./terraform-version
+        id: root-version
+        with:
+          path: tests/workflows/test-version/asdf
+
+      - name: Check the version
+        run: |
+          if [[ "${{ steps.root-version.outputs.terraform }}" != "0.12.11" ]]; then
+            echo "::error:: Terraform version not set from .tool-versions"
             exit 1
           fi
 

diff --git a/image/src/terraform_version/asdf.py b/image/src/terraform_version/asdf.py
@@ -28,7 +28,7 @@ def try_read_asdf(inputs: InitInputs, workspace_path: str, versions: Iterable[Ve
 
     module_path = os.path.abspath(inputs.get('INPUT_PATH', '.'))
 
-    while module_path not in ['/', workspace_path]:
+    while module_path != '/':
         asdf_path = os.path.join(module_path, '.tool-versions')
 
         if os.path.isfile(asdf_path):
@@ -38,6 +38,9 @@ def try_read_asdf(inputs: InitInputs, workspace_path: str, versions: Iterable[Ve
             except Exception as e:
                 debug(str(e))
 
+        if module_path == workspace_path:
+            break
+
         module_path = os.path.dirname(module_path)
 
     return None