From 150d0ae4343c4ae382611dc8f035b5d88d9f1560 Mon Sep 17 00:00:00 2001
From: Alexandre Pires <c.alexandre.pires@gmail.com>
Date: Sun, 29 Sep 2024 18:49:52 +0200
Subject: [PATCH] Refactor file path in actions-validate.yml and remove
 unnecessary code

---
 .github/actions/setup-terraform-env/main.yml | 10 -------
 .github/workflows/actions-validate.yml       | 28 +++++++++++++++++---
 2 files changed, 24 insertions(+), 14 deletions(-)
 delete mode 100644 .github/actions/setup-terraform-env/main.yml

diff --git a/.github/actions/setup-terraform-env/main.yml b/.github/actions/setup-terraform-env/main.yml
deleted file mode 100644
index cc2b3c4..0000000
--- a/.github/actions/setup-terraform-env/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: Setup Terraform Environment
-description: Prepare the environment for A13labs CI/CD pipelines
-
-runs:
-  using: "composite"
-  steps:
-    - name: Setup Terraform
-      uses: hashicorp/setup-terraform@v1
-      with:
-        terraform_version: 1.9.6
diff --git a/.github/workflows/actions-validate.yml b/.github/workflows/actions-validate.yml
index aa061ca..5e67dec 100644
--- a/.github/workflows/actions-validate.yml
+++ b/.github/workflows/actions-validate.yml
@@ -27,6 +27,10 @@ jobs:
           ansible-user: ${{ secrets.ANSIBLE_USER }}
           trusted-hosts: ${{ secrets.TRUSTED_HOSTS }}
 
+      - name: Test ansible
+        run: |
+          ansible --version
+
   test-setup-terraform-actions:
     runs-on: ubuntu-latest
 
@@ -39,8 +43,14 @@ jobs:
       - name: Setup environment (TEST)
         uses: ./.github/actions/setup-env
 
-      - name: Setup Terraform environment (TEST)
-        uses: ./.github/actions/setup-terraform-env
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v1
+        with:
+          terraform_version: 1.9.6
+
+      - name: Test terraform
+        run: |
+          terraform --version
 
   test-setup-terraforms-k8s-actions:
     runs-on: ubuntu-latest
@@ -61,8 +71,10 @@ jobs:
           ansible-user: ${{ secrets.ANSIBLE_USER }}
           trusted-hosts: ${{ secrets.TRUSTED_HOSTS }}
 
-      - name: Setup Terraform environment (TEST)
-        uses: ./.github/actions/setup-terraform-env
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v1
+        with:
+          terraform_version: 1.9.6
 
       - name: Setup Kubernetes Environment (TEST)
         uses: ./.github/actions/setup-k8s-env
@@ -70,6 +82,14 @@ jobs:
           vault-master-password: ${{ secrets.VAULT_MASTER_PASSWORD }}
           ansible-user: ${{ secrets.ANSIBLE_USER }}
 
+      - name: Test ansible
+        run: |
+          ansible --version
+
       - name: Test kubectl get nodes
         run: |
           kubectl get nodes
+
+      - name: Test terraform
+        run: |
+          terraform --version