(CONT-772) Correct Layout/HashAlignment

LukasAud · LukasAud · commit 78ef5ef5d9b8 · 2023-04-19T18:10:37.000+01:00
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,26 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-18 15:25:08 UTC using RuboCop version 1.48.1.
+# on 2023-04-19 16:57:14 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 12
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'spec/classes/mod/event_spec.rb'
-    - 'spec/classes/mod/itk_spec.rb'
-    - 'spec/classes/mod/lbmethod_bybusyness.rb'
-    - 'spec/classes/mod/lbmethod_byrequests.rb'
-    - 'spec/classes/mod/lbmethod_bytraffic.rb'
-    - 'spec/classes/mod/lbmethod_heartbeat.rb'
-    - 'spec/classes/mod/prefork_spec.rb'
-    - 'spec/classes/mod/worker_spec.rb'
-
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
 Layout/ClosingHeredocIndentation:
@@ -39,29 +24,6 @@ Layout/EmptyLineAfterGuardClause:
     - 'tasks/init.rb'
     - 'util/apache_mod_platform_support.rb'
 
-# Offense count: 590
-# 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:
-    - 'spec/classes/apache_spec.rb'
-    - 'spec/classes/mod/event_spec.rb'
-    - 'spec/classes/mod/itk_spec.rb'
-    - 'spec/classes/mod/jk_spec.rb'
-    - 'spec/classes/mod/lbmethod_bybusyness.rb'
-    - 'spec/classes/mod/lbmethod_byrequests.rb'
-    - 'spec/classes/mod/lbmethod_bytraffic.rb'
-    - 'spec/classes/mod/lbmethod_heartbeat.rb'
-    - 'spec/classes/mod/prefork_spec.rb'
-    - 'spec/classes/mod/worker_spec.rb'
-    - 'spec/classes/service_spec.rb'
-    - 'spec/defines/custom_config_spec.rb'
-    - 'spec/defines/vhost_spec.rb'
-    - 'util/apache_mod_platform_support.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Layout/HeredocIndentation:
@@ -102,6 +64,13 @@ Layout/LineEndStringConcatenationIndentation:
     - 'spec/classes/mod/deflate_spec.rb'
     - 'spec/classes/mod/info_spec.rb'
 
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 202
+
 # Offense count: 3
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
diff --git a/spec/classes/apache_spec.rb b/spec/classes/apache_spec.rb
@@ -50,13 +50,13 @@
     ['auth_basic', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
-          'path'   => "/etc/apache2/mods-available/#{modname}.load",
+          'path' => "/etc/apache2/mods-available/#{modname}.load",
           'ensure' => 'file',
         )
       }
       it {
         is_expected.to contain_file("#{modname}.load symlink").with(
-          'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
+          'path' => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.load",
         )
@@ -121,26 +121,26 @@
     ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
-          'path'   => "/etc/apache2/mods-available/#{modname}.load",
+          'path' => "/etc/apache2/mods-available/#{modname}.load",
           'ensure' => 'file',
         )
       }
       it {
         is_expected.to contain_file("#{modname}.load symlink").with(
-          'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
+          'path' => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.load",
         )
       }
       it {
         is_expected.to contain_file("#{modname}.conf").with(
-          'path'   => "/etc/apache2/mods-available/#{modname}.conf",
+          'path' => "/etc/apache2/mods-available/#{modname}.conf",
           'ensure' => 'file',
         )
       }
       it {
         is_expected.to contain_file("#{modname}.conf symlink").with(
-          'path'   => "/etc/apache2/mods-enabled/#{modname}.conf",
+          'path' => "/etc/apache2/mods-enabled/#{modname}.conf",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.conf",
         )
@@ -167,7 +167,7 @@
     describe 'Add extra LogFormats When parameter log_formats is a hash' do
       let :params do
         { log_formats: {
-          'vhost_common'   => '%v %h %l %u %t "%r" %>s %b',
+          'vhost_common' => '%v %h %l %u %t "%r" %>s %b',
           'vhost_combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
         } }
       end
@@ -179,7 +179,7 @@
     describe 'Override existing LogFormats When parameter log_formats is a hash' do
       let :params do
         { log_formats: {
-          'common'   => '%v %h %l %u %t "%r" %>s %b',
+          'common' => '%v %h %l %u %t "%r" %>s %b',
           'combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
         } }
       end
@@ -548,7 +548,7 @@
     ['auth_basic', 'authn_core', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
-          'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
+          'path' => "/usr/local/etc/apache24/Modules/#{modname}.load",
           'ensure' => 'file',
         )
       }
@@ -559,13 +559,13 @@
     ['alias', 'autoindex', 'dav_fs', 'deflate', 'dir', 'mime', 'negotiation', 'setenvif'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
-          'path'   => "/usr/local/etc/apache24/Modules/#{modname}.load",
+          'path' => "/usr/local/etc/apache24/Modules/#{modname}.load",
           'ensure' => 'file',
         )
       }
       it {
         is_expected.to contain_file("#{modname}.conf").with(
-          'path'   => "/usr/local/etc/apache24/Modules/#{modname}.conf",
+          'path' => "/usr/local/etc/apache24/Modules/#{modname}.conf",
           'ensure' => 'file',
         )
       }
@@ -615,7 +615,7 @@
       it {
         is_expected.to contain_package('httpd').with(
           'ensure' => 'installed',
-          'name'   => 'httpd24-httpd',
+          'name' => 'httpd24-httpd',
         ).that_notifies('Class[Apache::Service]')
       }
     end
diff --git a/spec/classes/mod/event_spec.rb b/spec/classes/mod/event_spec.rb
@@ -124,7 +124,7 @@
 
     it {
       is_expected.to contain_file('/etc/httpd/conf.modules.d/event.load').with('ensure' => 'file',
-                                                                       'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
+                                                                               'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")
     }
   end
 end
diff --git a/spec/classes/mod/itk_spec.rb b/spec/classes/mod/itk_spec.rb
@@ -50,7 +50,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.load').with('ensure' => 'file',
-                                                                       'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
+                                                                               'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")
       }
     end
     context 'with enablecapabilities set' do
diff --git a/spec/classes/mod/jk_spec.rb b/spec/classes/mod/jk_spec.rb
@@ -26,12 +26,12 @@
           'worker_a' => {
             'type' => 'ajp13',
             'socket_keepalive' => 'true',
-            'comment'          => 'This is worker A',
+            'comment' => 'This is worker A',
           },
           'worker_b' => {
             'type' => 'ajp13',
             'socket_keepalive' => 'true',
-            'comment'          => 'This is worker B',
+            'comment' => 'This is worker B',
           },
           'worker_maintain' => 40,
           'worker_lists' => ['worker_a,worker_b'],
diff --git a/spec/classes/mod/lbmethod_bybusyness.rb b/spec/classes/mod/lbmethod_bybusyness.rb
@@ -15,7 +15,7 @@
 
       it {
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -31,7 +31,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
diff --git a/spec/classes/mod/lbmethod_byrequests.rb b/spec/classes/mod/lbmethod_byrequests.rb
@@ -15,7 +15,7 @@
 
       it {
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -31,7 +31,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
diff --git a/spec/classes/mod/lbmethod_bytraffic.rb b/spec/classes/mod/lbmethod_bytraffic.rb
@@ -15,7 +15,7 @@
 
       it {
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -31,7 +31,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
diff --git a/spec/classes/mod/lbmethod_heartbeat.rb b/spec/classes/mod/lbmethod_heartbeat.rb
@@ -15,7 +15,7 @@
 
       it {
         is_expected.to contain_file('/etc/apache2/mods-enabled/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                                   'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
@@ -31,7 +31,7 @@
 
       it {
         is_expected.to contain_file('/etc/httpd/conf.modules.d/lbmethod_byrequests.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
+                                                                                               'content' => "LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so\n")
       }
     end
   end
diff --git a/spec/classes/mod/prefork_spec.rb b/spec/classes/mod/prefork_spec.rb
@@ -29,7 +29,7 @@
     it { is_expected.not_to contain_apache__mod('event') }
     it {
       is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.load').with('ensure' => 'file',
-                                                                         'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
+                                                                                 'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")
     }
   end
   context 'on a FreeBSD OS' do
diff --git a/spec/classes/mod/worker_spec.rb b/spec/classes/mod/worker_spec.rb
@@ -26,7 +26,7 @@
     it { is_expected.not_to contain_apache__mod('event') }
     it {
       is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.load').with('ensure' => 'file',
-                                                                        'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
+                                                                                'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")
     }
   end
   context 'on a FreeBSD OS' do
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
@@ -12,9 +12,9 @@
 
     it {
       is_expected.to contain_service('httpd').with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'true',
+        'name' => 'apache2',
+        'ensure' => 'running',
+        'enable' => 'true',
       )
     }
 
@@ -33,9 +33,9 @@
 
       it {
         is_expected.to contain_service('httpd').with(
-          'name'      => 'apache2',
-          'ensure'    => 'running',
-          'enable'    => 'true',
+          'name' => 'apache2',
+          'ensure' => 'running',
+          'enable' => 'true',
         )
       }
     end
@@ -45,9 +45,9 @@
 
       it {
         is_expected.to contain_service('httpd').with(
-          'name'      => 'apache2',
-          'ensure'    => 'running',
-          'enable'    => 'false',
+          'name' => 'apache2',
+          'ensure' => 'running',
+          'enable' => 'false',
         )
       }
     end
@@ -57,8 +57,8 @@
 
       it {
         is_expected.to contain_service('httpd').with(
-          'ensure'    => 'running',
-          'enable'    => 'true',
+          'ensure' => 'running',
+          'enable' => 'true',
         )
       }
     end
@@ -68,8 +68,8 @@
 
       it {
         is_expected.to contain_service('httpd').with(
-          'ensure'    => 'stopped',
-          'enable'    => 'true',
+          'ensure' => 'stopped',
+          'enable' => 'true',
         )
       }
     end
@@ -100,7 +100,7 @@
     let(:params) do
       {
         'service_ensure' => 'running',
-        'service_name'   => 'httpd',
+        'service_name' => 'httpd',
         'service_manage' => false,
       }
     end
@@ -113,9 +113,9 @@
 
     it {
       is_expected.to contain_service('httpd').with(
-        'name'      => 'apache24',
-        'ensure'    => 'running',
-        'enable'    => 'true',
+        'name' => 'apache24',
+        'ensure' => 'running',
+        'enable' => 'true',
       )
     }
   end
@@ -125,9 +125,9 @@
 
     it {
       is_expected.to contain_service('httpd').with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'true',
+        'name' => 'apache2',
+        'ensure' => 'running',
+        'enable' => 'true',
       )
     }
   end
diff --git a/spec/defines/custom_config_spec.rb b/spec/defines/custom_config_spec.rb
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
diff --git a/util/apache_mod_platform_support.rb b/util/apache_mod_platform_support.rb

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@`
`124`	`124`
`125`	`125`	`it {`
`126`	`126`	`is_expected.to contain_file('/etc/httpd/conf.modules.d/event.load').with('ensure' => 'file',`
`127`		`- 'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")`
	`127`	`+ 'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n")`
`128`	`128`	`}`
`129`	`129`	`end`
`130`	`130`	`end`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`
`51`	`51`	`it {`
`52`	`52`	`is_expected.to contain_file('/etc/httpd/conf.modules.d/itk.load').with('ensure' => 'file',`
`53`		`- 'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")`
	`53`	`+ 'content' => "LoadModule mpm_itk_module modules/mod_mpm_itk.so\n")`
`54`	`54`	`}`
`55`	`55`	`end`
`56`	`56`	`context 'with enablecapabilities set' do`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`it { is_expected.not_to contain_apache__mod('event') }`
`30`	`30`	`it {`
`31`	`31`	`is_expected.to contain_file('/etc/httpd/conf.modules.d/prefork.load').with('ensure' => 'file',`
`32`		`- 'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")`
	`32`	`+ 'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n")`
`33`	`33`	`}`
`34`	`34`	`end`
`35`	`35`	`context 'on a FreeBSD OS' do`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`it { is_expected.not_to contain_apache__mod('event') }`
`27`	`27`	`it {`
`28`	`28`	`is_expected.to contain_file('/etc/httpd/conf.modules.d/worker.load').with('ensure' => 'file',`
`29`		`- 'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")`
	`29`	`+ 'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n")`
`30`	`30`	`}`
`31`	`31`	`end`
`32`	`32`	`context 'on a FreeBSD OS' do`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`
`13`	`13`	`it {`
`14`	`14`	`is_expected.to contain_service('httpd').with(`
`15`		`- 'name' => 'apache2',`
`16`		`- 'ensure' => 'running',`
`17`		`- 'enable' => 'true',`
	`15`	`+ 'name' => 'apache2',`
	`16`	`+ 'ensure' => 'running',`
	`17`	`+ 'enable' => 'true',`
`18`	`18`	`)`
`19`	`19`	`}`
`20`	`20`
`@@ -33,9 +33,9 @@`
`33`	`33`
`34`	`34`	`it {`
`35`	`35`	`is_expected.to contain_service('httpd').with(`
`36`		`- 'name' => 'apache2',`
`37`		`- 'ensure' => 'running',`
`38`		`- 'enable' => 'true',`
	`36`	`+ 'name' => 'apache2',`
	`37`	`+ 'ensure' => 'running',`
	`38`	`+ 'enable' => 'true',`
`39`	`39`	`)`
`40`	`40`	`}`
`41`	`41`	`end`
`@@ -45,9 +45,9 @@`
`45`	`45`
`46`	`46`	`it {`
`47`	`47`	`is_expected.to contain_service('httpd').with(`
`48`		`- 'name' => 'apache2',`
`49`		`- 'ensure' => 'running',`
`50`		`- 'enable' => 'false',`
	`48`	`+ 'name' => 'apache2',`
	`49`	`+ 'ensure' => 'running',`
	`50`	`+ 'enable' => 'false',`
`51`	`51`	`)`
`52`	`52`	`}`
`53`	`53`	`end`
`@@ -57,8 +57,8 @@`
`57`	`57`
`58`	`58`	`it {`
`59`	`59`	`is_expected.to contain_service('httpd').with(`
`60`		`- 'ensure' => 'running',`
`61`		`- 'enable' => 'true',`
	`60`	`+ 'ensure' => 'running',`
	`61`	`+ 'enable' => 'true',`
`62`	`62`	`)`
`63`	`63`	`}`
`64`	`64`	`end`
`@@ -68,8 +68,8 @@`
`68`	`68`
`69`	`69`	`it {`
`70`	`70`	`is_expected.to contain_service('httpd').with(`
`71`		`- 'ensure' => 'stopped',`
`72`		`- 'enable' => 'true',`
	`71`	`+ 'ensure' => 'stopped',`
	`72`	`+ 'enable' => 'true',`
`73`	`73`	`)`
`74`	`74`	`}`
`75`	`75`	`end`
`@@ -100,7 +100,7 @@`
`100`	`100`	`let(:params) do`
`101`	`101`	`{`
`102`	`102`	`'service_ensure' => 'running',`
`103`		`- 'service_name' => 'httpd',`
	`103`	`+ 'service_name' => 'httpd',`
`104`	`104`	`'service_manage' => false,`
`105`	`105`	`}`
`106`	`106`	`end`
`@@ -113,9 +113,9 @@`
`113`	`113`
`114`	`114`	`it {`
`115`	`115`	`is_expected.to contain_service('httpd').with(`
`116`		`- 'name' => 'apache24',`
`117`		`- 'ensure' => 'running',`
`118`		`- 'enable' => 'true',`
	`116`	`+ 'name' => 'apache24',`
	`117`	`+ 'ensure' => 'running',`
	`118`	`+ 'enable' => 'true',`
`119`	`119`	`)`
`120`	`120`	`}`
`121`	`121`	`end`
`@@ -125,9 +125,9 @@`
`125`	`125`
`126`	`126`	`it {`
`127`	`127`	`is_expected.to contain_service('httpd').with(`
`128`		`- 'name' => 'apache2',`
`129`		`- 'ensure' => 'running',`
`130`		`- 'enable' => 'true',`
	`128`	`+ 'name' => 'apache2',`
	`129`	`+ 'ensure' => 'running',`
	`130`	`+ 'enable' => 'true',`
`131`	`131`	`)`
`132`	`132`	`}`
`133`	`133`	`end`