improv: update variable names and add other changes (#12)

README.md

@@ -21,8 +21,8 @@ Requirements
 Role Variables
 --------------
 
-- `microsoft_repository_mirror` Mirror of `Microsoft` repository (default: `https://packages.microsoft.com`).
-- `microsoft_repository_key_url` URL to `Microsoft's` GPG public key file (default: `https://packages.microsoft.com/keys/microsoft.asc`).
+- `microsoft_repository_mirror_url` Mirror of `Microsoft` repository (default: `https://packages.microsoft.com`).
+- `microsoft_repository_gpgkey` URL to `Microsoft's` GPG public key file (default: `https://packages.microsoft.com/keys/microsoft.asc`).
 - `microsoft_repository_dirs_list` List of repository directories. See [repository structure](https://packages.microsoft.com/).
 
   Available values:
@@ -75,7 +75,7 @@ Example Playbook
       - role: antmelekhin.microsoft_repository
         microsoft_repository_dirs_list:
           - name: azure-cli
-            type: alternate
+            type: alternative
         microsoft_repository_packages:
           - azure-cli
   ```

defaults/main.yml

@@ -1,6 +1,6 @@
 ---
-microsoft_repository_mirror: 'https://packages.microsoft.com'
-microsoft_repository_key_url: 'https://packages.microsoft.com/keys/microsoft.asc'
+microsoft_repository_mirror_url: 'https://packages.microsoft.com'
+microsoft_repository_gpgkey: '{{ microsoft_repository_mirror_url }}/keys/microsoft.asc'
 
 microsoft_repository_dirs_list:
   - name: prod

molecule/default/converge.yml

@@ -6,7 +6,7 @@
       microsoft_repository_dirs_list:
         - name: prod
         - name: azure-cli
-          type: alternate
+          type: alternative
       microsoft_repository_packages:
         - powershell
         - azure-cli

tasks/install-Debian.yml

@@ -12,7 +12,8 @@
 
     - name: 'Add Microsoft APT key'
       ansible.builtin.apt_key:
-        url: '{{ microsoft_repository_key_url }}'
+        url: '{{ microsoft_repository_gpgkey }}'
+        keyring: '/usr/share/keyrings/microsoft-archive-keyring.gpg'
         state: present
       when: not ansible_check_mode
 

tasks/install-RedHat.yml

@@ -2,11 +2,6 @@
 - name: 'Configure DNF/YUM repository and install Microsoft packages'
   become: true
   block:
-    - name: 'Add Microsoft DNF/YUM key'
-      ansible.builtin.rpm_key:
-        key: '{{ microsoft_repository_key_url }}'
-        state: present
-
     - name: 'Add Microsoft DNF/YUM repository'
       ansible.builtin.template:
         src: 'microsoft.repo.j2'

templates/microsoft.list.j2

@@ -1,9 +1,9 @@
 {{ ansible_managed | comment }}
 
 {% for microsoft_repository_dir in microsoft_repository_dirs_list %}
-{% if microsoft_repository_dir.type is defined and microsoft_repository_dir.type == 'alternate' %}
-deb [arch=amd64,arm64,armhf] {{ microsoft_repository_mirror }}/repos/{{ microsoft_repository_dir.name }} {{ ansible_distribution_release }} main
+{% if microsoft_repository_dir.type is defined and microsoft_repository_dir.type == 'alternative' %}
+deb [arch=amd64,arm64,armhf signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] {{ _microsoft_repository_alternative_mirror_url }}/{{ microsoft_repository_dir.name }} {{ ansible_distribution_release }} main
 {% else %}
-deb [arch=amd64,arm64,armhf] {{ _microsoft_repository_baseurl }}/{{ microsoft_repository_dir.name }} {{ ansible_distribution_release }} main
+deb [arch=amd64,arm64,armhf signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] {{ _microsoft_repository_base_mirror_url }}/{{ microsoft_repository_dir.name }} {{ ansible_distribution_release }} main
 {% endif %}
 {% endfor %}

templates/microsoft.repo.j2

@@ -2,14 +2,14 @@
 
 {% 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 == 'alternate' %}
-baseurl = {{ microsoft_repository_mirror }}/yumrepos/{{ 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 }}
 {% else %}
-baseurl = {{ _microsoft_repository_baseurl }}/{{ microsoft_repository_dir.name }}
+baseurl = {{ _microsoft_repository_base_mirror_url }}/{{ microsoft_repository_dir.name }}
 {% endif %}
 enabled = 1
 gpgcheck = 1
-gpgkey = {{ microsoft_repository_key_url }}
+gpgkey = {{ microsoft_repository_gpgkey }}
 name = packages-microsoft-com-{{ microsoft_repository_dir.name }}
 
 {% endfor %}

vars/Debian.yml

@@ -1,2 +1,3 @@
 ---
-_microsoft_repository_baseurl: '{{ microsoft_repository_mirror }}/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version }}'
+_microsoft_repository_base_mirror_url: '{{ microsoft_repository_mirror_url }}/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version }}'
+_microsoft_repository_alternative_mirror_url: '{{ microsoft_repository_mirror_url }}/repos'

vars/RedHat.yml

@@ -1,2 +1,3 @@
 ---
-_microsoft_repository_baseurl: '{{ microsoft_repository_mirror }}/rhel/{{ ansible_distribution_major_version }}'
+_microsoft_repository_base_mirror_url: '{{ microsoft_repository_mirror_url }}/rhel/{{ ansible_distribution_major_version }}'
+_microsoft_repository_alternative_mirror_url: '{{ microsoft_repository_mirror_url }}/yumrepos'

vars/Ubuntu.yml

@@ -1,2 +1,3 @@
 ---
-_microsoft_repository_baseurl: '{{ microsoft_repository_mirror }}/{{ ansible_distribution | lower }}/{{ ansible_distribution_version }}'
+_microsoft_repository_base_mirror_url: '{{ microsoft_repository_mirror_url }}/{{ ansible_distribution | lower }}/{{ ansible_distribution_version }}'
+_microsoft_repository_alternative_mirror_url: '{{ microsoft_repository_mirror_url }}/repos'