diff options
Diffstat (limited to 'lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb')
-rw-r--r-- | lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb b/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb index 31c5f880f8..ded890cc32 100644 --- a/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb @@ -43,15 +43,15 @@ class Chef desired_members = minimize_value(Chef::JSONCompat.parse(contents, create_additions: false)) members = minimize_value(_read_json) (desired_members - members).each do |member| - begin - rest.post(api_path, "username" => member) - rescue Net::HTTPClientException => e - if %w{404 405}.include?(e.response.code) - raise "Chef server at #{api_path} does not allow you to directly add members. Please either upgrade your Chef server or move the users you want into invitations.json instead of members.json." - else - raise - end + + rest.post(api_path, "username" => member) + rescue Net::HTTPClientException => e + if %w{404 405}.include?(e.response.code) + raise "Chef server at #{api_path} does not allow you to directly add members. Please either upgrade your Chef server or move the users you want into invitations.json instead of members.json." + else + raise end + end (members - desired_members).each do |member| rest.delete(File.join(api_path, member)) |