(CONT-789) Rubocop Auto Fixes 16-20

- Style/Encoding
- Style/ExplicitBlockArgument
- Style/FetchEnvVar
- Style/HashAsLastArrayItem
- Style/IfUnlessModifier

Author: david22swan

.rubocop_todo.yml

@@ -197,59 +197,19 @@ Style/CommentedKeyword:
   Exclude:
     - 'lib/puppet/provider/mysql_login_path/inifile.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/Encoding:
-  Exclude:
-    - 'lib/puppet/provider/mysql_login_path/inifile.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/ExplicitBlockArgument:
-  Exclude:
-    - 'lib/puppet/provider/mysql_login_path/inifile.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedVars.
-Style/FetchEnvVar:
-  Exclude:
-    - 'lib/puppet/provider/mysql.rb'
-    - 'lib/puppet/provider/mysql_datadir/mysql.rb'
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
   Exclude:
     - 'tasks/export.rb'
     - 'tasks/sql.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces
-Style/HashAsLastArrayItem:
-  Exclude:
-    - 'spec/functions/mysql_normalise_and_deepmerge_spec.rb'
-
 # Offense count: 1
 # Configuration parameters: MinBranchesCount.
 Style/HashLikeCase:
   Exclude:
     - 'lib/puppet/provider/mysql_login_path/inifile.rb'
 
-# Offense count: 10
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/puppet/functions/mysql/normalise_and_deepmerge.rb'
-    - 'lib/puppet/functions/mysql/password.rb'
-    - 'lib/puppet/provider/mysql_datadir/mysql.rb'
-    - 'lib/puppet/provider/mysql_grant/mysql.rb'
-    - 'lib/puppet/provider/mysql_login_path/mysql_login_path.rb'
-    - 'lib/puppet/type/mysql_grant.rb'
-    - 'lib/puppet/type/mysql_user.rb'
-
 # Offense count: 2
 Style/MixinUsage:
   Exclude:

lib/puppet/functions/mysql/normalise_and_deepmerge.rb

@@ -21,17 +21,13 @@
   #   The given hash normalised
   #
   def normalise_and_deepmerge(*args)
-    if args.length < 2
-      raise Puppet::ParseError, _('mysql::normalise_and_deepmerge(): wrong number of arguments (%{args_length}; must be at least 2)') % { args_length: args.length }
-    end
+    raise Puppet::ParseError, _('mysql::normalise_and_deepmerge(): wrong number of arguments (%{args_length}; must be at least 2)') % { args_length: args.length } if args.length < 2
 
     result = {}
     args.each do |arg|
       next if arg.is_a?(String) && arg.empty? # empty string is synonym for puppet's undef
       # If the argument was not a hash, skip it.
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, _('mysql::normalise_and_deepmerge: unexpected argument type %{arg_class}, only expects hash arguments.') % { args_class: args.class }
-      end
+      raise Puppet::ParseError, _('mysql::normalise_and_deepmerge: unexpected argument type %{arg_class}, only expects hash arguments.') % { args_class: args.class } unless arg.is_a?(Hash)
 
       # We need to make a copy of the hash since it is frozen by puppet
       current = deep_copy(arg)

lib/puppet/functions/mysql/password.rb

@@ -20,9 +20,7 @@
   end
 
   def password(password, sensitive = false)
-    if password.is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive)
-      password = password.unwrap
-    end
+    password = password.unwrap if password.is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive)
 
     result_string = if %r{\*[A-F0-9]{40}$}.match?(password)
                       password

lib/puppet/provider/mysql.rb

@@ -6,9 +6,9 @@ class Puppet::Provider::Mysql < Puppet::Provider
   initvars
 
   # Make sure we find mysql commands on CentOS and FreeBSD
-  ENV['PATH'] = ENV['PATH'] + ':/usr/libexec:/usr/local/libexec:/usr/local/bin'
+  ENV['PATH'] = ENV.fetch('PATH', nil) + ':/usr/libexec:/usr/local/libexec:/usr/local/bin'
   ENV['LD_LIBRARY_PATH'] = [
-    ENV['LD_LIBRARY_PATH'],
+    ENV.fetch('LD_LIBRARY_PATH', nil),
     '/usr/lib',
     '/usr/lib64',
     '/opt/rh/rh-mysql56/root/usr/lib',

lib/puppet/provider/mysql_datadir/mysql.rb

@@ -8,7 +8,7 @@
 
   # Make sure we find mysqld on CentOS and mysql_install_db on Gentoo and Solaris 11
   ENV['PATH'] = [
-    ENV['PATH'],
+    ENV.fetch('PATH', nil),
     '/usr/libexec',
     '/usr/share/mysql/scripts',
     '/opt/rh/rh-mysql80/root/usr/bin',
@@ -47,9 +47,7 @@ def create
     log_error                = @resource.value(:log_error) || '/var/tmp/mysqld_initialize.log'
     # rubocop:enable Lint/UselessAssignment
     unless defaults_extra_file.nil?
-      unless File.exist?(defaults_extra_file)
-        raise ArgumentError, _('Defaults-extra-file %{file} is missing.') % { file: defaults_extra_file }
-      end
+      raise ArgumentError, _('Defaults-extra-file %{file} is missing.') % { file: defaults_extra_file } unless File.exist?(defaults_extra_file)
 
       defaults_extra_file = "--defaults-extra-file=#{defaults_extra_file}"
     end

lib/puppet/provider/mysql_grant/mysql.rb

@@ -200,12 +200,8 @@ def diff_privileges(privileges_old, privileges_new)
 
   def privileges=(privileges)
     diff = diff_privileges(@property_hash[:privileges], privileges)
-    unless diff[:revoke].empty?
-      revoke(@property_hash[:user], @property_hash[:table], diff[:revoke])
-    end
-    unless diff[:grant].empty?
-      grant(@property_hash[:user], @property_hash[:table], diff[:grant], @property_hash[:options])
-    end
+    revoke(@property_hash[:user], @property_hash[:table], diff[:revoke]) unless diff[:revoke].empty?
+    grant(@property_hash[:user], @property_hash[:table], diff[:grant], @property_hash[:options]) unless diff[:grant].empty?
     @property_hash[:privileges] = privileges
     self.privileges
   end

lib/puppet/provider/mysql_login_path/inifile.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 # See: https://github.com/puppetlabs/puppet/blob/main/lib/puppet/util/inifile.rb
@@ -242,10 +241,10 @@ def each
   #   end
   #
   # Returns this IniFile.
-  def each_section
-    return unless block_given?
+  def each_section(&block)
+    return unless block
 
-    @ini.each_key { |section| yield section }
+    @ini.each_key(&block)
     self
   end
 

lib/puppet/provider/mysql_login_path/mysql_login_path.rb

@@ -79,9 +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 %r{\-\-password}.match?(line)
-        result = line.sub(%r{\-\-password=}, '')
-      end
+      result = line.sub(%r{\-\-password=}, '') if %r{\-\-password}.match?(line)
     end
     result
   end
@@ -158,9 +156,7 @@ def delete(context, name)
 
   def canonicalize(_context, resources)
     resources.each do |r|
-      if r.key?(:password) && r[:password].is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive)
-        r[:password] = gen_pw(extract_pw(r[:password]))
-      end
+      r[:password] = gen_pw(extract_pw(r[:password])) if r.key?(:password) && r[:password].is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive)
     end
   end
 end

lib/puppet/type/mysql_grant.rb

@@ -16,9 +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]).size > 1 && self[:privileges].to_s.include?('ALL')
-      self[:privileges] = 'ALL'
-    end
+    self[:privileges] = 'ALL' if self[:ensure] == :present && Array(self[:privileges]).size > 1 && self[:privileges].to_s.include?('ALL')
     # Sort the privileges array in order to ensure the comparision in the provider
     # self.instances method match.  Otherwise this causes it to keep resetting the
     # privileges.

lib/puppet/type/mysql_user.rb

@@ -97,9 +97,7 @@ def should_to_s(_newvalue)
     validate do |value|
       value = [value] unless value.is_a?(Array)
       if value.include?('NONE') || value.include?('SSL') || value.include?('X509')
-        if value.length > 1
-          raise(ArgumentError, _('`tls_options` `property`: The values NONE, SSL and X509 cannot be used with other options, you may only pick one of them.'))
-        end
+        raise(ArgumentError, _('`tls_options` `property`: The values NONE, SSL and X509 cannot be used with other options, you may only pick one of them.')) if value.length > 1
       else
         value.each do |opt|
           o = opt.match(%r{^(CIPHER|ISSUER|SUBJECT)}i)

spec/functions/mysql_normalise_and_deepmerge_spec.rb

@@ -37,7 +37,7 @@
     expect(subject).to run.with_params({}, {}, {}).and_return({})
   end
 
-  expected_values_two = [1, 2, 'four' => 4]
+  expected_values_two = [1, 2, { 'four' => 4 }]
   it 'merges subhashes' do
     hash = subject.execute({ 'one' => 1 }, 'two' => 2, 'three' => { 'four' => 4 })
     index_values.each_with_index do |index, expected|