diff options
author | Xabier de Zuazo <xabier@onddo.com> | 2014-05-24 17:20:48 +0200 |
---|---|---|
committer | Xabier de Zuazo <xabier@onddo.com> | 2014-05-24 17:20:48 +0200 |
commit | c6c0020841eeca3774e91acf3c52b5cbfb4df860 (patch) | |
tree | 924a9a9f1a1f7a666c9c8a5bdd067d32d81d216b /lib/chef/user.rb | |
parent | 83b2686a59e637f7ac9888b7e370a4b5a7fc59e8 (diff) | |
download | chef-c6c0020841eeca3774e91acf3c52b5cbfb4df860.tar.gz |
[CHEF-5328] Fixed Chef::User.list API error with inflate=true
Diffstat (limited to 'lib/chef/user.rb')
-rw-r--r-- | lib/chef/user.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/chef/user.rb b/lib/chef/user.rb index 3f592e4b65..b8ec91b7ee 100644 --- a/lib/chef/user.rb +++ b/lib/chef/user.rb @@ -144,18 +144,18 @@ class Chef end def self.list(inflate=false) - response = if inflate - users = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest('users') - users.map do |name| - Chef::User.load(name) - end - else - Chef::REST.new(Chef::Config[:chef_server_url]).get_rest('users') - end - if response.is_a? Array - transform_ohc_list_response(response) + response = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest('users') + users = if response.is_a?(Array) + transform_ohc_list_response(response) # OHC/OPC else - response + response # OSC + end + if inflate + Hash[users.map do |name, url| + [name, Chef::User.load(name)] + end] + else + users end end |