From 9b2b1735a7b3678699fc403a2f530f94ff433e6a Mon Sep 17 00:00:00 2001
From: Wim van Ravesteijn <wim.github@ravesteijn.nl>
Date: Tue, 21 Mar 2023 14:36:00 +0100
Subject: [PATCH 1/2] (MODULES-1545) Allow multiple mysql_grant for same
 user/table, but with different tag

---
 lib/puppet/type/mysql_grant.rb            |  5 ++++-
 spec/unit/puppet/type/mysql_grant_spec.rb | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/puppet/type/mysql_grant.rb b/lib/puppet/type/mysql_grant.rb
index abaa33208..1e30cf15c 100644
--- a/lib/puppet/type/mysql_grant.rb
+++ b/lib/puppet/type/mysql_grant.rb
@@ -39,9 +39,12 @@ def initialize(*args)
     raise(_('mysql_grant: `privileges` `parameter`: PROXY can only be specified by itself.')) if Array(self[:privileges]).size > 1 && Array(self[:privileges]).include?('PROXY')
     raise(_('mysql_grant: `table` `parameter` is required.')) if self[:ensure] == :present && self[:table].nil?
     raise(_('mysql_grant: `user` `parameter` is required.')) if self[:ensure] == :present && self[:user].nil?
-    if self[:user] && self[:table]
+    if self[:user] && self[:table] && self[:tag].nil?
       raise(_('mysql_grant: `name` `parameter` must match user@host/table format.')) if self[:name] != "#{self[:user]}/#{self[:table]}"
     end
+    if self[:user] && self[:table] && self[:tag]
+      raise(_('mysql_grant: `name` `parameter` must match tag:user@host/table format.')) if self[:name] != "#{self[:tag][0]}:#{self[:user]}/#{self[:table]}"
+    end
   end
 
   newparam(:name, namevar: true) do
diff --git a/spec/unit/puppet/type/mysql_grant_spec.rb b/spec/unit/puppet/type/mysql_grant_spec.rb
index c90d66081..e94dcdc20 100644
--- a/spec/unit/puppet/type/mysql_grant_spec.rb
+++ b/spec/unit/puppet/type/mysql_grant_spec.rb
@@ -76,6 +76,17 @@
     }.to raise_error %r{mysql_grant: `name` `parameter` must match user@host\/table format}
   end
 
+  it 'requires the name to match the user and table with tag #general' do
+    expect {
+      Puppet::Type.type(:mysql_grant).new(name: 'bar:foo@localhost/*.*', privileges: ['ALL'], table: ['*.*'], user: 'foo@localhost', tag: 'bar')
+    }.not_to raise_error
+  end
+  it 'requires the name to match the user and table with tag #specific' do
+    expect {
+      Puppet::Type.type(:mysql_grant).new(name: 'foo', privileges: ['ALL'], table: ['*.*'], user: 'foo@localhost', tag: 'bar')
+    }.to raise_error %r{mysql_grant: `name` `parameter` must match tag:user@host\/table format}
+  end
+
   describe 'it should munge privileges' do
     it 'to just ALL' do
       user = Puppet::Type.type(:mysql_grant).new(

From 7e9961cb5145c6d24976c99b5886f9dc335cc780 Mon Sep 17 00:00:00 2001
From: Wim van Ravesteijn <wim.github@ravesteijn.nl>
Date: Tue, 21 Mar 2023 15:49:15 +0100
Subject: [PATCH 2/2] (MODULES-1545) Keep supporting old behaviour

---
 lib/puppet/type/mysql_grant.rb            | 2 +-
 spec/unit/puppet/type/mysql_grant_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/puppet/type/mysql_grant.rb b/lib/puppet/type/mysql_grant.rb
index 1e30cf15c..cc765bcb5 100644
--- a/lib/puppet/type/mysql_grant.rb
+++ b/lib/puppet/type/mysql_grant.rb
@@ -43,7 +43,7 @@ def initialize(*args)
       raise(_('mysql_grant: `name` `parameter` must match user@host/table format.')) if self[:name] != "#{self[:user]}/#{self[:table]}"
     end
     if self[:user] && self[:table] && self[:tag]
-      raise(_('mysql_grant: `name` `parameter` must match tag:user@host/table format.')) if self[:name] != "#{self[:tag][0]}:#{self[:user]}/#{self[:table]}"
+      raise(_('mysql_grant: `name` `parameter` must match tag:user@host/table format.')) if self[:name] != "#{self[:user]}/#{self[:table]}" && self[:name] != "#{self[:tag][0]}:#{self[:user]}/#{self[:table]}"
     end
   end
 
diff --git a/spec/unit/puppet/type/mysql_grant_spec.rb b/spec/unit/puppet/type/mysql_grant_spec.rb
index e94dcdc20..85a5f1cec 100644
--- a/spec/unit/puppet/type/mysql_grant_spec.rb
+++ b/spec/unit/puppet/type/mysql_grant_spec.rb
@@ -77,6 +77,12 @@
   end
 
   it 'requires the name to match the user and table with tag #general' do
+    expect {
+      Puppet::Type.type(:mysql_grant).new(name: 'foo@localhost/*.*', privileges: ['ALL'], table: ['*.*'], user: 'foo@localhost', tag: 'bar')
+    }.not_to raise_error
+  end
+
+  it 'requires the name to match the user and table with tag, also in name #general' do
     expect {
       Puppet::Type.type(:mysql_grant).new(name: 'bar:foo@localhost/*.*', privileges: ['ALL'], table: ['*.*'], user: 'foo@localhost', tag: 'bar')
     }.not_to raise_error