(CONT-722) Correct Style/TrailingCommaInHashLiteral

Author: LukasAud

.rubocop_todo.yml

@@ -265,10 +265,3 @@ Style/StringConcatenation:
 Style/TernaryParentheses:
   Exclude:
     - 'spec/defines/vhost_spec.rb'
-
-# Offense count: 259
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Enabled: false

spec/classes/apache_spec.rb

@@ -68,7 +68,7 @@
     context 'with use_optional_includes' do
       let :params do
         {
-          use_optional_includes: true,
+          use_optional_includes: true
         }
       end
 
@@ -78,7 +78,7 @@
     context 'with serveradmin' do
       let(:params) do
         {
-          serveradmin: 'admin@example.com',
+          serveradmin: 'admin@example.com'
         }
       end
 
@@ -168,7 +168,7 @@
       let :params do
         { log_formats: {
           '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"',
+          'vhost_combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"'
         } }
       end
 
@@ -180,7 +180,7 @@
       let :params do
         { log_formats: {
           'common' => '%v %h %l %u %t "%r" %>s %b',
-          'combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
+          'combined' => '%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"'
         } }
       end
 
@@ -260,7 +260,7 @@
         {
           vhost_dir: '/etc/httpd/site.d',
           confd_dir: '/etc/httpd/conf.d',
-          mod_dir: '/etc/httpd/mod.d',
+          mod_dir: '/etc/httpd/mod.d'
         }
       end
 
@@ -311,7 +311,7 @@
           vhost_dir: '/etc/httpd/site.d',
           confd_dir: '/etc/httpd/conf.d',
           mod_dir: '/etc/httpd/mod.d',
-          use_optional_includes: true,
+          use_optional_includes: true
         }
       end
 
@@ -323,7 +323,7 @@
           vhost_dir: '/etc/httpd/site.d',
           confd_dir: '/etc/httpd/conf.d',
           mod_dir: '/etc/httpd/mod.d',
-          allow_encoded_slashes: 'nodecode',
+          allow_encoded_slashes: 'nodecode'
         }
       end
 
@@ -336,7 +336,7 @@
           vhost_dir: '/etc/httpd/site.d',
           confd_dir: '/etc/httpd/conf.d',
           mod_dir: '/etc/httpd/mod.d',
-          default_charset: 'none',
+          default_charset: 'none'
         }
       end
 
@@ -608,7 +608,7 @@
     context 'with a custom apache_name parameter' do
       let :params do
         {
-          apache_name: 'httpd24-httpd',
+          apache_name: 'httpd24-httpd'
         }
       end
 
@@ -622,7 +622,7 @@
     context 'with a custom file_mode parameter' do
       let :params do
         {
-          file_mode: '0640',
+          file_mode: '0640'
         }
       end
 
@@ -635,7 +635,7 @@
     context 'with a custom root_directory_options parameter' do
       let :params do
         {
-          root_directory_options: ['-Indexes', '-FollowSymLinks'],
+          root_directory_options: ['-Indexes', '-FollowSymLinks']
         }
       end
 
@@ -644,7 +644,7 @@
     context 'with a custom root_directory_secured parameter' do
       let :params do
         {
-          root_directory_secured: true,
+          root_directory_secured: true
         }
       end
 
@@ -658,7 +658,7 @@
     context 'without default non-ssl vhost' do
       let :params do
         {
-          default_vhost: false,
+          default_vhost: false
         }
       end
 
@@ -668,7 +668,7 @@
     context 'with default ssl vhost' do
       let :params do
         {
-          default_ssl_vhost: true,
+          default_ssl_vhost: true
         }
       end
 

spec/classes/mod/alias_spec.rb

@@ -30,7 +30,7 @@
       end
       let :params do
         {
-          'icons_options' => 'foo',
+          'icons_options' => 'foo'
         }
       end
 
@@ -45,7 +45,7 @@
       end
       let :params do
         {
-          'icons_prefix' => 'apache-icons',
+          'icons_prefix' => 'apache-icons'
         }
       end
 
@@ -60,7 +60,7 @@
       end
       let :params do
         {
-          'icons_path' => false,
+          'icons_path' => false
         }
       end
 

spec/classes/mod/auth_cas_spec.rb

@@ -8,7 +8,7 @@
       {
         cas_login_url: 'https://cas.example.com/login',
         cas_validate_url: 'https://cas.example.com/validate',
-        cas_cookie_path: '/var/cache/apache2/mod_auth_cas/',
+        cas_cookie_path: '/var/cache/apache2/mod_auth_cas/'
       }
     end
 
@@ -21,7 +21,7 @@
         cas_login_url: 'https://cas.example.com/login',
         cas_validate_url: 'https://cas.example.com/validate',
         cas_timeout: 1234,
-        cas_idle_timeout: 4321,
+        cas_idle_timeout: 4321
       }
     end
 

spec/classes/mod/authn_dbd_spec.rb

@@ -6,7 +6,7 @@
   context 'default params' do
     let :params do
       {
-        authn_dbd_params: 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
+        authn_dbd_params: 'host=db_host port=3306 user=apache password=###### dbname=apache_auth'
       }
     end
 
@@ -18,7 +18,7 @@
       {
         authn_dbd_params: 'host=db_host port=3306 user=apache password=###### dbname=apache_auth',
         authn_dbd_alias: 'db_authn',
-        authn_dbd_query: 'SELECT password FROM authn WHERE username = %s',
+        authn_dbd_query: 'SELECT password FROM authn WHERE username = %s'
       }
     end
 

spec/classes/mod/cluster_spec.rb

@@ -11,7 +11,7 @@
         allowed_network: '172.17.0',
         balancer_name: 'mycluster',
         ip: '172.17.0.1',
-        version: '1.3.0',
+        version: '1.3.0'
       }
     end
 
@@ -34,7 +34,7 @@
         allowed_network: '172.17.0',
         balancer_name: 'mycluster',
         ip: '172.17.0.1',
-        version: '1.3.1',
+        version: '1.3.1'
       }
     end
 

spec/classes/mod/dav_svn_spec.rb

@@ -16,7 +16,7 @@
       describe 'with parameters' do
         let :params do
           {
-            'authz_svn_enabled' => true,
+            'authz_svn_enabled' => true
           }
         end
 
@@ -37,7 +37,7 @@
       describe 'with parameters' do
         let :params do
           {
-            'authz_svn_enabled' => true,
+            'authz_svn_enabled' => true
           }
         end
 
@@ -59,7 +59,7 @@
       describe 'with parameters' do
         let :params do
           {
-            'authz_svn_enabled' => true,
+            'authz_svn_enabled' => true
           }
         end
 
@@ -81,7 +81,7 @@
       describe 'with parameters' do
         let :params do
           {
-            'authz_svn_enabled' => true,
+            'authz_svn_enabled' => true
           }
         end
 

spec/classes/mod/disk_cache_spec.rb

@@ -8,7 +8,7 @@
 
     let(:params) do
       {
-        cache_ignore_headers: 'Set-Cookie',
+        cache_ignore_headers: 'Set-Cookie'
       }
     end
 
@@ -63,7 +63,7 @@
 
     let(:params) do
       {
-        cache_ignore_headers: 'Set-Cookie',
+        cache_ignore_headers: 'Set-Cookie'
       }
     end
 
@@ -115,7 +115,7 @@
 
     let(:params) do
       {
-        cache_ignore_headers: 'Set-Cookie',
+        cache_ignore_headers: 'Set-Cookie'
       }
     end
 

spec/classes/mod/dumpio_spec.rb

@@ -23,7 +23,7 @@
     context 'with dumpio_input set to On' do
       let :params do
         {
-          dump_io_input: 'On',
+          dump_io_input: 'On'
         }
       end
 
@@ -33,7 +33,7 @@
     context 'with dumpio_ouput set to On' do
       let :params do
         {
-          dump_io_output: 'On',
+          dump_io_output: 'On'
         }
       end
 

spec/classes/mod/event_spec.rb

@@ -40,7 +40,7 @@
           threadlimit: 7,
           listenbacklog: 8,
           maxrequestworkers: 9,
-          maxconnectionsperchild: 10,
+          maxconnectionsperchild: 10
         }
       end
 
@@ -66,7 +66,7 @@
           threadlimit: 7,
           listenbacklog: 8,
           maxrequestworkers: :undef,
-          maxconnectionsperchild: :undef,
+          maxconnectionsperchild: :undef
         }
       end
 
@@ -92,7 +92,7 @@
           threadlimit: false,
           listenbacklog: false,
           maxrequestworkers: false,
-          maxconnectionsperchild: false,
+          maxconnectionsperchild: false
         }
       end
 

spec/classes/mod/expires_spec.rb

@@ -17,7 +17,7 @@
     end
     let :params do
       {
-        'expires_default' => 'access plus 1 month',
+        'expires_default' => 'access plus 1 month'
       }
     end
 
@@ -40,7 +40,7 @@
         'expires_by_type' => [
           { 'text/json' => 'mod plus 1 day' },
           { 'text/html' => 'access plus 1 year' },
-        ],
+        ]
       }
     end
 

spec/classes/mod/http2_spec.rb

@@ -48,7 +48,7 @@
           h2_tls_cool_down_secs: 0,
           h2_tls_warm_up_size: 0,
           h2_upgrade: false,
-          h2_window_size: 128_000,
+          h2_window_size: 128_000
         }
       end
 

spec/classes/mod/info_spec.rb

@@ -15,7 +15,7 @@ def general_info_specs_apache24
   context 'passing restrict_access => false' do
     let :params do
       {
-        restrict_access: false,
+        restrict_access: false
       }
     end
 
@@ -44,7 +44,7 @@ def general_info_specs_apache24
     let :params do
       {
         restrict_access: false,
-        allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1'],
+        allow_from: ['10.10.1.2', '192.168.1.2', '127.0.0.1']
       }
     end
 

spec/classes/mod/itk_spec.rb

@@ -60,7 +60,7 @@
 
       let :params do
         {
-          enablecapabilities: false,
+          enablecapabilities: false
         }
       end
 
@@ -83,7 +83,7 @@
     context 'with enablecapabilities set' do
       let :params do
         {
-          enablecapabilities: true,
+          enablecapabilities: true
         }
       end