Update carto stylesheet to v2.32.0

[chef.git] / cookbooks / mysql / providers / database.rb

diff --git a/cookbooks/mysql/providers/database.rb b/cookbooks/mysql/providers/database.rb
index 556e40454673f27c1a6ebf8c2cf4c394198094ac..6e488ce476c6ee774b311beb8a520c1175b4b7a6 100644 (file)
--- a/cookbooks/mysql/providers/database.rb
+++ b/cookbooks/mysql/providers/database.rb
@@ -22,7 +22,7 @@ def load_current_resource
 
   @current_resource = Chef::Resource::MysqlDatabase.new(new_resource.name)
   @current_resource.database(new_resource.database)
 
   @current_resource = Chef::Resource::MysqlDatabase.new(new_resource.name)
   @current_resource.database(new_resource.database)

-  if mysql_database = @mysql.databases[@current_resource.database]
+  if (mysql_database = @mysql.databases[@current_resource.database])

     @current_resource.permissions(mysql_database[:permissions])
   end
   @current_resource
     @current_resource.permissions(mysql_database[:permissions])
   end
   @current_resource


@@ -36,20 +36,20 @@ action :create do
     end
   end
 
     end
   end
 

-  new_permissions = Hash[new_resource.permissions.collect do |user,privileges|
+  new_permissions = Hash[new_resource.permissions.collect do |user, privileges|

     [@mysql.canonicalise_user(user), privileges]
   end]
 
   @current_resource.permissions.each_key do |user|
     [@mysql.canonicalise_user(user), privileges]
   end]
 
   @current_resource.permissions.each_key do |user|

-    unless new_permissions[user]
-      converge_by("revoke all for #{user} on #{new_resource}") do
-        Chef::Log.info("Revoking all for #{user} on #{new_resource}")
-        @mysql.execute(:command => "REVOKE ALL ON `#{new_resource.database}`.* FROM #{user}")
-      end
+    next if new_permissions[user]
+
+    converge_by("revoke all for #{user} on #{new_resource}") do
+      Chef::Log.info("Revoking all for #{user} on #{new_resource}")
+      @mysql.execute(:command => "REVOKE ALL ON `#{new_resource.database}`.* FROM #{user}")

     end
   end
 
     end
   end
 

-  new_permissions.each do |user,new_privileges|
+  new_permissions.each do |user, new_privileges|

     current_privileges = @current_resource.permissions[user] || {}
     new_privileges = Array(new_privileges)
 
     current_privileges = @current_resource.permissions[user] || {}
     new_privileges = Array(new_privileges)