Fix issues reported by new foodcritic

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

diff --git a/cookbooks/mysql/providers/database.rb b/cookbooks/mysql/providers/database.rb
index 6e488ce476c6ee774b311beb8a520c1175b4b7a6..0e7e9091af6f394b88666178974c26d924d7a65a 100644 (file)
--- a/cookbooks/mysql/providers/database.rb
+++ b/cookbooks/mysql/providers/database.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+use_inline_resources
+
 def load_current_resource
   @mysql = Chef::MySQL.new
 
@@ -65,12 +67,10 @@ action :create do
             @mysql.execute(:command => "GRANT #{@mysql.privilege_name(privilege)} ON `#{new_resource.database}`.* TO #{user}")
           end
         end
-      else
-        if current_privileges.include?(privilege)
-          converge_by("revoke #{privilege} for #{user} on #{new_resource}") do
-            Chef::Log.info("Revoking #{privilege} for #{user} on #{new_resource}")
-            @mysql.execute(:command => "REVOKE #{@mysql.privilege_name(privilege)} ON `#{new_resource.database}`.* FROM #{user}")
-          end
+      elsif current_privileges.include?(privilege)
+        converge_by("revoke #{privilege} for #{user} on #{new_resource}") do
+          Chef::Log.info("Revoking #{privilege} for #{user} on #{new_resource}")
+          @mysql.execute(:command => "REVOKE #{@mysql.privilege_name(privilege)} ON `#{new_resource.database}`.* FROM #{user}")
         end
       end
     end