feat: Combine multiple grants into one while checking state

Author: fionera

lib/puppet/provider/mysql_grant/mysql.rb

@@ -7,7 +7,7 @@
   commands mysql_raw: 'mysql'
 
   def self.instances
-    instances = []
+    instance_configs = {}
     users.map do |user|
       user_string = cmd_user(user)
       query = "SHOW GRANTS FOR #{user_string};"
@@ -54,16 +54,32 @@ def self.instances
         # fix double backslash that MySQL prints, so resources match
         table.gsub!('\\\\', '\\')
         # We need to return an array of instances so capture these
-        instances << new(
-          name: "#{user}@#{host}/#{table}",
-          ensure: :present,
-          privileges: stripped_privileges.sort,
-          table: table,
-          user: "#{user}@#{host}",
-          options: options,
-        )
+        name = "#{user}@#{host}/#{table}"
+        if instance_configs.key?(name)
+          instance_config = instance_configs[name]
+          stripped_privileges.concat instance_config.privileges
+          options.concat instance_config.options
+        end
+
+        instance_configs[name] = {
+          :privileges => stripped_privileges.uniq.sort,
+          :table => table,
+          :user => "#{user}@#{host}",
+          :options => options.uniq,
+        }
       end
     end
+    instances = []
+    instance_configs.map do |name, config|
+      instances << new(
+        name: name,
+        ensure: :present,
+        privileges: config[:privileges],
+        table: config[:table],
+        user: config[:user],
+        options: config[:options],
+      )
+    end
     instances
   end
 
@@ -90,10 +106,10 @@ def grant(user, table, privileges, options)
   def create
     grant(@resource[:user], @resource[:table], @resource[:privileges], @resource[:options])
 
-    @property_hash[:ensure]     = :present
-    @property_hash[:table]      = @resource[:table]
-    @property_hash[:user]       = @resource[:user]
-    @property_hash[:options]    = @resource[:options] if @resource[:options]
+    @property_hash[:ensure] = :present
+    @property_hash[:table] = @resource[:table]
+    @property_hash[:user] = @resource[:user]
+    @property_hash[:options] = @resource[:options] if @resource[:options]
     @property_hash[:privileges] = @resource[:privileges]
 
     exists? ? (return true) : (return false)