From 4d84e28f7370d0013bf959527f851694480e8804 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Sat, 6 Mar 2021 18:59:47 -0500 Subject: [PATCH] Change default Keycloak version to 12.0.4 --- .github/workflows/ci.yaml | 27 ++++------------------ .sync.yml | 27 ++++------------------ README.md | 4 +++- manifests/init.pp | 2 +- spec/classes/init_spec.rb | 2 +- spec/defines/freeipa_ldap_mappers_spec.rb | 2 +- spec/defines/freeipa_user_provider_spec.rb | 2 +- spec/defines/spi_deployment_spec.rb | 2 +- 8 files changed, 18 insertions(+), 50 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ac42dc29..20ae3bfa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -64,8 +64,7 @@ jobs: - "puppet6" - "puppet7" keycloak_version: - - "8.0.1" - - "12.0.1" + - "12.0.4" keycloak_full: - "no" keycloak_domain_mode_cluster: @@ -73,35 +72,19 @@ jobs: include: - set: "centos-7" puppet: "puppet6" - keycloak_version: "8.0.1" - keycloak_full: "yes" - - set: "centos-7" - puppet: "puppet6" - keycloak_version: "12.0.1" - keycloak_full: "yes" - - set: "centos-7" - puppet: "puppet7" - keycloak_version: "8.0.1" + keycloak_version: "12.0.4" keycloak_full: "yes" - set: "centos-7" puppet: "puppet7" - keycloak_version: "12.0.1" + keycloak_version: "12.0.4" keycloak_full: "yes" - set: "centos-7-domain-mode-cluster" puppet: "puppet6" - keycloak_version: "8.0.1" - keycloak_domain_mode_cluster: "yes" - - set: "centos-7-domain-mode-cluster" - puppet: "puppet6" - keycloak_version: "12.0.1" - keycloak_domain_mode_cluster: "yes" - - set: "centos-7-domain-mode-cluster" - puppet: "puppet7" - keycloak_version: "8.0.1" + keycloak_version: "12.0.4" keycloak_domain_mode_cluster: "yes" - set: "centos-7-domain-mode-cluster" puppet: "puppet7" - keycloak_version: "12.0.1" + keycloak_version: "12.0.4" keycloak_domain_mode_cluster: "yes" env: BUNDLE_WITHOUT: development:release diff --git a/.sync.yml b/.sync.yml index e6d05c6b..43bbbef5 100644 --- a/.sync.yml +++ b/.sync.yml @@ -22,42 +22,25 @@ - puppet6 - puppet7 keycloak_version: - - '8.0.1' - - '12.0.1' + - '12.0.4' keycloak_full: ['no'] keycloak_domain_mode_cluster: ['no'] acceptance_includes: - set: centos-7 puppet: puppet6 - keycloak_version: 8.0.1 - keycloak_full: 'yes' - - set: centos-7 - puppet: puppet6 - keycloak_version: 12.0.1 - keycloak_full: 'yes' - - set: centos-7 - puppet: puppet7 - keycloak_version: 8.0.1 + keycloak_version: 12.0.4 keycloak_full: 'yes' - set: centos-7 puppet: puppet7 - keycloak_version: 12.0.1 + keycloak_version: 12.0.4 keycloak_full: 'yes' - set: centos-7-domain-mode-cluster puppet: puppet6 - keycloak_version: 8.0.1 - keycloak_domain_mode_cluster: 'yes' - - set: centos-7-domain-mode-cluster - puppet: puppet6 - keycloak_version: 12.0.1 - keycloak_domain_mode_cluster: 'yes' - - set: centos-7-domain-mode-cluster - puppet: puppet7 - keycloak_version: 8.0.1 + keycloak_version: 12.0.4 keycloak_domain_mode_cluster: 'yes' - set: centos-7-domain-mode-cluster puppet: puppet7 - keycloak_version: 12.0.1 + keycloak_version: 12.0.4 keycloak_domain_mode_cluster: 'yes' .gitignore: paths: diff --git a/README.md b/README.md index 17f27e6f..71487bbe 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,8 @@ The keycloak module allows easy installation and management of Keycloak. ### Supported Versions of Keycloak -Currently this module supports Keycloak version 8.x to 12.x. +Currently this module supports Keycloak version 12.x. +This module may work on earlier versions but this is the only version tested. | Keycloak Version | Keycloak Puppet module versions | | ---------------- | ------------------------------- | @@ -41,6 +42,7 @@ Currently this module supports Keycloak version 8.x to 12.x. | 4.x - 6.x | 3.x | | 6.x - 8.x | 4.x - 5.x | | 8.x - 12.x | 6.x | +| 12.x | 7.x | ## Usage diff --git a/manifests/init.pp b/manifests/init.pp index 2629c246..5c60d4de 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -247,7 +247,7 @@ # Server name in domain mode. Defaults to hostname. class keycloak ( Boolean $manage_install = true, - String $version = '8.0.1', + String $version = '12.0.4', Optional[Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl]] $package_url = undef, Optional[Stdlib::Absolutepath] $install_dir = undef, diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 70df8fa1..02d8ffea 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -6,7 +6,7 @@ let(:facts) do facts.merge(concat_basedir: '/dne') end - let(:version) { '8.0.1' } + let(:version) { '12.0.4' } case facts[:osfamily] when %r{RedHat} diff --git a/spec/defines/freeipa_ldap_mappers_spec.rb b/spec/defines/freeipa_ldap_mappers_spec.rb index d6659c01..e11770f9 100644 --- a/spec/defines/freeipa_ldap_mappers_spec.rb +++ b/spec/defines/freeipa_ldap_mappers_spec.rb @@ -3,7 +3,7 @@ describe 'keycloak::freeipa_ldap_mappers' do on_supported_os.each do |os, _facts| context "on #{os}" do - let(:version) { '8.0.1' } + 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 index 71ab38ba..7478a93e 100644 --- a/spec/defines/freeipa_user_provider_spec.rb +++ b/spec/defines/freeipa_user_provider_spec.rb @@ -3,7 +3,7 @@ describe 'keycloak::freeipa_user_provider' do on_supported_os.each do |os, _facts| context "on #{os}" do - let(:version) { '8.0.1' } + let(:version) { '12.0.4' } let(:title) { 'ipa.example.org' } let(:params) do { diff --git a/spec/defines/spi_deployment_spec.rb b/spec/defines/spi_deployment_spec.rb index 57e02e49..896b9685 100644 --- a/spec/defines/spi_deployment_spec.rb +++ b/spec/defines/spi_deployment_spec.rb @@ -6,7 +6,7 @@ let(:facts) do facts.merge(concat_basedir: '/dne') end - let(:version) { '8.0.1' } + let(:version) { '12.0.4' } 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' } }