Merge branch 'main' into thumper/feat/tf-runner-env

Author: howbazaar

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ jobs:
   Lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Linting
@@ -28,23 +28,27 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install poetry
         run: pipx install poetry
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "${{ matrix.python-version }}"
           cache: "poetry"
 
       - name: Install dependencies
         run: poetry install
 
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.10.1"
+
       - name: Coverage run pytest
         run: poetry run coverage run --source pytest_terraform -m pytest tests
 

.github/workflows/release.yml

@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install poetry
         run: pipx install poetry
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
           cache: "poetry"

pytest_terraform/tf.py

@@ -64,11 +64,11 @@ def __init__(
 
     def apply(self, plan=True):
         """run terraform apply"""
-        if plan is True:
+        if plan:
             plan_path = os.path.join(self.work_dir, "tfplan")
             self.plan(plan_path)
             apply_args = self._get_cmd_args("apply", plan=plan_path)
-        elif plan:
+        else:
             apply_args = self._get_cmd_args("apply", plan="")
         try:
             self._run_cmd(apply_args)

tests/test_terraform.py

@@ -171,7 +171,9 @@ def write_file(content: str, filename="resources.tf"):
     yield write_file
 
 
-def test_tf_runner(tmpdir, tmpdir_writer, trunner):
+@pytest.mark.skipif(not shutil.which("terraform"), reason="Terraform binary missing")
+@pytest.mark.parametrize("plan", (True, False))
+def test_tf_runner(testdir, tmpdir, plan):
     # ** requires network access to install plugin **
     tmpdir_writer(
         """
@@ -183,7 +185,7 @@ def test_tf_runner(tmpdir, tmpdir_writer, trunner):
     )
 
     trunner.init()
-    state = trunner.apply()
+    state = trunner.apply(plan=plan)
     assert state.get("foo")["content"] == "foo!"
     with open(tmpdir.join("foo.bar")) as fh:
         assert fh.read() == "foo!"