From 4ca45854f26e466d2fa992ac76fca48c81a397e3 Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert.debock@adfinis.com>
Date: Wed, 14 Jun 2023 12:53:50 +0200
Subject: [PATCH] Make Amazon linux great again.

---
 README.md                     | 3 ++-
 defaults/main.yml             | 2 +-
 molecule/default/converge.yml | 1 +
 molecule/default/verify.yml   | 5 +----
 vars/main.yml                 | 3 +++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e318767..a3dedaf 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ This example is taken from [`molecule/default/converge.yml`](https://github.com/
   vars:
     _desired_java_version:
       default: 8
+      Amazon: 17
       Debian: 11
       Debian-bookworm: 17
     desired_java_version: "{{ _desired_java_version[ansible_distribution ~ '-' ~ ansible_distribution_release] | default(_desired_java_version[ansible_distribution] | default(_desired_java_version['default'])) }}"
@@ -59,7 +60,7 @@ java_vendor: openjdk
 # Set the variable to install the type, valid values are "jre" and "jdk".
 java_type: jre
 
-# Set the version of java, valid values are 6, 7, 8, 9, 10, 11, 12 or 13.
+# Set the version of java, valid values are 6, 7, 8, 9, 10, 11, 12, 13 or 17.
 # By default, a distribution default is used, mapped in `vars/main.yml`.
 # By setting java_version, you overwrite this default to your selected
 # version.
diff --git a/defaults/main.yml b/defaults/main.yml
index f72105a..bdebb14 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,7 +7,7 @@ java_vendor: openjdk
 # Set the variable to install the type, valid values are "jre" and "jdk".
 java_type: jre
 
-# Set the version of java, valid values are 6, 7, 8, 9, 10, 11, 12 or 13.
+# Set the version of java, valid values are 6, 7, 8, 9, 10, 11, 12, 13 or 17.
 # By default, a distribution default is used, mapped in `vars/main.yml`.
 # By setting java_version, you overwrite this default to your selected
 # version.
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index ef24f82..0556d94 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -8,6 +8,7 @@
   vars:
     _desired_java_version:
       default: 8
+      Amazon: 17
       Debian: 11
       Debian-bookworm: 17
     desired_java_version: "{{ _desired_java_version[ansible_distribution ~ '-' ~ ansible_distribution_release] | default(_desired_java_version[ansible_distribution] | default(_desired_java_version['default'])) }}"
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index f72ed56..b3aa25e 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -7,6 +7,7 @@
   vars:
     _expected_java_version:
       default: 'openjdk version "1.8.'
+      Amazon: 'openjdk version "17.0.'
       Debian: 'openjdk version "11.0.'
       Debian-bookworm: 'openjdk version "17.0.'
     expected_java_version: "{{ _expected_java_version[ansible_distribution ~ '-' ~ ansible_distribution_release] | default(_expected_java_version[ansible_distribution] | default(_expected_java_version['default'])) }}"
@@ -18,10 +19,6 @@
       changed_when: no
       register: output
 
-    - name: Show output or java -version
-      ansible.builtin.debug:
-        msg: "{{ output }}"
-
     - name: Check if the correct version was found.
       ansible.builtin.assert:
         that:
diff --git a/vars/main.yml b/vars/main.yml
index 82a8ec0..4af269d 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -5,6 +5,7 @@
 _java_default_version:
   default: 11
   Alpine: 8
+  Amazon: 17
   Debian: 17
   Gentoo: 8
   RedHat: 8
@@ -47,6 +48,7 @@ _java_openjdk_package:
       default: openjdk-13-jre
     17:
       default: openjdk-17-jre
+      Amazon: java-17-amazon-corretto
   jdk:
     6:
       default: java-1.6.0-openjdk-devel
@@ -76,6 +78,7 @@ _java_openjdk_package:
       default: openjdk-13-jdk
     17:
       default: openjdk-17-jdk
+      Amazon: java-17-amazon-corretto-devel
 
 java_openjdk_package: "{{ _java_openjdk_package[java_type][java_version | int][ansible_distribution] | default(_java_openjdk_package[java_type][java_version | int]['default'] | default([])) }}"