Some refactoring to pass rubocup tests

Author: Andre Ponert

lib/puppet/provider/mysql_grant/mysql.rb

@@ -46,8 +46,11 @@ def self.instances
           end
         end
         sorted_privileges = stripped_privileges.sort
-        if self.newer_than('mysql' => '8.0.0')
-          sorted_privileges = (sorted_privileges == ['ALTER', 'ALTER ROUTINE', 'CREATE', 'CREATE ROLE', 'CREATE ROUTINE', 'CREATE TABLESPACE', 'CREATE TEMPORARY TABLES', 'CREATE USER', 'CREATE VIEW', 'DELETE', 'DROP', 'DROP ROLE', 'EVENT', 'EXECUTE', 'FILE', 'INDEX', 'INSERT', 'LOCK TABLES', 'PROCESS', 'REFERENCES', 'RELOAD', 'REPLICATION CLIENT', 'REPLICATION SLAVE', 'SELECT', 'SHOW DATABASES', 'SHOW VIEW', 'SHUTDOWN', 'SUPER', 'TRIGGER', 'UPDATE']) ? ['ALL'] : sorted_privileges
+        if newer_than('mysql' => '8.0.0') && sorted_privileges == ['ALTER', 'ALTER ROUTINE', 'CREATE', 'CREATE ROLE', 'CREATE ROUTINE', 'CREATE TABLESPACE', 'CREATE TEMPORARY TABLES', 'CREATE USER',
+                                                                   'CREATE VIEW', 'DELETE', 'DROP', 'DROP ROLE', 'EVENT', 'EXECUTE', 'FILE', 'INDEX', 'INSERT', 'LOCK TABLES', 'PROCESS', 'REFERENCES',
+                                                                   'RELOAD', 'REPLICATION CLIENT', 'REPLICATION SLAVE', 'SELECT', 'SHOW DATABASES', 'SHOW VIEW', 'SHUTDOWN', 'SUPER', 'TRIGGER',
+                                                                   'UPDATE']
+          sorted_privileges = ['ALL']
         end
         # Same here, but to remove OPTION leaving just GRANT.
         options = if %r{WITH\sGRANT\sOPTION}.match?(rest)

spec/acceptance/00_mysql_server_spec.rb

@@ -39,7 +39,7 @@ class { 'mysql::server':
           databases => {
             'somedb' => {
               ensure  => 'present',
-              charset => #{$charset},
+              charset => #{fetch_charset},
             },
           }
         }

spec/acceptance/01_mysql_db_spec.rb

@@ -4,7 +4,6 @@
 
 describe 'mysql::db define' do
   describe 'creating a database' do
-
     let(:pp) do
       <<-MANIFEST
         class { 'mysql::server':
@@ -15,7 +14,7 @@ class { 'mysql::server':
         mysql::db { 'spec1':
           user            => 'root1',
           password        => 'password',
-          charset         => #{$charset},
+          charset         => #{fetch_charset},
         }
       MANIFEST
     end
@@ -44,7 +43,7 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
           user     => 'root1',
           password => 'password',
           sql      => '/tmp/spec.sql',
-          charset  => #{$charset},
+          charset  => #{fetch_charset},
         }
       MANIFEST
     end
@@ -69,7 +68,7 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
           user     => 'root1',
           password => 'password',
           dbname   => 'realdb',
-          charset  => #{$charset},
+          charset  => #{fetch_charset},
         }
       MANIFEST
     end

spec/acceptance/04_mysql_backup_spec.rb

@@ -12,7 +12,7 @@ class { 'mysql::server': root_password => 'password' }
         ]:
           user     => 'backup',
           password => 'secret',
-          charset  => #{$charset},
+          charset  => #{fetch_charset},
         }
 
         class { 'mysql::server::backup':
@@ -73,7 +73,7 @@ class { 'mysql::server': root_password => 'password' }
           ]:
             user     => 'backup',
             password => 'secret',
-            charset  => #{$charset},
+            charset  => #{fetch_charset},
           }
 
           class { 'mysql::server::backup':
@@ -138,7 +138,7 @@ class { 'mysql::server': root_password => 'password' }
           ]:
             user     => 'backup',
             password => 'secret',
-            charset  => #{$charset},
+            charset  => #{fetch_charset},
           }
           case $facts['os']['family'] {
             /Debian/: {
@@ -263,7 +263,7 @@ class { 'mysql::server': root_password => 'password' }
           ]:
             user     => 'backup',
             password => 'secret',
-            charset  => #{$charset},
+            charset  => #{fetch_charset},
           }
           case $facts['os']['family'] {
             /Debian/: {

spec/acceptance/types/mysql_database_spec.rb

@@ -16,7 +16,7 @@ class { 'mysql::server': }
     pp = <<-MANIFEST
         mysql_database { 'spec_db':
           ensure  => present,
-          charset => #{$charset},
+          charset => #{fetch_charset},
         }
     MANIFEST
     it 'works without errors' do
@@ -38,7 +38,7 @@ class { 'mysql::server': }
           collate => 'latin1_swedish_ci',
         }
         mysql_database { 'spec_utf8':
-          charset => #{$charset},
+          charset => #{fetch_charset},
           collate => 'utf8_general_ci',
         }
     MANIFEST

spec/acceptance/types/mysql_grant_spec.rb

@@ -274,7 +274,7 @@ class { 'mysql::server':
 
         mysql_database { 'foo':
           ensure  => present,
-          charset => '#{$charset}',
+          charset => '#{fetch_charset}',
         }
 
         exec { 'mysql-create-table':
@@ -686,7 +686,7 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
           user     => 'root1',
           password => 'password',
           sql      => '/tmp/grant_spec_table.sql',
-          charset  => #{$charset},
+          charset  => #{fetch_charset},
         }
     MANIFEST
     it 'creates table' do

spec/spec_helper_acceptance.rb

@@ -4,10 +4,3 @@
 require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))
 
 PuppetLitmus.configure!
-
-# On Ubuntu 20.04 'utf8' charset now sets 'utf8mb3' internally and breaks idempotence
-$charset = if os[:family] == 'ubuntu' && os[:release] =~ %r{^20\.04}
-                "utf8mb3"
-             else
-               "utf8"
-             end

spec/spec_helper_acceptance_local.rb

@@ -32,6 +32,14 @@ def export_locales
   LitmusHelper.instance.run_shell('source ~/.bashrc')
 end
 
+def fetch_charset
+  @charset ||= if os[:family] == 'ubuntu' && os[:release] =~ %r{^20\.04}
+                 'utf8mb3'
+               else
+                 'utf8'
+               end
+end
+
 RSpec.configure do |c|
   c.before :suite do
     if os[:family] == 'debian' || os[:family] == 'ubuntu'