Default to Keycloak 21.0.1 and Use OpenJDK 17 where possible (#283)

* Default to Keycloak 21.0.1 Use OpenJDK 17 where possible * For mappers test download jar from osc-keycloak-scripts release page
treydock · Apr 5, 2023 · b11dad0 · b11dad0
1 parent aa42c7a
commit b11dad0
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 53 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -69,24 +69,15 @@ jobs:
           - "puppet6"
           - "puppet7"
         keycloak_version:
-          - "19.0.3"
           - "21.0.1"
         keycloak_full:
           - "no"
         include:
-          - set: "el7"
-            puppet: "puppet6"
-            keycloak_version: "19.0.3"
-            keycloak_full: "yes"
-          - set: "el7"
-            puppet: "puppet7"
-            keycloak_version: "19.0.3"
-            keycloak_full: "yes"
-          - set: "el7"
+          - set: "el8"
             puppet: "puppet6"
             keycloak_version: "21.0.1"
             keycloak_full: "yes"
-          - set: "el7"
+          - set: "el8"
             puppet: "puppet7"
             keycloak_version: "21.0.1"
             keycloak_full: "yes"

diff --git a/.sync.yml b/.sync.yml
@@ -27,23 +27,14 @@ Rakefile:
       - puppet6
       - puppet7
     keycloak_version:
-      - '19.0.3'
       - '21.0.1'
     keycloak_full: ['no']
   acceptance_includes:
-    - set: el7
-      puppet: puppet6
-      keycloak_version: 19.0.3
-      keycloak_full: 'yes'
-    - set: el7
-      puppet: puppet7
-      keycloak_version: 19.0.3
-      keycloak_full: 'yes'
-    - set: el7
+    - set: el8
       puppet: puppet6
       keycloak_version: 21.0.1
       keycloak_full: 'yes'
-    - set: el7
+    - set: el8
       puppet: puppet7
       keycloak_version: 21.0.1
       keycloak_full: 'yes'

diff --git a/README.md b/README.md
@@ -173,6 +173,7 @@ This module may work on earlier versions but this is the only version tested.
 | 12.x - 16.x      | 7.x                             |
 | 18.x             | 8.x                             |
 | 19.x - 21.x      | 9.x                             |
+| 21.x             | 10.x                            |
 
 ## Usage
 

diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml
@@ -1,9 +1,9 @@
 ---
 keycloak::java_declare_method: include
-keycloak::java_package: openjdk-11-jdk
-keycloak::java_home: /usr/lib/jvm/java-1.11.0-openjdk-amd64/
-keycloak::java_alternative_path: /usr/lib/jvm/java-1.11.0-openjdk-amd64/bin/java
-keycloak::java_alternative: java-1.11.0-openjdk-amd64
+keycloak::java_package: openjdk-17-jdk
+keycloak::java_home: /usr/lib/jvm/java-1.17.0-openjdk-amd64/
+keycloak::java_alternative_path: /usr/lib/jvm/java-1.17.0-openjdk-amd64/bin/java
+keycloak::java_alternative: java-1.17.0-openjdk-amd64
 keycloak::user_shell: '/usr/sbin/nologin'
 keycloak::libunix_dbus_java_build_dependencies:
   - 'zlib1g-dev'

diff --git a/data/os/Debian/10.yaml b/data/os/Debian/10.yaml
@@ -0,0 +1,4 @@
+keycloak::java_package: openjdk-11-jdk
+keycloak::java_home: /usr/lib/jvm/java-1.11.0-openjdk-amd64/
+keycloak::java_alternative_path: /usr/lib/jvm/java-1.11.0-openjdk-amd64/bin/java
+keycloak::java_alternative: java-1.11.0-openjdk-amd64
diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml
@@ -1,8 +1,8 @@
 ---
-keycloak::java_package: java-11-openjdk-devel
-keycloak::java_home: /usr/lib/jvm/java-11-openjdk/
-keycloak::java_alternative_path: /usr/lib/jvm/java-11-openjdk/bin/java
-keycloak::java_alternative: /usr/lib/jvm/java-11-openjdk/bin/java
+keycloak::java_package: java-17-openjdk-devel
+keycloak::java_home: /usr/lib/jvm/java-17-openjdk/
+keycloak::java_alternative_path: /usr/lib/jvm/java-17-openjdk/bin/java
+keycloak::java_alternative: /usr/lib/jvm/java-17-openjdk/bin/java
 keycloak::user_shell: '/sbin/nologin'
 keycloak::libunix_dbus_java_build_dependencies:
   - 'which'

diff --git a/data/os/RedHat/7.yaml b/data/os/RedHat/7.yaml
@@ -0,0 +1,4 @@
+keycloak::java_package: java-11-openjdk-devel
+keycloak::java_home: /usr/lib/jvm/java-11-openjdk/
+keycloak::java_alternative_path: /usr/lib/jvm/java-11-openjdk/bin/java
+keycloak::java_alternative: /usr/lib/jvm/java-11-openjdk/bin/java
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -209,7 +209,7 @@
 #   Only necessary to set if the URL path to Keycloak is modified
 class keycloak (
   Boolean $manage_install       = true,
-  String $version               = '19.0.3',
+  String $version               = '21.0.1',
   Optional[Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl]] $package_url= undef,
   Optional[Stdlib::Absolutepath] $install_dir = undef,
   Enum['include','class'] $java_declare_method = 'class',

diff --git a/spec/acceptance/6_protocol_mapper_spec.rb b/spec/acceptance/6_protocol_mapper_spec.rb
@@ -168,9 +168,9 @@ class { 'keycloak': }
       class { 'keycloak':
         features => ['scripts'],
       }
-      keycloak::spi_deployment { 'mappers':
-        deployed_name => 'mappers.jar',
-        source        => 'file:///tmp/mappers.jar',
+      keycloak::spi_deployment { 'osc-keycloak-scripts':
+        deployed_name => 'osc-keycloak-scripts-jar-with-dependencies.jar',
+        source        => 'https://github.com/OSC/osc-keycloak-scripts/releases/download/1.0.0/osc-keycloak-scripts-jar-with-dependencies.jar',
       }
       keycloak_realm { 'test': ensure => 'present' }
       keycloak_client_scope { 'saml on test':

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -8,7 +8,7 @@
       let(:facts) do
         facts.merge(concat_basedir: '/dne')
       end
-      let(:version) { '19.0.3' }
+      let(:version) { '21.0.1' }
 
       case facts[:osfamily]
       when %r{RedHat}

diff --git a/spec/defines/freeipa_ldap_mappers_spec.rb b/spec/defines/freeipa_ldap_mappers_spec.rb
@@ -5,7 +5,6 @@
 describe 'keycloak::freeipa_ldap_mappers' do
   on_supported_os.each do |os, _facts|
     context "on #{os}" do
-      let(:version) { '12.0.4' }
       let(:title) { 'ipa.example.org' }
       let(:params) do
         {

diff --git a/spec/defines/freeipa_user_provider_spec.rb b/spec/defines/freeipa_user_provider_spec.rb
@@ -5,7 +5,6 @@
 describe 'keycloak::freeipa_user_provider' do
   on_supported_os.each do |os, _facts|
     context "on #{os}" do
-      let(:version) { '12.0.4' }
       let(:title) { 'ipa.example.org' }
       let(:default_params) do
         {

diff --git a/spec/defines/spi_deployment_spec.rb b/spec/defines/spi_deployment_spec.rb
@@ -8,7 +8,7 @@
       let(:facts) do
         facts.merge(concat_basedir: '/dne')
       end
-      let(:version) { '19.0.3' }
+      let(:version) { '21.0.1' }
       let(:title) { 'duo-spi' }
       let(:params) { { deployed_name: 'keycloak-duo-spi-jar-with-dependencies.jar', source: 'https://example.com/files/keycloak-duo-spi-jar-with-dependencies.jar' } }
 

diff --git a/spec/fixtures/mappers.jar b/spec/fixtures/mappers.jar
diff --git a/spec/fixtures/mappers/META-INF/keycloak-scripts.json b/spec/fixtures/mappers/META-INF/keycloak-scripts.json
diff --git a/spec/fixtures/mappers/x500-displayName.js b/spec/fixtures/mappers/x500-displayName.js
diff --git a/spec/spec_helper_acceptance_setup.rb b/spec/spec_helper_acceptance_setup.rb
@@ -3,7 +3,7 @@
 RSpec.configure do |c|
   c.add_setting :keycloak_version
   keycloak_version = if ENV['BEAKER_keycloak_version'].nil? || ENV['BEAKER_keycloak_version'].empty?
-                       '19.0.3'
+                       '21.0.1'
                      else
                        ENV['BEAKER_keycloak_version']
                      end
@@ -14,7 +14,6 @@
 
 proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 scp_to(hosts, File.join(proj_root, 'spec/fixtures/DuoUniversalKeycloakAuthenticator-jar-with-dependencies.jar'), '/tmp/DuoUniversalKeycloakAuthenticator-jar-with-dependencies.jar')
-scp_to(hosts, File.join(proj_root, 'spec/fixtures/mappers.jar'), '/tmp/mappers.jar')
 
 hiera_yaml = <<-HIERA_YAML
 ---