improv: merge OS-specific variables into the vars/main.yml file

tasks/install-Debian.yml

@@ -9,13 +9,14 @@
           - 'ca-certificates'
           - 'gnupg'
         update_cache: true
+        cache_valid_time: 3600
         state: 'present'
-      when: not ansible_check_mode
+      check_mode: false
 
     - name: 'Debian | Add the Microsoft repository GPG key'
       ansible.builtin.apt_key:
         url: '{{ microsoft_repository_gpgkey_url }}'
-        keyring: '{{ _microsoft_repository_local_gpgkey_path }}'
+        keyring: '{{ __microsoft_repository_gpgkey_keyring }}'
         state: 'present'
 
     - name: 'Debian | Add the Microsoft repository'
@@ -31,4 +32,4 @@
         name: '{{ microsoft_repository_packages }}'
         update_cache: true
         state: 'present'
-      when: not ansible_check_mode
+      ignore_errors: '{{ ansible_check_mode }}'

tasks/install-RedHat.yml

@@ -4,7 +4,9 @@
   block:
     - name: 'RedHat | Ensure the dependencies are installed'
       ansible.builtin.package:
-        name: 'yum-utils'
+        name:
+          - 'ca-certificates'
+          - 'yum-utils'
         state: 'present'
 
     - name: 'RedHat | Add the Microsoft repository'
@@ -19,4 +21,4 @@
       ansible.builtin.package:
         name: '{{ microsoft_repository_packages }}'
         state: 'present'
-      when: not ansible_check_mode
+      ignore_errors: '{{ ansible_check_mode }}'

tasks/main.yml

@@ -1,6 +1,3 @@
 ---
-- name: 'Load the Microsoft repository OS-specific variables'
-  ansible.builtin.include_vars: '{{ ansible_os_family }}.yml'
-
 - name: 'Install Microsoft packages'
   ansible.builtin.include_tasks: 'install-{{ ansible_os_family }}.yml'

templates/microsoft.list.j2

@@ -2,8 +2,8 @@
 
 {% for microsoft_repository_dir in microsoft_repository_dirs_list %}
 {% if microsoft_repository_dir.type is defined and microsoft_repository_dir.type == 'alternative' %}
-deb [arch=amd64,arm64,armhf signed-by={{ _microsoft_repository_local_gpgkey_path }}] {{ _microsoft_repository_alternative_mirror_url }}/{{ microsoft_repository_dir.name }} {{ ansible_distribution_release }} main
+deb [arch=amd64,arm64,armhf signed-by={{ __microsoft_repository_gpgkey_keyring }}] {{ __microsoft_repository_alternative }}/{{ microsoft_repository_dir.name }} {{ ansible_distribution_release }} main
 {% else %}
-deb [arch=amd64,arm64,armhf signed-by={{ _microsoft_repository_local_gpgkey_path }}] {{ _microsoft_repository_base_mirror_url }}/{{ microsoft_repository_dir.name }} {{ ansible_distribution_release }} main
+deb [arch=amd64,arm64,armhf signed-by={{ __microsoft_repository_gpgkey_keyring }}] {{ __microsoft_repository_base }}/{{ microsoft_repository_dir.name }} {{ ansible_distribution_release }} main
 {% endif %}
 {% endfor %}

templates/microsoft.repo.j2

@@ -3,9 +3,9 @@
 {% for microsoft_repository_dir in microsoft_repository_dirs_list %}
 [packages-microsoft-com-{{ microsoft_repository_dir.name }}]
 {% if microsoft_repository_dir.type is defined and microsoft_repository_dir.type == 'alternative' %}
-baseurl = {{ _microsoft_repository_alternative_mirror_url }}/{{ microsoft_repository_dir.name }}
+baseurl = {{ __microsoft_repository_alternative }}/{{ microsoft_repository_dir.name }}
 {% else %}
-baseurl = {{ _microsoft_repository_base_mirror_url }}/{{ microsoft_repository_dir.name }}
+baseurl = {{ __microsoft_repository_base }}/{{ microsoft_repository_dir.name }}
 {% endif %}
 enabled = 1
 gpgcheck = 1

vars/main.yml

@@ -0,0 +1,14 @@
+---
+__microsoft_repository_gpgkey_keyring: '/usr/share/keyrings/microsoft-archive-keyring.gpg'
+
+__microsoft_repository_base_dict:
+  Debian: "{{ microsoft_repository_mirror_url }}/{{ ansible_distribution | lower }}/{{ (ansible_distribution == 'Ubuntu') | ternary(ansible_distribution_version, ansible_distribution_major_version) }}"
+  RedHat: '{{ microsoft_repository_mirror_url }}/rhel/{{ ansible_distribution_major_version }}'
+
+__microsoft_repository_base: '{{ __microsoft_repository_base_dict[ansible_os_family] }}'
+
+__microsoft_repository_alternative_dict:
+  Debian: '{{ microsoft_repository_mirror_url }}/repos'
+  RedHat: '{{ microsoft_repository_mirror_url }}/yumrepos'
+
+__microsoft_repository_alternative: '{{ __microsoft_repository_alternative_dict[ansible_os_family] }}'