From c512063706171a5ceffad528bf1f43b2a8cb2d08 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Thu, 18 Apr 2024 14:21:54 -0500
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MariaDB=20apt-key=20is?=
 =?UTF-8?q?=20deprecated=20failure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/mariadb/defaults/main.yml |  2 --
 roles/mariadb/tasks/main.yml    | 41 +++++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/roles/mariadb/defaults/main.yml b/roles/mariadb/defaults/main.yml
index 12a81ad2af..4ec8d0b364 100644
--- a/roles/mariadb/defaults/main.yml
+++ b/roles/mariadb/defaults/main.yml
@@ -1,6 +1,4 @@
 mariadb_version: 10.6
-mariadb_keyserver: "hkp://keyserver.ubuntu.com:80"
-mariadb_keyserver_id: "0xF1656F24C74CD1D8"
 mariadb_ppa: "deb https://mirror.rackspace.com/mariadb/repo/{{ mariadb_version }}/ubuntu {{ ansible_distribution_release }} main"
 
 mariadb_client_package: mariadb-client
diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index de3b9fb072..a65da1b9c9 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -1,24 +1,41 @@
 ---
-- block:
-  - name: Add MariaDB APT key
-    apt_key:
-      keyserver: "{{ mariadb_keyserver }}"
-      id: "{{ mariadb_keyserver_id }}"
+- name: Download MariaDB GPG key
+  ansible.builtin.get_url:
+    url: "https://mariadb.org/mariadb_release_signing_key.asc"
+    dest: "/tmp/mariadb_release_signing_key.asc"
+    mode: '0644'
+
+- name: Add the MariaDB GPG key to apt
+  ansible.builtin.shell:
+    cmd: "apt-key add /tmp/mariadb_release_signing_key.asc"
+  args:
+    removes: "/tmp/mariadb_release_signing_key.asc"
+
+- name: Setup MariaDB repository
+  ansible.builtin.copy:
+    dest: "/etc/apt/sources.list.d/mariadb.list"
+    content: |
+      # Ansible managed
+      {{ mariadb_ppa }}
+    mode: "0644"
 
-  - name: Add MariaDB PPA
-    apt_repository:
-      repo: "{{ mariadb_ppa }}"
-      update_cache: yes
+- name: Install necessary packages for repository management
+  ansible.builtin.apt:
+    name:
+      - apt-transport-https
+      - gnupg
+    state: present
+    update_cache: true
 
 - name: Install MySQL client
-  apt:
+  ansible.builtin.apt:
     name: "{{ mariadb_client_package }}"
     state: "{{ mariadb_client_package_state | default(apt_package_state) }}"
-    cache_valid_time: "{{ apt_cache_valid_time }}"
+    update_cache: true
 
 - block:
   - name: Install MySQL server
-    apt:
+    ansible.builtin.apt:
       name: "{{ mariadb_server_package }}"
       state: "{{ mariadb_server_package_state | default(apt_package_state) }}"
       cache_valid_time: "{{ apt_cache_valid_time }}"

From a8defed6b7daffa3a5d4a6657c0937fe9f6e7ce0 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Fri, 19 Apr 2024 10:11:36 -0500
Subject: [PATCH 2/3] Use apt_repository

---
 roles/mariadb/tasks/main.yml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index a65da1b9c9..d9954e8731 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -11,21 +11,10 @@
   args:
     removes: "/tmp/mariadb_release_signing_key.asc"
 
-- name: Setup MariaDB repository
-  ansible.builtin.copy:
-    dest: "/etc/apt/sources.list.d/mariadb.list"
-    content: |
-      # Ansible managed
-      {{ mariadb_ppa }}
-    mode: "0644"
-
-- name: Install necessary packages for repository management
-  ansible.builtin.apt:
-    name:
-      - apt-transport-https
-      - gnupg
-    state: present
-    update_cache: true
+- name: Add MariaDB PPA
+  apt_repository:
+    repo: "{{ mariadb_ppa }}"
+    update_cache: yes
 
 - name: Install MySQL client
   ansible.builtin.apt:

From 5ba3c9301cda7984128d2a3e188fea4f5d953a72 Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Mon, 22 Apr 2024 22:16:47 -0400
Subject: [PATCH 3/3] Use apt_key module

---
 roles/mariadb/tasks/main.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index d9954e8731..58d8ea1717 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -1,15 +1,8 @@
 ---
-- name: Download MariaDB GPG key
-  ansible.builtin.get_url:
+- name: Add an Apt signing key, uses whichever key is at the URL
+  ansible.builtin.apt_key:
     url: "https://mariadb.org/mariadb_release_signing_key.asc"
-    dest: "/tmp/mariadb_release_signing_key.asc"
-    mode: '0644'
-
-- name: Add the MariaDB GPG key to apt
-  ansible.builtin.shell:
-    cmd: "apt-key add /tmp/mariadb_release_signing_key.asc"
-  args:
-    removes: "/tmp/mariadb_release_signing_key.asc"
+    state: present
 
 - name: Add MariaDB PPA
   apt_repository: