From ac412f16ef874b5e695be398455e16c409e19614 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <kris@lamoureux.io>
Date: Thu, 19 Oct 2023 14:09:10 -0400
Subject: [PATCH] Simplify the "Import GPG keys" loop

---
 dev/host_vars/docker.yml    |  4 ++--
 roles/base/tasks/system.yml | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/host_vars/docker.yml b/dev/host_vars/docker.yml
index 3eb0987..bbfbfa0 100644
--- a/dev/host_vars/docker.yml
+++ b/dev/host_vars/docker.yml
@@ -3,8 +3,8 @@ allow_reboot: false
 manage_network: false
 
 root_gpgkeys:
-    # kris@lamoureux.io
-  - id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
+  - name: kris@lamoureux.io
+    id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
 
 # docker
 docker_users:
diff --git a/roles/base/tasks/system.yml b/roles/base/tasks/system.yml
index ae57615..2e19d9c 100644
--- a/roles/base/tasks/system.yml
+++ b/roles/base/tasks/system.yml
@@ -18,19 +18,19 @@
   when: root_gpgkeys is defined
 
 - name: Import GPG keys
-  command: "gpg --keyserver {{ item.0.server | default('keys.openpgp.org') }} --recv-key {{ item.0.id }}"
+  command: "gpg --keyserver {{ item.item.server | default('keys.openpgp.org') }} --recv-key {{ item.item.id }}"
   register: gpg_check_import
-  loop: "{{ root_gpgkeys | zip(gpg_check.results) | list }}"
+  loop: "{{ gpg_check.results }}"
   loop_control:
-    label: "{{ item.0.id }}"
-  when: root_gpgkeys is defined and item.1.rc != 0
+    label: "{{ item.item.name }}"
+  when: root_gpgkeys is defined and item.rc != 0
 
 - name: Check GPG key imports
   fail:
     msg: "{{ item.stderr }}"
   loop: "{{ gpg_check_import.results }}"
   loop_control:
-    label: "{{ item.item.0.id }}"
+    label: "{{ item.item.item.id }}"
   when: (item.skipped | default(false) == false) and ('imported' not in item.stderr)
 
 - name: Install NTPsec