From 6b9fccb1eac7eddcd361b7769edba34e36f837b0 Mon Sep 17 00:00:00 2001
From: Damien <sepales.pret0h@icloud.com>
Date: Tue, 2 Jun 2026 08:13:05 +0200
Subject: [PATCH] Rename async job variables for consistency

Rename async job variables in UFW and upgrade roles to follow a
consistent
naming pattern (upgrade_<os>_job) for better maintainability.
---
 roles/ufw/tasks/main.yml     | 10 +++++-----
 roles/upgrade/tasks/main.yml | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/roles/ufw/tasks/main.yml b/roles/ufw/tasks/main.yml
index afa9476..ccbc2fb 100644
--- a/roles/ufw/tasks/main.yml
+++ b/roles/ufw/tasks/main.yml
@@ -18,11 +18,11 @@
 - name: Add UFW to default runlevel (Alpine)
   ansible.builtin.command:
     cmd: rc-update add ufw default
-  register: rc_update_result
-  changed_when: >- # ">- : transform multiple lines into one line"
-    'already' not in rc_update_result.stdout
-    and 'already' not in rc_update_result.stderr
-  failed_when: rc_update_result.rc != 0
+  register: ufw_rc_update_result
+  changed_when: >- # " >- : transform multiple lines into one line"
+    'already' not in ufw_rc_update_result.stdout
+    and 'already' not in ufw_rc_update_result.stderr
+  failed_when: ufw_rc_update_result.rc != 0
   when: ansible_facts['os_family'] == "Alpine"
 
 - name: Set default incoming policy
diff --git a/roles/upgrade/tasks/main.yml b/roles/upgrade/tasks/main.yml
index f93a2f8..a31cf2e 100644
--- a/roles/upgrade/tasks/main.yml
+++ b/roles/upgrade/tasks/main.yml
@@ -10,7 +10,7 @@
     update_cache: true
   async: 3600
   poll: 0
-  register: alpine_upgrade
+  register: upgrade_alpine_job
   # By default async job return change: true
   # Force adapting the change condition for idempotency
   changed_when: false
@@ -18,18 +18,18 @@
 
 - name: Wait for Alpine upgrade
   ansible.builtin.async_status:
-    jid: "{{ alpine_upgrade.ansible_job_id }}"
-  register: alpine_result
-  until: alpine_result.finished
+    jid: "{{ upgrade_alpine_job.ansible_job_id }}"
+  register: upgrade_alpine_result
+  until: upgrade_alpine_result.finished
   retries: 60
   delay: 10
   # By default async job return change: true
   # Force adapting the change condition for idempotency
-  changed_when: alpine_result.changed | default(false)
+  changed_when: upgrade_alpine_result.changed | default(false)
   ignore_unreachable: true
   when:
     - ansible_facts['os_family'] == "Alpine"
-    - alpine_upgrade.ansible_job_id is defined
+    - upgrade_alpine_job.ansible_job_id is defined
 
 - name: Upgrade all packages (Debian)
   ansible.builtin.apt:
@@ -37,7 +37,7 @@
     update_cache: true
   async: 3600
   poll: 0
-  register: debian_upgrade
+  register: upgrade_debian_job
   # By default async job return change: true
   # Force adapting the change condition for idempotency
   changed_when: false
@@ -45,15 +45,15 @@
 
 - name: Wait for Debian upgrade
   ansible.builtin.async_status:
-    jid: "{{ debian_upgrade.ansible_job_id }}"
-  register: debian_result
-  until: debian_result.finished
+    jid: "{{ upgrade_debian_job.ansible_job_id }}"
+  register: upgrade_debian_result
+  until: upgrade_debian_result.finished
   retries: 60
   delay: 10
   # By default async job return change: true
   # Force adapting the change condition for idempotency
-  changed_when: debian_result.changed | default(false)
+  changed_when: upgrade_debian_result.changed | default(false)
   ignore_unreachable: true
   when:
     - ansible_facts['os_family'] == "Debian"
-    - debian_upgrade.ansible_job_id is defined
+    - upgrade_debian_job.ansible_job_id is defined