From 13ccb9a0038ddac3c352789305c7a45667bf302c Mon Sep 17 00:00:00 2001
From: Brian Helba <brian.helba@kitware.com>
Date: Wed, 12 Feb 2025 20:12:15 -0500
Subject: [PATCH] Clean up CI style for TF tests

---
 .github/workflows/ci.yml                      | 26 ++++++++++++++++++-
 .../.github/workflows/ci.yml                  | 21 +++++++--------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index be2a925..bd6b843 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
         run: |
           tox
         working-directory: django-resonant-settings
-  test-cookecutter:
+  test-cookecutter-python:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -78,3 +78,27 @@ jobs:
             testenv:test.deps+=${{ github.workspace }}/django-resonant-settings;
             testenv:check-migrations.deps+=${{ github.workspace }}/django-resonant-settings
         working-directory: resonant
+  test-cookiecutter-terraform:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: terraform
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_wrapper: false
+      - name: Eject from cookiecutter
+        run: |
+          cookiecutter --no-input . project_name=Resonant ${{ matrix.cookiecutter-variables }}
+      - name: Lint Terraform code
+        run: |
+          terraform fmt -recursive -check
+        working-directory: resonant
+      - name: Validate Terraform code
+        run: |
+          terraform init -backend=false
+          terraform validate
+        working-directory: resonant
diff --git a/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml b/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml
index 4a0b25f..24acb37 100644
--- a/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml	
+++ b/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml	
@@ -5,7 +5,7 @@ on:
     branches:
       - master
 jobs:
-  test:
+  test-python:
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -44,23 +44,22 @@ jobs:
           DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
           DJANGO_CELERY_BROKER_URL: amqp://localhost:5672/
           DJANGO_MINIO_STORAGE_URL: http://minioAccessKey:minioSecretKey@localhost:9000/django-storage-testing
-  terraform:
+  test-terraform:
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: terraform
     steps:
-      - name: Checkout Repository
+      - name: Checkout repository
         uses: actions/checkout@v4
-
       - name: Install Terraform
         uses: hashicorp/setup-terraform@v3
-
+        with:
+          terraform_wrapper: false
       - name: Lint Terraform code
-        run: terraform fmt -check -diff -recursive
-
-      - name: Initialize Terraform (offline only)
-        run: terraform init -backend=false
-
+        run: |
+          terraform fmt -recursive -check
       - name: Validate Terraform code
-        run: terraform validate
+        run: |
+          terraform init -backend=false
+          terraform validate