From f42b44d4253f99d6098a67a8ce1a1b2443e9459c Mon Sep 17 00:00:00 2001
From: Murat Aybars <39916128+aybarsm@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:59:13 +0100
Subject: [PATCH] Empty commit message

---
 roles/grub/defaults/main.yml               | 2 +-
 roles/network_interfaces/defaults/main.yml | 2 +-
 roles/package_manager/defaults/main.yml    | 5 -----
 roles/package_manager/tasks/main.yml       | 6 ++++--
 roles/package_manager/vars/common.yml      | 9 +++++++++
 roles/package_manager/vars/debian.yml      | 3 +++
 6 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 roles/package_manager/vars/common.yml

diff --git a/roles/grub/defaults/main.yml b/roles/grub/defaults/main.yml
index b1343b5..30986f0 100644
--- a/roles/grub/defaults/main.yml
+++ b/roles/grub/defaults/main.yml
@@ -27,4 +27,4 @@ linux_grub_host: []
 # linux_grub_host > linux_grub_group > linux_grub_default
 linux_grub_all: "{{ [linux_grub_default, linux_grub_group, linux_grub_host] |
   community.general.lists_mergeby('name', recursive=true, list_merge='prepend') |
-  aybarsm.helper.unique_recursive(attribute='name', recurse='value') }}"
+  aybarsm.helper.unique_recursive(attributes='name', recurse='value') }}"
diff --git a/roles/network_interfaces/defaults/main.yml b/roles/network_interfaces/defaults/main.yml
index eaccf7c..7003725 100644
--- a/roles/network_interfaces/defaults/main.yml
+++ b/roles/network_interfaces/defaults/main.yml
@@ -54,7 +54,7 @@ linux_network_interfaces_host: []
 linux_network_interfaces_all: "{{
   [linux_network_interfaces_default, linux_network_interfaces_group, linux_network_interfaces_host] |
   community.general.lists_mergeby('name', recursive=true, list_merge='prepend') |
-  aybarsm.helper.unique_recursive(attribute='name', recurse='inet') | aybarsm.helper.unique_recursive(attribute='name', recurse='inet6') }}"
+  aybarsm.helper.unique_recursive(attributes='name', recurse='inet') | aybarsm.helper.unique_recursive(attributes='name', recurse='inet6') }}"
 
 # linux_network_interfaces_default:
 #   - name: enp0s6
diff --git a/roles/package_manager/defaults/main.yml b/roles/package_manager/defaults/main.yml
index 9972269..3927fd2 100644
--- a/roles/package_manager/defaults/main.yml
+++ b/roles/package_manager/defaults/main.yml
@@ -9,8 +9,3 @@ linux_package_manager_default: []
 linux_package_manager_group: []
 linux_package_manager_host: []
 linux_package_manager_all: "{{ (linux_package_manager_default + linux_package_manager_group + linux_package_manager_host) | selectattr('type', 'defined') }}"
-
-linux_package_manager_packages_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'package') |
-  selectattr('name', 'defined') | unique(attribute='name') | default([]) }}"
-linux_package_manager_repos_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'repo') |
-  selectattr('repo', 'defined') | unique(attribute='repo') | default([]) }}"
diff --git a/roles/package_manager/tasks/main.yml b/roles/package_manager/tasks/main.yml
index a39da83..0c19047 100644
--- a/roles/package_manager/tasks/main.yml
+++ b/roles/package_manager/tasks/main.yml
@@ -1,7 +1,9 @@
 ---
 - name: Load OS related variables
-  ansible.builtin.include_vars:
-    file: "{{ ansible_facts['os_family'] | lower }}.yml"
+  ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml"
+
+- name: Load common variables structured on OS related variables
+  ansible.builtin.include_vars: common.yml
 
 - name: Import APT package manager tasks
   ansible.builtin.import_tasks:
diff --git a/roles/package_manager/vars/common.yml b/roles/package_manager/vars/common.yml
new file mode 100644
index 0000000..2de5c46
--- /dev/null
+++ b/roles/package_manager/vars/common.yml
@@ -0,0 +1,9 @@
+linux_package_manager_packages_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'package') |
+  aybarsm.helper.selectattr_defined(attributes=__linux_package_manager_uniques_package, logic='or') |
+  aybarsm.helper.unique_recursive(attributes=__linux_package_manager_uniques_package) | default([]) }}"
+linux_package_manager_repos_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'repo') |
+  aybarsm.helper.selectattr_defined(attributes=__linux_package_manager_uniques_repo, logic='or') |
+  aybarsm.helper.unique_recursive(attributes=__linux_package_manager_uniques_repo) | default([]) }}"
+linux_package_manager_repo_keys_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'repo_key') |
+  aybarsm.helper.selectattr_defined(attributes=__linux_package_manager_uniques_repo_key, logic='or') |
+  aybarsm.helper.unique_recursive(attributes=__linux_package_manager_uniques_repo_key) | default([]) }}"
diff --git a/roles/package_manager/vars/debian.yml b/roles/package_manager/vars/debian.yml
index e69de29..958979e 100644
--- a/roles/package_manager/vars/debian.yml
+++ b/roles/package_manager/vars/debian.yml
@@ -0,0 +1,3 @@
+__linux_package_manager_uniques_package: ['name']
+__linux_package_manager_uniques_repo: ['repo']
+__linux_package_manager_uniques_repo_key: ['keyserver', 'url', 'id', 'data', 'file']
\ No newline at end of file