From 801a825a3824996981f5b79a601ecc4553fb678f Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Tue, 23 Apr 2024 09:51:44 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MariaDB=20apt-key=20is=20d?=
 =?UTF-8?q?eprecated=20failure=20(#1515)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🐛 Fix MariaDB apt-key is deprecated failure

* Use apt_repository

* Use apt_key module

---------

Co-authored-by: Scott Walkinshaw <scott.walkinshaw@gmail.com>
---
 roles/mariadb/defaults/main.yml |  2 --
 roles/mariadb/tasks/main.yml    | 23 +++++++++++------------
 2 files changed, 11 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..58d8ea1717 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -1,24 +1,23 @@
 ---
-- block:
-  - name: Add MariaDB APT key
-    apt_key:
-      keyserver: "{{ mariadb_keyserver }}"
-      id: "{{ mariadb_keyserver_id }}"
+- 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"
+    state: present
 
-  - name: Add MariaDB PPA
-    apt_repository:
-      repo: "{{ mariadb_ppa }}"
-      update_cache: yes
+- name: Add MariaDB PPA
+  apt_repository:
+    repo: "{{ mariadb_ppa }}"
+    update_cache: yes
 
 - 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 }}"