X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ff044920428608b2c04507ad52d6ab52c9d6555f..47678874a2fd3d2889f6a3695d818b632b6c30c5:/cookbooks/postgresql/providers/table.rb diff --git a/cookbooks/postgresql/providers/table.rb b/cookbooks/postgresql/providers/table.rb index 1c56b63f1..f162347dd 100644 --- a/cookbooks/postgresql/providers/table.rb +++ b/cookbooks/postgresql/providers/table.rb @@ -26,7 +26,7 @@ def load_current_resource @current_resource.cluster(new_resource.cluster) @current_resource.database(new_resource.database) @current_resource.schema(new_resource.schema) - if pg_table = @tables[@name] + if (pg_table = @tables[@name]) @current_resource.owner(pg_table[:owner]) @current_resource.permissions(pg_table[:permissions]) end @@ -43,15 +43,15 @@ action :create do end @current_resource.permissions.each_key do |user| - unless new_resource.permissions[user] - converge_by("revoke all for #{user} on #{new_resource}") do - Chef::Log.info("Revoking all for #{user} on #{new_resource}") - @pg.execute(:command => "REVOKE ALL ON #{@name} FROM \"#{user}\"", :database => new_resource.database) - end + next if new_resource.permissions[user] + + converge_by("revoke all for #{user} on #{new_resource}") do + Chef::Log.info("Revoking all for #{user} on #{new_resource}") + @pg.execute(:command => "REVOKE ALL ON #{@name} FROM \"#{user}\"", :database => new_resource.database) end end - new_resource.permissions.each do |user,new_privileges| + new_resource.permissions.each do |user, new_privileges| current_privileges = @current_resource.permissions[user] || {} new_privileges = Array(new_privileges)