(MODULES-3539) Allow @ in username

Author: Linus

lib/puppet/provider/mysql.rb

@@ -119,8 +119,9 @@ def system_database
   end
 
   # Take root@localhost and munge it to 'root'@'localhost'
+  # Take root@id123@localhost and munge it to 'root@id123'@'localhost'
   def self.cmd_user(user)
-    "'#{user.sub('@', "'@'")}'"
+    "'#{user.reverse.sub('@', "'@'").reverse}'"
   end
 
   # Take root.* and return ON `root`.*

lib/puppet/provider/mysql_user/mysql.rb

@@ -50,7 +50,8 @@ def self.prefetch(resources)
   end
 
   def create
-    merged_name              = @resource[:name].sub('@', "'@'")
+    # (MODULES-3539) Allow @ in username
+    merged_name              = @resource[:name].reverse.sub('@', "'@'").reverse
     password_hash            = @resource.value(:password_hash)
     plugin                   = @resource.value(:plugin)
     max_user_connections     = @resource.value(:max_user_connections) || 0
@@ -102,7 +103,8 @@ def create
   end
 
   def destroy
-    merged_name = @resource[:name].sub('@', "'@'")
+    # (MODULES-3539) Allow @ in username
+    merged_name = @resource[:name].reverse.sub('@', "'@'").reverse
     if_exists = if newer_than('mysql' => '5.7', 'percona' => '5.7', 'mariadb' => '10.1.3')
                   'IF EXISTS '
                 else

spec/acceptance/types/mysql_user_spec.rb

@@ -104,6 +104,30 @@ class { 'mysql::server': }
     end
   end
 
+  context 'using foo@bar@localhost' do
+    describe 'adding user' do
+      pp_three = <<-MANIFEST
+          mysql_user { 'foo@bar@localhost':
+            password_hash => '*F9A8E96790775D196D12F53BCC88B8048FF62ED5',
+          }
+      MANIFEST
+      it 'works without errors' do
+        execute_manifest(pp_three, catch_failures: true)
+      end
+
+      it 'finds the user #stdout' do
+        shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'foo@bar@localhost'\"") do |r|
+          expect(r.stdout).to match(%r{^1$})
+        end
+      end
+      it 'finds the user #stderr' do
+        shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'foo@bar@localhost'\"") do |r|
+          expect(r.stderr).to be_empty
+        end
+      end
+    end
+  end
+
   context 'using ashp@LocalHost' do
     describe 'adding user' do
       pp_four = <<-MANIFEST