feat: add java_type variable (#9)

antmelekhin · Oct 6, 2024 · 9a8b3cd · 9a8b3cd
1 parent 884ece5
commit 9a8b3cd
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 # Install Java
 java_distribution: 'openjdk'
+java_type: 'jre'
 
 # Install the OpenJDK package
 java_openjdk_package_name: '{{ __java_openjdk_package_name }}'

diff --git a/meta/argument_specs.yml b/meta/argument_specs.yml
@@ -5,8 +5,7 @@ argument_specs:
     description:
       - 'An Ansible role to install the Java package.'
       - 'This role installs the C(OpenJDK) or C(Amazon Corretto) distribution.'
-    author:
-      - 'Melekhin Anton'
+    author: 'Melekhin Anton'
     options:
       java_distribution:
         type: 'str'
@@ -15,6 +14,15 @@ argument_specs:
           - 'openjdk'
           - 'corretto'
         default: 'openjdk'
+      java_type:
+        type: 'str'
+        description:
+          - 'Java package type.'
+          - 'Amazon Corretto supported only jdk.'
+        choices:
+          - 'jre'
+          - 'jdk'
+        default: 'jre'
       java_openjdk_package_name:
         type: 'str'
         description: 'The OpenJDK package name.'

diff --git a/vars/main.yml b/vars/main.yml
@@ -1,11 +1,27 @@
 ---
 # A variable that is used to name the installation task
-__java_package_distribution: "{{ (java_distribution == 'corretto') | ternary('Amazon Corretto', 'OpenJDK') }}"
+__java_package_distribution: "{{ (java_distribution == 'corretto' or ansible_distribution == 'Amazon') | ternary('Amazon Corretto', 'OpenJDK') }}"
 
 # Default OpenJDK package
+__java_openjdk_major_version_dict:
+  Debian: "{{ (ansible_distribution_major_version == '10') | ternary('11', '17') }}"
+  RedHat: "{{ (ansible_distribution_major_version == '7') | ternary('11', '17') }}"
+
+__java_openjdk_major_version: '{{ __java_openjdk_major_version_dict[ansible_os_family] }}'
+
+__java_openjdk_package_name_suffix_dict:
+  jre:
+    Debian: 'jre'
+    RedHat: 'openjdk'
+  jdk:
+    Debian: 'jdk'
+    RedHat: 'openjdk-devel'
+
+__java_openjdk_package_name_suffix: '{{ __java_openjdk_package_name_suffix_dict[java_type][ansible_os_family] }}'
+
 __java_openjdk_package_name_dict:
-  Debian: "{{ (ansible_distribution_major_version == '10') | ternary('openjdk-11-jdk', 'openjdk-17-jdk') }}"
-  RedHat: "{{ (ansible_distribution_major_version == '7') | ternary('java-11-openjdk', 'java-17-openjdk') }}"
+  Debian: 'openjdk-{{ __java_openjdk_major_version }}-{{ __java_openjdk_package_name_suffix }}'
+  RedHat: 'java-{{ __java_openjdk_major_version }}-{{ __java_openjdk_package_name_suffix }}'
 
 __java_openjdk_package_name: '{{ __java_openjdk_package_name_dict[ansible_os_family] }}'