From d38b6d7b7c7f5ba9d405c4a851bcac78fd1e223f Mon Sep 17 00:00:00 2001 From: Yannick Zwicker Date: Mon, 23 Sep 2024 09:15:27 +0200 Subject: [PATCH 1/2] fix get parent id lookup --- .../provider/keycloak_ldap_user_provider/kcadm.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/puppet/provider/keycloak_ldap_user_provider/kcadm.rb b/lib/puppet/provider/keycloak_ldap_user_provider/kcadm.rb index 960f5c1a..f04822e5 100644 --- a/lib/puppet/provider/keycloak_ldap_user_provider/kcadm.rb +++ b/lib/puppet/provider/keycloak_ldap_user_provider/kcadm.rb @@ -59,17 +59,15 @@ def self.prefetch(resources) def get_parent_id(realm) parent_id = nil - output = kcadm('get', 'realms', realm, nil, ['id']) + output = kcadm('get', "realms/#{realm}", nil, nil, ['id']) Puppet.debug("#{realm} realms: #{output}") begin data = JSON.parse(output) rescue JSON::ParserError - Puppet.debug('Unable to parse output from kcadm get realms') - data = [] - end - data.each do |d| - parent_id = d['id'] + Puppet.debug("Unable to parse output from kcadm get realms/#{realm}") + data = {} end + parent_id = data['id'] parent_id end From c1fbfeae93a3b709304a352d5c2e0ff166c0c22e Mon Sep 17 00:00:00 2001 From: Yannick Zwicker Date: Tue, 24 Sep 2024 07:59:10 +0200 Subject: [PATCH 2/2] fix rubocop lint --- lib/puppet/provider/keycloak_ldap_user_provider/kcadm.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/puppet/provider/keycloak_ldap_user_provider/kcadm.rb b/lib/puppet/provider/keycloak_ldap_user_provider/kcadm.rb index f04822e5..e89923f2 100644 --- a/lib/puppet/provider/keycloak_ldap_user_provider/kcadm.rb +++ b/lib/puppet/provider/keycloak_ldap_user_provider/kcadm.rb @@ -58,7 +58,6 @@ def self.prefetch(resources) end def get_parent_id(realm) - parent_id = nil output = kcadm('get', "realms/#{realm}", nil, nil, ['id']) Puppet.debug("#{realm} realms: #{output}") begin @@ -67,8 +66,7 @@ def get_parent_id(realm) Puppet.debug("Unable to parse output from kcadm get realms/#{realm}") data = {} end - parent_id = data['id'] - parent_id + data['id'] end def create