Add loop_var in cifmw_helpers task files; trim variables

To avoid unecessary conflicts issue where "item" was already used
in higher task, let's add loop_var to have better control on the
vars what are parsed.
Also trim variables in var_dir and var_file and improve finding files
to parse in var_dir helper.

Signed-off-by: Daniel Pawlik <[email protected]>

Author: danpawlik

roles/cifmw_helpers/tasks/set_dir_facts.yml

@@ -1,8 +1,10 @@
 ---
 - name: Set files as fact
-  when: "'content' in item"
+  when: "'content' in dir_item"
   ansible.builtin.set_fact:
-    "{{ item.key }}": "{{ item.value }}"
+    "{{ _file_content.key }}": "{{ _file_content.value }}"
     cacheable: true
-  loop: "{{ item['content'] | b64decode | from_yaml | dict2items }}"
+  loop: "{{ dir_item['content'] | b64decode | from_yaml | dict2items }}"
+  loop_control:
+    loop_var: _file_content
   no_log: "{{ cifmw_helpers_no_log }}"

roles/cifmw_helpers/tasks/var_dir.yml

@@ -4,26 +4,38 @@
 # In that case, include_vars would not work.
 - name: Check directory is available
   ansible.builtin.stat:
-    path: "{{ provided_dir }}"
+    path: "{{ provided_dir | trim }}"
   register: param_dir
 
 - name: List files available in dir and parse
   when: param_dir.stat.exists
   block:
-    - name: List available files
-      ansible.builtin.command: |
-        ls {{ provided_dir }}
-      register: _param_dir
+    - name: Find yaml files
+      ansible.builtin.find:
+        paths: "{{ provided_dir | trim }}"
+        patterns: "*.yml,*.yaml"
+        file_type: file
+        recurse: false
+      register: _yaml_files
+
+    - name: Print available yaml files
+      ansible.builtin.debug:
+        msg: |
+          Found yaml files to parse: {{ _yaml_files.files | map(attribute='path') | list }}
 
     - name: Read vars
       ansible.builtin.slurp:
-        src: "{{ provided_dir }}/{{ item }}"
-      register: _parsed_vars
-      loop: "{{ _param_dir.stdout_lines }}"
+        src: "{{ _file_to_parse.path }}"
+      loop: "{{ _yaml_files.files }}"
+      loop_control:
+        loop_var: _file_to_parse
       no_log: "{{ cifmw_helpers_no_log }}"
+      register: _parsed_vars
 
     - name: Call task to parse all files as fact
       ansible.builtin.include_tasks:
         file: set_dir_facts.yml
-      loop: '{{ _parsed_vars["results"] }}'
+      loop: "{{ _parsed_vars['results'] }}"
+      loop_control:
+        loop_var: dir_item
       no_log: "{{ cifmw_helpers_no_log }}"

roles/cifmw_helpers/tasks/var_file.yml

@@ -1,20 +1,28 @@
 ---
+- name: Fail if file is not yaml or yml extension
+  ansible.builtin.fail:
+    msg: "File needs to be yaml/yml extension"
+  when:
+    - provided_file | trim | regex_search('\.(yml|yaml)$') == None
+
 - name: Check if file is available
   ansible.builtin.stat:
-    path: "{{ provided_file }}"
+    path: "{{ provided_file | trim }}"
   register: _param_file
 
 - name: Read vars
   when: _param_file.stat.exists
   ansible.builtin.slurp:
-    src: "{{ provided_file }}"
+    src: "{{ provided_file | trim }}"
   register: _parsed_vars
   no_log: "{{ cifmw_helpers_no_log }}"
 
 - name: Set vars as fact
   when: "'content' in _parsed_vars"
   ansible.builtin.set_fact:
-    "{{ item.key }}": "{{ item.value }}"
+    "{{ file_item.key }}": "{{ file_item.value }}"
     cacheable: true
   loop: "{{ _parsed_vars['content'] | b64decode | from_yaml | dict2items }}"
   no_log: "{{ cifmw_helpers_no_log }}"
+  loop_control:
+    loop_var: file_item

roles/cifmw_helpers/tasks/various_vars.yml

@@ -2,12 +2,16 @@
 # various_vars
 - name: Filter Ansible variable files and set as fact
   vars:
-    provided_file: "{{ item | replace('@','') }}"
+    provided_file: "{{ various_file_item | replace('@','') }}"
   ansible.builtin.include_tasks: var_file.yml
   loop: "{{ various_vars | select('match', '^@.*\\.(yml|yaml)$') | list }}"
+  loop_control:
+    loop_var: various_file_item
 
 - name: Filter just dict and set as fact
   ansible.builtin.set_fact:
-    "{{ item.key }}": "{{ item.value }}"
+    "{{ various_item.key }}": "{{ various_item.value }}"
     cacheable: true
   loop: "{{ (various_vars | select('mapping') | list) | map('dict2items') | flatten }}"
+  loop_control:
+    loop_var: various_item