From 552b63cf662783737fb5bd18a3707b798f2bce73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Tue, 24 Jan 2023 12:24:09 -0300
Subject: [PATCH] Workflow updates

---
 .github/workflows/main_aio.yml   | 13 ++++++-------
 .github/workflows/main_wazuh.yml | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main_aio.yml b/.github/workflows/main_aio.yml
index 87c71b7b..2e54c52c 100644
--- a/.github/workflows/main_aio.yml
+++ b/.github/workflows/main_aio.yml
@@ -1,5 +1,5 @@
 ---
-name: do-the-job
+name: AIO-Single-Instance
 on: [push, pull_request, workflow_dispatch, release]
 jobs:
   start-runner:
@@ -25,14 +25,13 @@ jobs:
           ec2-instance-type: t3a.large
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SG_ID }}
-          #iam-role-name: my-role-name # optional, requires additional permissions
           aws-resource-tags: > # optional, requires additional permissions
             [
-              {"Key": "Name", "Value": "ec2-github-runner"},
+              {"Key": "Name", "Value": "wazuh-ansible-gh-runner-aio"},
               {"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
             ]
-  do-the-job:
-    name: Do the job on the runner
+  install-aio-single-instance:
+    name: Installs AIO single instance
     needs: start-runner # required to start the main job when the runner is ready
     runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
     steps:
@@ -47,7 +46,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: '3.x'
-      - name: Ansible Playbook run Wazuh AIO
+      - name: Ansible Playbook run Wazuh AIO Single instance
         run: ansible-playbook ./.github/playbooks/aio-wazuh.yml
         env:
           PY_COLORS: '1'
@@ -56,7 +55,7 @@ jobs:
     name: Stop self-hosted EC2 runner
     needs:
       - start-runner # required to get output from the start-runner job
-      - do-the-job # required to wait when the main job is done
+      - install-aio-single-instance # required to wait when the main job is done
     runs-on: ubuntu-latest
     if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
     steps:
diff --git a/.github/workflows/main_wazuh.yml b/.github/workflows/main_wazuh.yml
index 7cd0a15c..a6954a23 100644
--- a/.github/workflows/main_wazuh.yml
+++ b/.github/workflows/main_wazuh.yml
@@ -1,5 +1,5 @@
 ---
-name: do-the-job
+name: Wazuh-Single-Instance
 on: [push, pull_request, workflow_dispatch, release]
 jobs:
   start-runner:
@@ -25,14 +25,13 @@ jobs:
           ec2-instance-type: t3.small
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SG_ID }}
-          #iam-role-name: my-role-name # optional, requires additional permissions
           aws-resource-tags: > # optional, requires additional permissions
             [
-              {"Key": "Name", "Value": "ec2-github-runner"},
+              {"Key": "Name", "Value": "wazuh-ansible-gh-runner-wazuh"},
               {"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
             ]
-  do-the-job:
-    name: Do the job on the runner
+  install-wazuh-single-instance:
+    name: Installs Wazuh server single instance
     needs: start-runner # required to start the main job when the runner is ready
     runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
     steps:
@@ -47,7 +46,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: '3.x'
-      - name: Ansible Playbook run Wazuh Single node instance
+      - name: Ansible Playbook run Wazuh Single instance
         run: ansible-playbook ./.github/playbooks/single-wazuh.yml
         env:
           PY_COLORS: '1'
@@ -56,7 +55,7 @@ jobs:
     name: Stop self-hosted EC2 runner
     needs:
       - start-runner # required to get output from the start-runner job
-      - do-the-job # required to wait when the main job is done
+      - install-wazuh-single-instance # required to wait when the main job is done
     runs-on: ubuntu-latest
     if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
     steps: