(CONT-789) Rubocop Auto Fixes 1-5

- Layout/ArgumentAlignment
- Layout/BeginEndAlignment
- Layout/ClosingHeredocIndentation
- Layout/EmptyLineAfterGuardClause
- Layout/HashAlignment

Author: david22swan

.rubocop_todo.yml

@@ -6,65 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 10
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'spec/unit/puppet/provider/mysql_login_path/mysql_login_path_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith, Severity.
-# SupportedStylesAlignWith: start_of_line, begin
-Layout/BeginEndAlignment:
-  Exclude:
-    - 'lib/puppet/provider/mysql_login_path/inifile.rb'
-
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-Layout/ClosingHeredocIndentation:
-  Exclude:
-    - 'lib/puppet/type/mysql_datadir.rb'
-    - 'lib/puppet/type/mysql_grant.rb'
-    - 'lib/puppet/type/mysql_login_path.rb'
-    - 'lib/puppet/type/mysql_user.rb'
-    - 'spec/acceptance/00_mysql_server_spec.rb'
-    - 'spec/classes/mysql_server_account_security_spec.rb'
-
-# Offense count: 18
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/puppet/functions/mysql/normalise_and_deepmerge.rb'
-    - 'lib/puppet/provider/mysql.rb'
-    - 'lib/puppet/provider/mysql_datadir/mysql.rb'
-    - 'lib/puppet/provider/mysql_grant/mysql.rb'
-    - 'lib/puppet/provider/mysql_login_path/inifile.rb'
-    - 'lib/puppet/provider/mysql_user/mysql.rb'
-    - 'lib/puppet/type/mysql_grant.rb'
-    - 'spec/classes/mysql_bindings_spec.rb'
-    - 'tasks/export.rb'
-    - 'tasks/sql.rb'
-
-# Offense count: 54
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'lib/puppet/type/mysql_login_path.rb'
-    - 'spec/classes/mysql_backup_mysqldump_spec.rb'
-    - 'spec/classes/mysql_bindings_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-    - 'spec/defines/mysql_db_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_login_path/mysql_login_path_spec.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Layout/HeredocIndentation:

lib/puppet/functions/mysql/normalise_and_deepmerge.rb

@@ -47,8 +47,10 @@ def normalise_and_deepmerge(*args)
   def normalized?(hash, key)
     return true if hash.key?(key)
     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)
     true
   end
@@ -65,6 +67,7 @@ def overlay(hash1, hash2)
 
   def deep_copy(inputhash)
     return inputhash unless inputhash.is_a? Hash
+
     hash = {}
     inputhash.each do |k, v|
       hash.store(k, deep_copy(v))

lib/puppet/provider/mysql.rb

@@ -158,6 +158,7 @@ def self.cmd_table(table)
 
   def self.cmd_privs(privileges)
     return 'ALL PRIVILEGES' if privileges.include?('ALL')
+
     priv_string = ''
     privileges.each do |priv|
       priv_string += "#{priv}, "

lib/puppet/provider/mysql_datadir/mysql.rb

@@ -50,6 +50,7 @@ def create
       unless File.exist?(defaults_extra_file)
         raise ArgumentError, _('Defaults-extra-file %{file} is missing.') % { file: defaults_extra_file }
       end
+
       defaults_extra_file = "--defaults-extra-file=#{defaults_extra_file}"
     end
 

lib/puppet/provider/mysql_grant/mysql.rb

@@ -20,6 +20,7 @@ def self.instances
         # of myhost.mydomain.my: root@myhost.mydomain.my, when MySQL is started
         # with --skip-name-resolve.
         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.
@@ -28,6 +29,7 @@ def self.instances
         munged_grant = grant.delete("'").delete('`').delete('"')
         # Matching: GRANT (SELECT, UPDATE) PRIVILEGES ON (*.*) TO ('root')@('127.0.0.1') (WITH GRANT OPTION)
         next unless match = munged_grant.match(%r{^GRANT\s(.+)\sON\s(.+)\sTO\s(.*)@(.*?)(\s.*)?$}) # rubocop:disable Lint/AssignmentInCondition
+
         privileges, table, user, host, rest = match.captures
         table.gsub!('\\\\', '\\')
 

lib/puppet/provider/mysql_login_path/inifile.rb

@@ -30,6 +30,7 @@ class Error < StandardError; end
   # Returns an IniFile instance or nil if the file could not be opened.
   def self.load(filename, opts = {})
     return unless File.file? filename
+
     new(opts.merge(filename: filename))
   end
 
@@ -220,6 +221,7 @@ def merge!(other)
   # Returns this IniFile.
   def each
     return unless block_given?
+
     @ini.each do |section, hash|
       hash.each do |param, val|
         yield section, param, val
@@ -242,6 +244,7 @@ def each
   # Returns this IniFile.
   def each_section
     return unless block_given?
+
     @ini.each_key { |section| yield section }
     self
   end
@@ -268,6 +271,7 @@ def delete_section(section)
   # Returns the Hash of parameter/value pairs for this section.
   def [](section)
     return nil if section.nil?
+
     @ini[section.to_s]
   end
 
@@ -373,6 +377,7 @@ def clone
   def eql?(other)
     return true if equal? other
     return false unless other.instance_of? self.class
+
     @ini == other.instance_variable_get(:@ini)
   end
   alias == eql?
@@ -609,10 +614,10 @@ def typecast(value)
       else
         begin
           begin
-                    Integer(value)
+            Integer(value)
           rescue
             Float(value)
-                  end
+          end
         rescue
           unescape_value(value)
         end

lib/puppet/provider/mysql_user/mysql.rb

@@ -154,6 +154,7 @@ def password_hash=(string)
       self.class.mysql_caller("SET PASSWORD FOR #{merged_name} = '#{string}'", 'system')
     elsif newer_than('mariadb' => '10.1.21') && plugin == 'ed25519'
       raise ArgumentError, _('ed25519 hash should be 43 bytes long.') unless string.length == 43
+
       # ALTER USER statement is only available upstream starting 10.2
       # https://mariadb.com/kb/en/mariadb-1020-release-notes/
       if newer_than('mariadb' => '10.2.0')
@@ -167,6 +168,7 @@ def password_hash=(string)
       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 %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_datadir.rb

@@ -6,7 +6,7 @@
       Manage MySQL datadirs with mysql_install_db OR mysqld (5.7.6 and above).
 
     @api private
-    PUPPET
+  PUPPET
 
   ensurable
 

lib/puppet/type/mysql_grant.rb

@@ -4,7 +4,7 @@
   @doc = <<-PUPPET
     @summary
       Manage a MySQL user's rights.
-    PUPPET
+  PUPPET
   ensurable
 
   autorequire(:file) { '/root/.my.cnf' }
@@ -39,6 +39,7 @@ 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]
       raise(_('mysql_grant: `name` `parameter` must match user@host/table format.')) if self[:name] != "#{self[:user]}/#{self[:table]}"
     end

lib/puppet/type/mysql_login_path.rb

@@ -31,7 +31,7 @@
 
   This type provides Puppet with the capabilities to store authentication credentials in an obfuscated login path file
   named .mylogin.cnf created with the mysql_config_editor utility. Supports only MySQL Community Edition > v5.6.6.
-EOS
+  EOS
   features: ['simple_get_filter', 'canonicalize'],
   title_patterns: [
     {
@@ -45,39 +45,39 @@
   ],
   attributes: {
     ensure: {
-      type:    'Enum[present, absent]',
-      desc:    'Whether this resource should be present or absent on the target system.',
+      type: 'Enum[present, absent]',
+      desc: 'Whether this resource should be present or absent on the target system.',
     },
     name: {
-      type:      'String',
-      desc:      'Name of the login path you want to manage.',
+      type: 'String',
+      desc: 'Name of the login path you want to manage.',
       behaviour: :namevar,
     },
     owner: {
-      type:      'String',
-      desc:      'The user to whom the logon path should belong.',
+      type: 'String',
+      desc: 'The user to whom the logon path should belong.',
       behaviour: :namevar,
-      default:   'root',
+      default: 'root',
     },
     host: {
-      type:      'Optional[String]',
-      desc:      'Host name to be entered into the login path.',
+      type: 'Optional[String]',
+      desc: 'Host name to be entered into the login path.',
     },
     user: {
-      type:      'Optional[String]',
-      desc:      'Username to be entered into the login path.',
+      type: 'Optional[String]',
+      desc: 'Username to be entered into the login path.',
     },
     password: {
-      type:      'Optional[Sensitive[String[1]]]',
-      desc:      'Password to be entered into login path',
+      type: 'Optional[Sensitive[String[1]]]',
+      desc: 'Password to be entered into login path',
     },
     socket: {
-      type:      'Optional[String]',
-      desc:      'Socket path to be entered into login path',
+      type: 'Optional[String]',
+      desc: 'Socket path to be entered into login path',
     },
     port: {
-      type:      'Optional[Integer[0,65535]]',
-      desc:      'Port number to be entered into login path.',
+      type: 'Optional[Integer[0,65535]]',
+      desc: 'Port number to be entered into login path.',
     },
   },
 )

lib/puppet/type/mysql_user.rb

@@ -5,7 +5,7 @@
   @doc = <<-PUPPET
     @summary
       Manage a MySQL user. This includes management of users password as well as privileges.
-    PUPPET
+  PUPPET
 
   ensurable
 

spec/acceptance/00_mysql_server_spec.rb

@@ -59,7 +59,7 @@ class { '::mysql::server':
                   'log-bin' => '/var/log/mariadb/mariadb-bin.log',}
            }
           }
-          MANIFEST
+        MANIFEST
       end
 
       it 'can be set' do

spec/classes/mysql_backup_mysqldump_spec.rb

@@ -15,13 +15,13 @@ class { 'mysql::server': }
       end
 
       let(:default_params) do
-        { 'backupuser'         => 'testuser',
-          'backuppassword'     => 'testpass',
-          'backupdir'          => '/tmp/mysql-backup',
-          'backuprotate'       => '25',
+        { 'backupuser' => 'testuser',
+          'backuppassword' => 'testpass',
+          'backupdir' => '/tmp/mysql-backup',
+          'backuprotate' => '25',
           'delete_before_dump' => true,
-          'execpath'           => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin',
-          'maxallowedpacket'   => '1M' }
+          'execpath' => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin',
+          'maxallowedpacket' => '1M' }
       end
 
       context 'with time included' do
@@ -76,7 +76,7 @@ class { 'mysql::server': }
         let(:params) do
           {
             'file_per_database' => true,
-            'excludedatabases'  => [ 'information_schema' ],
+            'excludedatabases' => [ 'information_schema' ],
           }.merge(default_params)
         end
 

spec/classes/mysql_bindings_spec.rb

@@ -5,6 +5,7 @@
 describe 'mysql::bindings' do
   on_supported_os.each do |os, facts|
     next if facts[:os]['family'] == 'Archlinux'
+
     context "on #{os}" do
       let(:facts) do
         facts.merge(root_home: '/root')
@@ -13,12 +14,12 @@
       let(:params) do
         {
           'java_enable' => true,
-          'perl_enable'             => true,
-          'php_enable'              => true,
-          'python_enable'           => true,
-          'ruby_enable'             => true,
-          'client_dev'              => true,
-          'daemon_dev'              => true,
+          'perl_enable' => true,
+          'php_enable' => true,
+          'python_enable' => true,
+          'ruby_enable' => true,
+          'client_dev' => true,
+          'daemon_dev' => true,
           'client_dev_package_name' => 'libmysqlclient-devel',
           'daemon_dev_package_name' => 'mysql-devel',
         }

spec/classes/mysql_server_account_security_spec.rb

@@ -8,7 +8,7 @@
       let(:pre_condition) do
         <<-EOF
         anchor {'mysql::server::end': }
-      EOF
+        EOF
       end
 
       context 'with fqdn==myhost.mydomain' do

spec/classes/mysql_server_backup_spec.rb

@@ -15,13 +15,13 @@ class { 'mysql::server': }
       end
 
       let(:default_params) do
-        { 'backupuser'         => 'testuser',
-          'backuppassword'     => 'testpass',
-          'backupdir'          => '/tmp/mysql-backup',
-          'backuprotate'       => '25',
+        { 'backupuser' => 'testuser',
+          'backuppassword' => 'testpass',
+          'backupdir' => '/tmp/mysql-backup',
+          'backuprotate' => '25',
           'delete_before_dump' => true,
-          'execpath'           => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin',
-          'maxallowedpacket'   => '1M' }
+          'execpath' => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin',
+          'maxallowedpacket' => '1M' }
       end
 
       context 'standard conditions' do
@@ -122,7 +122,7 @@ class { 'mysql::server': }
       context 'with delete after dump and custom success file path' do
         let(:custom_params) do
           {
-            'delete_before_dump'       => false,
+            'delete_before_dump' => false,
             'backup_success_file_path' => '/opt/mysqlbackup_success',
           }
         end