openstack
/
puppet-keystone
Code Issues Proposed changes

Guard against usage of nil in providers 

Most of the functions in the keystone provider
does not check the value before using it to
populate the cache causing error like:

(Puppet::Type::Keystone_user_role::ProviderOpenstack) Could not find
user with name [admin] and domain [Default]
(/Stage[main]/Keystone::Bootstrap/Keystone_user_role[admin@admin]) Could
not evaluate: undefined method `[]' for nil:NilClass

Change-Id: Ia35972cbcd4ab94c826d7a14f3c023b7a2e6c106
This commit is contained in:
Tobias Urdin 2021-09-22 10:02:27 +02:00
parent 03a618171e
commit 32220212f2
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/puppet/provider/keystone.rb
View File

@ -142,8 +142,11 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
id_str = "#{name}_#{domain_name}"
unless @users_name.keys.include?(id_str)
user = fetch_user(name, domain_name)
err("Could not find user with name [#{name}] and domain [#{domain_name}]") unless user
@users_name[id_str] = user[:id]
if user && user.key?(:id)
@users_name[id_str] = user[:id]
else
err("Could not find user with name [#{name}] and domain [#{domain_name}]")
end
end
@users_name[id_str]
end
@ -153,8 +156,11 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
id_str = "#{name}_#{domain_name}"
unless @projects_name.keys.include?(id_str)
project = fetch_project(name, domain_name)
err("Could not find project with name [#{name}] and domain [#{domain_name}]") unless project
@projects_name[id_str] = project[:id]
if project && project.key?(:id)
@projects_name[id_str] = project[:id]
else
err("Could not find project with name [#{name}] and domain [#{domain_name}]")
end
end
@projects_name[id_str]
end
@ -162,12 +168,19 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
def self.domain_name_from_id(id)
unless @domain_hash
list = request('domain', 'list')
@domain_hash = Hash[list.collect{|domain| [domain[:id], domain[:name]]}]
if list.nil?
err("Could not list domains")
else
@domain_hash = Hash[list.collect{|domain| [domain[:id], domain[:name]]}]
end
end
unless @domain_hash.include?(id)
name = request('domain', 'show', id)[:name]
err("Could not find domain with id [#{id}]") unless name
@domain_hash[id] = name
domain = request('domain', 'show', id)
if domain && domain.key?(:name)
@domain_hash[id] = domain[:name]
else
err("Could not find domain with id [#{id}]")
end
end
@domain_hash[id]
end
@ -178,9 +191,12 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
@domain_hash_name = Hash[list.collect{|domain| [domain[:name], domain[:id]]}]
end
unless @domain_hash_name.include?(name)
id = request('domain', 'show', name)[:id]
err("Could not find domain with name [#{name}]") unless id
@domain_hash_name[name] = id
domain = request('domain', 'show', name)
if domain && domain.key?(:id)
@domain_hash_name[name] = domain[:id]
else
err("Could not find domain with name [#{name}]")
end
end
@domain_hash_name[name]
end