(CONT-789) Rubocop Auto Fixes 6-10

- Layout/HeredocIndentation
- Layout/LineEndStringConcatenationIndentation
- Layout/SpaceInsideArrayLiteralBrackets
- Lint/RedundantCopEnableDirective
- RSpec/EmptyLineAfterExample

Author: david22swan

.rubocop_todo.yml

@@ -6,31 +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: 2
-# This cop supports safe autocorrection (--autocorrect).
-Layout/HeredocIndentation:
-  Exclude:
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/LineEndStringConcatenationIndentation:
-  Exclude:
-    - 'spec/unit/puppet/provider/mysql_login_path/mysql_login_path_spec.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBrackets: space, no_space
-Layout/SpaceInsideArrayLiteralBrackets:
-  Exclude:
-    - 'spec/classes/mysql_backup_mysqldump_spec.rb'
-    - 'spec/defines/mysql_db_spec.rb'
-
 # Offense count: 11
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
@@ -48,19 +23,6 @@ Lint/FloatComparison:
   Exclude:
     - 'spec/spec_helper_acceptance_local.rb'
 
-# Offense count: 11
-# This cop supports safe autocorrection (--autocorrect).
-Lint/RedundantCopEnableDirective:
-  Exclude:
-    - 'spec/acceptance/types/mysql_grant_spec.rb'
-    - 'spec/acceptance/types/mysql_user_spec.rb'
-    - 'spec/classes/mysql_backup_mysqldump_spec.rb'
-    - 'spec/classes/mysql_backup_xtrabackup_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-
 # Offense count: 18
 Lint/ReturnInVoidContext:
   Exclude:
@@ -169,22 +131,6 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 60
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Exclude:
-    - 'spec/acceptance/02_mysql_mariadb_spec.rb'
-    - 'spec/acceptance/types/mysql_grant_spec.rb'
-    - 'spec/acceptance/types/mysql_login_path_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-    - 'spec/functions/mysql_normalise_and_deepmerge_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
-
 # Offense count: 21
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/EmptyLineAfterExampleGroup:

spec/acceptance/02_mysql_mariadb_spec.rb

@@ -37,6 +37,7 @@ class { '::mysql::server':
     it 'apply manifest' do
       apply_manifest(pp)
     end
+
     it 'mariadb connection' do
       result = run_shell('mysql --user="root" --password="strongpassword" -e "status"')
       expect(result.stdout).to match(%r{MariaDB})

spec/acceptance/types/mysql_grant_spec.rb

@@ -436,13 +436,12 @@ class { 'mysql::server':
 
       apply_manifest(pp, catch_failures: true)
     end
-    # rubocop:enable RSpec/ExampleLength
+
     it 'finds the user' do
       result = run_shell('mysql -NBe "SHOW GRANTS FOR test3@tester"')
       expect(result.stdout).to match(%r{GRANT EXECUTE ON FUNCTION `mysql`.`simplefunc` TO ['|`]test3['|`]@['|`]tester['|`]})
       expect(result.stderr).to be_empty
     end
-    # rubocop:enable RSpec/MultipleExpectations
   end
 
   describe 'proxy privilieges' do

spec/acceptance/types/mysql_login_path_spec.rb

@@ -43,11 +43,13 @@
     it 'works with no errors' do
       apply_manifest(pp, catch_failures: true)
     end
+
     it 'finds mysql_config_editor binary for the provider' do
       run_shell('mysql_config_editor -V') do |r|
         expect(r.stdout).to match(%r{Ver.*#{mysql_version}.*x86_64})
       end
     end
+
     it 'finds my_print_defaults binary for the provider' do
       run_shell('my_print_defaults -V') do |r|
         expect(r.exit_status).to eq(0)
@@ -78,6 +80,7 @@
       it 'works without errors' do
         apply_manifest(pp, catch_failures: true)
       end
+
       it 'finds the login path #stdout' do
         run_shell('mysql_config_editor print --all') do |r|
           regex_match = [%r{^\[local_socket\]\n}, %r{host = localhost\n}, %r{user = root\n}, %r{socket = /var/run/mysql/mysql.sock\n},
@@ -88,6 +91,7 @@
           expect(r.stderr).to be_empty
         end
       end
+
       it 'finds the login path password #stdout' do
         run_shell('my_print_defaults -s local_socket') do |r|
           expect(r.stdout).to match(%r{--password=secure\n})
@@ -118,6 +122,7 @@
       it 'works without errors' do
         apply_manifest(pp, catch_failures: true)
       end
+
       it 'finds the login path #stdout' do
         run_shell('mysql_config_editor print -G local_tcp') do |r|
           regex_match = [%r{^\[local_tcp\]\n}, %r{host = 10.0.0.1\n}, %r{user = network2\n}, %r{port = 3307\n}]
@@ -127,6 +132,7 @@
           expect(r.stderr).to be_empty
         end
       end
+
       it 'finds the login path password #stdout' do
         run_shell('my_print_defaults -s local_tcp') do |r|
           expect(r.stdout).to match(%r{--password=Fort_kn0X\n})
@@ -140,6 +146,7 @@
       it 'removes values' do
         apply_manifest(pp2, catch_failures: true)
       end
+
       it 'ensure values are removed #stdout' do
         run_shell('mysql_config_editor print -G local_tcp') do |r|
           regex_match = [%r{^\[local_tcp\]\n}, %r{host = 192.168.0.1\n}]
@@ -153,6 +160,7 @@
           expect(r.stderr).to be_empty
         end
       end
+
       it 'ensure password removed from the login path #stdout' do
         run_shell('my_print_defaults -s local_tcp') do |r|
           expect(r.stdout).not_to match(%r{--password=Fort_kn0X\n})
@@ -173,6 +181,7 @@
       it 'works without errors' do
         apply_manifest(pp, catch_failures: true)
       end
+
       it 'finds the login path #stdout' do
         run_shell('mysql_config_editor print --all') do |r|
           expect(r.stdout).not_to match(%r{^\[local_socket\]\n})
@@ -198,6 +207,7 @@
       it 'works without errors' do
         apply_manifest(pp, catch_failures: true)
       end
+
       it 'finds the login path #stdout' do
         run_shell('MYSQL_TEST_LOGIN_FILE=/home/loginpath_test/.mylogin.cnf mysql_config_editor print -G local_tcp') do |r|
           regex_match = [%r{^\[local_tcp\]\n}, %r{host = 10.0.0.2\n}, %r{user = other\n}, %r{port = 3306\n}]
@@ -207,6 +217,7 @@
           expect(r.stderr).to be_empty
         end
       end
+
       it 'finds the login path password #stdout' do
         run_shell('MYSQL_TEST_LOGIN_FILE=/home/loginpath_test/.mylogin.cnf my_print_defaults print -s local_tcp') do |r|
           expect(r.stdout).to match(%r{--password=sensitive\n})
@@ -227,6 +238,7 @@
       it 'works without errors' do
         apply_manifest(pp, catch_failures: true)
       end
+
       it 'finds the login path #stdout' do
         run_shell('MYSQL_TEST_LOGIN_FILE=/home/loginpath_test/.mylogin.cnf mysql_config_editor print -G local_tcp') do |r|
           regex_match = [%r{^\[local_tcp\]\n}, %r{host = 10.0.0.3\n}, %r{user = other2\n}, %r{port = 3307\n}]
@@ -236,6 +248,7 @@
           expect(r.stderr).to be_empty
         end
       end
+
       it 'finds the login path password #stdout' do
         run_shell('MYSQL_TEST_LOGIN_FILE=/home/loginpath_test/.mylogin.cnf my_print_defaults -s local_tcp') do |r|
           expect(r.stdout).to match(%r{--password=password\n})
@@ -253,6 +266,7 @@
       it 'works without errors' do
         apply_manifest(pp, catch_failures: true)
       end
+
       it 'finds the login path #stdout' do
         run_shell('MYSQL_TEST_LOGIN_FILE=/home/loginpath_test/.mylogin.cnf mysql_config_editor print --all') do |r|
           expect(r.stdout).not_to match(%r{^\[local_tcp\]\n})

spec/acceptance/types/mysql_user_spec.rb

@@ -95,7 +95,6 @@ class { 'mysql::server': * => $ed25519_opts }
         end
       end
     end
-    # rubocop:enable RSpec/ExampleLength, RSpec/MultipleExpectations
   end
 
   context 'using ashp-dash@localhost' do

spec/classes/mysql_backup_mysqldump_spec.rb

@@ -76,7 +76,7 @@ class { 'mysql::server': }
         let(:params) do
           {
             'file_per_database' => true,
-            'excludedatabases' => [ 'information_schema' ],
+            'excludedatabases' => ['information_schema'],
           }.merge(default_params)
         end
 
@@ -88,5 +88,4 @@ class { 'mysql::server': }
       end
     end
   end
-  # rubocop:enable RSpec/NestedGroups
 end

spec/classes/mysql_backup_xtrabackup_spec.rb

@@ -324,5 +324,4 @@ class { 'mysql::server': }
       end
     end
   end
-  # rubocop:enable RSpec/NestedGroups
 end

spec/classes/mysql_server_backup_spec.rb

@@ -288,6 +288,7 @@ class { 'mysql::server': }
           it 'loops through backup all databases without compression #show databases' do
             is_expected.to contain_file('mysqlbackup.sh').with_content(%r{.*SHOW DATABASES.*})
           end
+
           it 'loops through backup all databases without compression #bzcat' do
             is_expected.to contain_file('mysqlbackup.sh').without_content(%r{.*bzcat -zc.*})
           end
@@ -386,5 +387,4 @@ class { 'mysql::server': }
       end
     end
   end
-  # rubocop:enable RSpec/NestedGroups
 end

spec/classes/mysql_server_spec.rb

@@ -67,6 +67,7 @@
         it 'contains the package by default' do
           is_expected.to contain_package('mysql-server').with(ensure: :present)
         end
+
         context 'with package_manage set to true' do
           let(:params) { { package_manage: true } }
 
@@ -120,6 +121,7 @@
           it do
             is_expected.to contain_service('mysqld').with(ensure: :stopped)
           end
+
           context 'with package_manage set to true' do
             let(:params) { { package_manage: true } }
 
@@ -170,13 +172,15 @@
               path: '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
             )
           }
+
           it { is_expected.not_to contain_mysql_user('root@localhost') }
           it { is_expected.not_to contain_file('/root/.my.cnf') }
         end
         describe 'when root_password set' do
           let(:params) { { root_password: 'SET' } }
 
           it { is_expected.to contain_mysql_user('root@localhost') }
+
           if Puppet.version.to_f >= 3.0
             it { is_expected.to contain_file('/root/.my.cnf').with(show_diff: false).that_requires('Mysql_user[root@localhost]') }
           else
@@ -187,6 +191,7 @@
           let(:params) { { root_password: 'SET', create_root_user: false } }
 
           it { is_expected.not_to contain_mysql_user('root@localhost') }
+
           if Puppet.version.to_f >= 3.0
             it { is_expected.to contain_file('/root/.my.cnf').with(show_diff: false) }
           else
@@ -229,6 +234,7 @@
               password_hash: '*F3A2A51A9B0F2BE2468926B4132313728C250DBF'
             )
           }
+
           it {
             is_expected.to contain_mysql_user('foo2@localhost').with(
               max_connections_per_hour: nil, max_queries_per_hour: nil,
@@ -284,6 +290,7 @@
               privileges: ['SELECT', 'UPDATE'], options: ['GRANT']
             )
           }
+
           it {
             is_expected.to contain_mysql_grant('foo2@localhost/*.*').with(
               user: 'foo2@localhost', table: '*.*',
@@ -309,10 +316,10 @@
               collate: 'latin1',
             )
           }
+
           it { is_expected.to contain_mysql_database('somedb2') }
         end
       end
     end
   end
-  # rubocop:enable RSpec/NestedGroups
 end

spec/defines/mysql_db_spec.rb

@@ -17,7 +17,7 @@
           'mysql_exec_path' => '' }
       end
 
-      let(:sql) { [ '/tmp/test.sql' ] }
+      let(:sql) { ['/tmp/test.sql'] }
 
       it 'does not notify the import sql exec if no sql script was provided' do
         is_expected.to contain_mysql_database('test_db').without_notify

spec/functions/mysql_normalise_and_deepmerge_spec.rb

@@ -72,6 +72,7 @@
     hash = subject.execute({ 'a-b-c' => 1 }, 'a_b_c' => 10)
     expect(hash['a_b_c']).to eq(10)
   end
+
   it 'equates keys mod dash and underscore #not' do
     hash = subject.execute({ 'a-b-c' => 1 }, 'a_b_c' => 10)
     expect(hash).not_to have_key('a-b-c')
@@ -85,6 +86,7 @@
       hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 })
       expect(hash[index]).to eq(expected_values_five[expected])
     end
+
     it 'keeps style of the last when keys are equal mod dash and underscore #not' do
       hash = subject.execute({ 'a-b-c' => 1, 'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 } }, 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 })
       expect(hash).not_to have_key(index_values_error[expected])

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

@@ -15,14 +15,13 @@
     )
   end
   let(:raw_databases) do
-    <<-SQL_OUTPUT
-information_schema
-mydb
-mysql
-performance_schema
-test
+    <<~SQL_OUTPUT
+      information_schema
+      mydb
+      mysql
+      performance_schema
+      test
     SQL_OUTPUT
-    # rubocop:enable Layout/IndentHeredoc
   end
 
   before :each do
@@ -81,6 +80,7 @@
       allow(File).to receive(:file?).with('/root/.my.cnf').and_return(true)
       expect(provider.defaults_file).to eq '--defaults-extra-file=/root/.my.cnf'
     end
+
     it 'fails if file missing' do
       allow(File).to receive(:file?).with('/root/.my.cnf').and_return(false)
       expect(provider.defaults_file).to be_nil

spec/unit/puppet/provider/mysql_login_path/mysql_login_path_spec.rb

@@ -29,7 +29,7 @@
     allow(PTY).to receive(:spawn)
       .with({ 'HOME' => '/root' },
             '/usr/bin/mysql_config_editor set --skip-warn -G local_socket -h localhost -u root ' \
-              '-S /var/run/mysql/mysql.sock -p')
+            '-S /var/run/mysql/mysql.sock -p')
       .and_return(`(exit 0)`)
 
     allow(PTY).to receive(:spawn)

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

@@ -56,6 +56,7 @@
       allow(File).to receive(:file?).with('/root/.my.cnf').and_return(true)
       expect(provider.defaults_file).to eq '--defaults-extra-file=/root/.my.cnf'
     end
+
     it 'fails if file missing' do
       allow(File).to receive(:file?).with('/root/.my.cnf').and_return(false)
       expect(provider.defaults_file).to be_nil