Add all safe auto corrects

Author: DavidS

lib/puppet/functions/mysql/normalise_and_deepmerge.rb

@@ -41,7 +41,7 @@ def normalise_and_deepmerge(*args)
 
   def normalized?(hash, key)
     return true if hash.key?(key)
-    return false unless key =~ %r{-|_}
+    return false unless %r{-|_}.match?(key)
     other_key = key.include?('-') ? key.tr('-', '_') : key.tr('_', '-')
     return false unless hash.key?(other_key)
     hash[key] = hash.delete(other_key)

lib/puppet/functions/mysql/password.rb

@@ -18,7 +18,7 @@
 
   def password(password)
     return '' if password.empty?
-    return password if password =~ %r{\*[A-F0-9]{40}$}
+    return password if %r{\*[A-F0-9]{40}$}.match?(password)
     '*' + Digest::SHA1.hexdigest(Digest::SHA1.digest(password)).upcase
   end
 end

lib/puppet/provider/mysql.rb

@@ -71,7 +71,7 @@ def mysqld_version_string
   end
 
   def self.mysqld_version
-    # note: be prepared for '5.7.6-rc-log' etc results
+    # NOTE: be prepared for '5.7.6-rc-log' etc results
     #       versioncmp detects 5.7.6-log to be newer then 5.7.6
     #       this is why we need the trimming.
     mysqld_version_string.scan(%r{\d+\.\d+\.\d+}).first unless mysqld_version_string.nil?

lib/puppet/provider/mysql_grant/mysql.rb

@@ -19,7 +19,7 @@ def self.instances
         # Default root user created by mysql_install_db on a host with fqdn
         # of myhost.mydomain.my: [email protected], when MySQL is started
         # with --skip-name-resolve.
-        next if e.inspect =~ %r{There is no such grant defined for user}
+        next if %r{There is no such grant defined for user}.match?(e.inspect)
         raise Puppet::Error, _('#mysql had an error ->  %{inspect}') % { inspect: e.inspect }
       end
       # Once we have the list of grants generate entries for each.
@@ -46,7 +46,7 @@ def self.instances
           end
         end
         # Same here, but to remove OPTION leaving just GRANT.
-        options = if rest =~ %r{WITH\sGRANT\sOPTION}
+        options = if %r{WITH\sGRANT\sOPTION}.match?(rest)
                     ['GRANT']
                   else
                     ['NONE']

lib/puppet/provider/mysql_login_path/inifile.rb

@@ -600,8 +600,8 @@ def typecast(value)
         begin
           begin
                     Integer(value)
-                  rescue
-                    Float(value)
+          rescue
+            Float(value)
                   end
         rescue
           unescape_value(value)

lib/puppet/provider/mysql_login_path/mysql_login_path.rb

@@ -79,7 +79,7 @@ def get_password(context, uid, name)
     result = ''
     output = my_print_defaults_cmd(context, uid, '-s', name)
     output.split("\n").each do |line|
-      if line =~ %r{\-\-password}
+      if %r{\-\-password}.match?(line)
         result = line.sub(%r{\-\-password=}, '')
       end
     end

lib/puppet/provider/mysql_user/mysql.rb

@@ -164,7 +164,7 @@ def password_hash=(string)
       end
       self.class.mysql_caller(sql, 'system')
     elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0')
-      raise ArgumentError, _('Only mysql_native_password (*ABCD...XXX) hashes are supported.') unless string =~ %r{^\*|^$}
+      raise ArgumentError, _('Only mysql_native_password (*ABCD...XXX) hashes are supported.') unless %r{^\*|^$}.match?(string)
       self.class.mysql_caller("ALTER USER #{merged_name} IDENTIFIED WITH mysql_native_password AS '#{string}'", 'system')
     else
       self.class.mysql_caller("SET PASSWORD FOR #{merged_name} = '#{string}'", 'system')

lib/puppet/type/mysql_grant.rb

@@ -16,7 +16,7 @@ def initialize(*args)
     # 'ALL'.  This can't be done in the munge in the property as that iterates
     # over the array and there's no way to replace the entire array before it's
     # returned to the provider.
-    if self[:ensure] == :present && Array(self[:privileges]).count > 1 && self[:privileges].to_s.include?('ALL')
+    if self[:ensure] == :present && Array(self[:privileges]).size > 1 && self[:privileges].to_s.include?('ALL')
       self[:privileges] = 'ALL'
     end
     # Sort the privileges array in order to ensure the comparision in the provider
@@ -31,12 +31,12 @@ def initialize(*args)
                           else
                             priv.strip.upcase
                           end
-                        }.uniq.reject { |k| k == 'GRANT' || k == 'GRANT OPTION' }.sort!
+                        }.uniq.reject { |k| ['GRANT', 'GRANT OPTION'].include?(k) }.sort!
   end
   # rubocop:enable Style/MultilineBlockChain
   validate do
     raise(_('mysql_grant: `privileges` `parameter` is required.')) if self[:ensure] == :present && self[:privileges].nil?
-    raise(_('mysql_grant: `privileges` `parameter`: PROXY can only be specified by itself.')) if Array(self[:privileges]).count > 1 && Array(self[:privileges]).include?('PROXY')
+    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]

spec/acceptance/types/mysql_plugin_spec.rb

@@ -18,7 +18,7 @@
   end
 elsif os[:family] == 'debian'
   if os[:family] == 'ubuntu'
-    if os[:release] =~ %r{^16\.04|^18\.04}
+    if %r{^16\.04|^18\.04}.match?(os[:release])
       # On Xenial running 5.7.12, the example plugin does not appear to be available.
       plugin = 'validate_password'
       plugin_lib = 'validate_password.so'

spec/unit/puppet/provider/mysql_user/mysql_spec.rb

@@ -199,8 +199,7 @@
     it 'creates a user using IF NOT EXISTS' do
       provider.class.instance_variable_set(:@mysqld_version_string, '5.7.6')
 
-      provider.class.expects(:mysql_caller).with("CREATE USER IF NOT EXISTS 'joe'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'", 'system') # rubocop:disable Layout/LineLength
-      provider.class.expects(:mysql_caller).with("ALTER USER IF EXISTS 'joe'@'localhost' WITH MAX_USER_CONNECTIONS 10 MAX_CONNECTIONS_PER_HOUR 10 MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 10", 'system') # rubocop:disable Layout/LineLength
+      provider.class.expects(:mysql_caller).with("CREATE USER IF NOT EXISTS 'joe'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'", 'system')       provider.class.expects(:mysql_caller).with("ALTER USER IF EXISTS 'joe'@'localhost' WITH MAX_USER_CONNECTIONS 10 MAX_CONNECTIONS_PER_HOUR 10 MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 10", 'system') # rubocop:disable Layout/LineLength
       provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' REQUIRE NONE", 'system')
       provider.expects(:exists?).returns(true)
       expect(provider.create).to be_truthy
@@ -292,7 +291,7 @@
     end
     it 'changes the hash MySQL >= 5.7.6' do
       provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.6'][:string])
-      provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH mysql_native_password AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'", 'system').returns('0') # rubocop:disable Layout/LineLength
+      provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH mysql_native_password AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'", 'system').returns('0')
 
       provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5')
       provider.password_hash = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'
@@ -314,7 +313,7 @@
     it 'changes the hash to an ed25519 hash mariadb >= 10.2.0' do
       provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mariadb-10.3.22'][:string])
       resource.stubs(:value).with(:plugin).returns('ed25519')
-      provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH ed25519 AS 'z0pjExBYbzbupUByZRrQvC6kRCcE8n/tC7kUdUD11fU'", 'system').returns('0') # rubocop:disable Layout/LineLength
+      provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH ed25519 AS 'z0pjExBYbzbupUByZRrQvC6kRCcE8n/tC7kUdUD11fU'", 'system').returns('0')
       provider.expects(:password_hash).returns('z0pjExBYbzbupUByZRrQvC6kRCcE8n/tC7kUdUD11fU')
       provider.password_hash = 'z0pjExBYbzbupUByZRrQvC6kRCcE8n/tC7kUdUD11fU'
     end
@@ -369,7 +368,7 @@
       context 'MySQL >= 5.7.6' do
         it 'changes the authentication plugin' do
           provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mysql-5.7.6'][:string])
-          provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'", 'system').returns('0') # rubocop:disable Layout/LineLength
+          provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'", 'system').returns('0')
 
           provider.expects(:plugin).returns('mysql_native_password')
           provider.plugin = 'mysql_native_password'
@@ -394,7 +393,7 @@
           provider.class.instance_variable_set(:@mysqld_version_string, mysql_version_string_hash['mariadb-10.3.22'][:string])
           resource.stubs('[]').with(:name).returns('joe@localhost')
           resource.stubs('[]').with(:password_hash).returns('z0pjExBYbzbupUByZRrQvC6kRCcE8n/tC7kUdUD11fU')
-          provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH 'ed25519' AS 'z0pjExBYbzbupUByZRrQvC6kRCcE8n/tC7kUdUD11fU'", 'system').returns('0') # rubocop:disable Layout/LineLength
+          provider.class.expects(:mysql_caller).with("ALTER USER 'joe'@'localhost' IDENTIFIED WITH 'ed25519' AS 'z0pjExBYbzbupUByZRrQvC6kRCcE8n/tC7kUdUD11fU'", 'system').returns('0')
           provider.expects(:plugin).returns('ed25519')
           provider.plugin = 'ed25519'
         end