Fixes

Author: Luca Prete

.github/workflows/tests-new.yml

@@ -24,42 +24,33 @@ on:
     - cron: '0 3 * * *'
   workflow_dispatch:
     inputs:
+      python_version:
+        description: "Use Python 3.12"
+        required: true
+        default: 3.12
+        type: string
       terraform_version:
         description: "Use Terraform 11.4"
         required: true
         default: 1.11.4
         type: string
+      tofu_version:
+        description: "Use OpenTofu 1.9.0"
+        required: true
+        default: 1.9.0
+        type: string
 
 env:
+  DEFAULT_TERRAFORM_FLAVOUR: terraform
+  DEFAULT_TERRAFORM_VERSION: ${{ inputs.terraform_version || '1.11.4' }}
+  DEFAULT_TOFU_VERSION: ${{ inputs.tofu_version || '1.9.0' }}
   GOOGLE_APPLICATION_CREDENTIALS: "/home/runner/credentials.json"
   PYTEST_ADDOPTS: "--color=yes"
-  PYTHON_VERSION: "3.12"
+  PYTHON_VERSION: ${{ inputs.python_version || '3.12' }}
   TF_PLUGIN_CACHE_DIR: "/home/runner/.terraform.d/plugin-cache"
   TFTEST_COPY: 1
-  DEFAULT_TERRAFORM_FLAVOUR: terraform
-  DEFAULT_TERRAFORM_VERSION: ${{ inputs.terraform_version || '1.11.4' }}
-  DEFAULT_TOFU_VERSION: "1.9.0"
 
 jobs:
-  compute-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      DEFAULT_TERRAFORM_FLAVOUR: ${{ env.DEFAULT_TERRAFORM_FLAVOUR }}
-      DEFAULT_TERRAFORM_VERSION: ${{ env.DEFAULT_TERRAFORM_VERSION }}
-      DEFAULT_TOFU_VERSION: ${{ env.DEFAULT_TOFU_VERSION }}
-    steps:
-      - name: Setup TF provider versions
-        run: echo "Set Terraform provider versions"
-
-      - name: Set up uv and python
-        uses: astral-sh/setup-uv@v6
-        with:
-          python-version: ${{ inputs.PYTHON_VERSION }}
-          enable-cache: true
-          cache-dependency-glob: |
-            ./pyproject.toml
-            ./uv.lock
-
   get-latest-tag:
     runs-on: ubuntu-latest
     outputs:
@@ -86,22 +77,21 @@ jobs:
   setup-tf-providers:
     runs-on: ubuntu-latest
     needs:
-      - compute-matrix
       - get-latest-tag
     strategy:
       matrix:
         include:
           - flavour: terraform
-            version: "${{ needs.compute-matrix.outputs.DEFAULT_TERRAFORM_VERSION }}"
+            version: "${{ env.DEFAULT_TERRAFORM_VERSION }}"
           - flavour: tofu
-            version: "${{ needs.compute-matrix.outputs.DEFAULT_TOFU_VERSION }}"
+            version: "${{ env.DEFAULT_TOFU_VERSION }}"
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up uv and python
         uses: astral-sh/setup-uv@v6
         with:
-          python-version: ${{ inputs.PYTHON_VERSION }}
+          python-version: ${{ env.PYTHON_VERSION }}
           enable-cache: true
           cache-dependency-glob: |
             ./pyproject.toml
@@ -155,25 +145,24 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     needs:
-      - compute-matrix
       - get-latest-tag
       - setup-tf-providers
 
     strategy:
       matrix:
         include:
           - flavour: terraform
-            version: "${{ needs.compute-matrix.outputs.DEFAULT_TERRAFORM_VERSION }}"
+            version: "${{ env.DEFAULT_TERRAFORM_VERSION }}"
           - flavour: tofu
-            version: "${{ needs.compute-matrix.outputs.DEFAULT_TOFU_VERSION }}"
+            version: "${{ env.DEFAULT_TOFU_VERSION }}"
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up uv and python
         uses: astral-sh/setup-uv@v6
         with:
-          python-version: ${{ inputs.PYTHON_VERSION }}
+          python-version: ${{ env.PYTHON_VERSION }}
           enable-cache: true
           cache-dependency-glob: |
             ./pyproject.toml