From bf43df93b42ebe0b4eb76f19d87ed3ab60142be7 Mon Sep 17 00:00:00 2001
From: Adrien Waksberg <git@waks.be>
Date: Fri, 16 Feb 2024 11:09:29 +0100
Subject: [PATCH] chore: replace apt_key to get_url

---
 CHANGELOG.md                  |  4 ++++
 README.md                     |  1 -
 defaults/main.yml             |  2 +-
 meta/main.yml                 |  1 -
 molecule/default/molecule.yml |  9 ---------
 tasks/main.yml                | 16 ++++++++++------
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c29d485..be0d0ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 - test: add support Debian 12
 
+### Changed
+
+- chore: replace apt_key to get_url
+
 ### Removed
 
 - test: remove support Debian 11
diff --git a/README.md b/README.md
index 5b58a9e..0d7dabf 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,6 @@ Install and configure kibana
 
 * Ansible >= 2.9
 * Debian
-  * Bullseye
   * Bookworm
 
 ## Role variables
diff --git a/defaults/main.yml b/defaults/main.yml
index 59ac9e4..f0992e2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
-kibana_major_version: 7
+kibana_major_version: 8
 kibana_config: {}
diff --git a/meta/main.yml b/meta/main.yml
index 3b94e05..5150383 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - bullseye
         - bookworm
 
   galaxy_tags:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 58f7769..89bf10a 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -11,15 +11,6 @@ platforms:
     command: /bin/systemd
     capabilities:
       - SYS_ADMIN
-  - name: debian11
-    image: nishiki/debian11:molecule
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    command: /bin/systemd
-    capabilities:
-      - SYS_ADMIN
 lint: |
   set -e
   yamllint .
diff --git a/tasks/main.yml b/tasks/main.yml
index 2335861..6b431ee 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,16 +7,21 @@
   tags: kibana
 
 - name: Add repository key
-  ansible.builtin.apt_key:
+  ansible.builtin.get_url:
     url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
-  retries: 2
-  register: result
-  until: result is succeeded
+    dest: /etc/apt/keyrings/elastic.asc
+    owner: root
+    group: root
+    mode: 0644
+    checksum: sha256:db52809c5f6b27f9c2bed45cb43e398c659275f3d35305653c6750a0db90f5eb
   tags: kibana
 
 - name: Add repository
   ansible.builtin.apt_repository:
-    repo: 'deb https://artifacts.elastic.co/packages/{{ kibana_major_version }}.x/apt stable main'
+    repo: >
+      deb [signed-by=/etc/apt/keyrings/elastic.asc]
+      https://artifacts.elastic.co/packages/{{ kibana_major_version }}.x/apt stable main
+    filename: elastic
   tags: kibana
 
 - name: Install package
@@ -24,7 +29,6 @@
     name:
       - kibana
   tags: kibana
-
 - name: Copy config file
   ansible.builtin.copy:
     content: '{{ kibana_config | to_yaml }}'