(CONT-792) - Correct Style/TrailingCommaInHashLiteral

Author: jordanbreen28

.rubocop_todo.yml

@@ -167,10 +167,3 @@ Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/puppet/functions/postgresql/postgresql_password.rb'
     - 'lib/puppet/type/postgresql_psql.rb'
-
-# Offense count: 137
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Enabled: false

lib/puppet/functions/postgresql/postgresql_acls_to_resources_hash.rb

@@ -34,7 +34,7 @@ def default_impl(acls, id, offset)
         'type' => parts[0],
         'database' => parts[1],
         'user' => parts[2],
-        'order' => '%03d' % (offset + index),
+        'order' => '%03d' % (offset + index)
       }
       if parts[0] == 'local'
         resource['auth_method'] = parts[3]

lib/puppet/functions/postgresql/postgresql_password.rb

@@ -49,7 +49,7 @@ def pg_sha256(password, salt)
       iterations: '4096',
       salt: Base64.strict_encode64(salt),
       client_key: Base64.strict_encode64(client_key(digest)),
-      server_key: Base64.strict_encode64(server_key(digest)),
+      server_key: Base64.strict_encode64(server_key(digest))
     }
   end
 

lib/puppet/util/postgresql_validator.rb

@@ -17,7 +17,7 @@ def build_psql_cmd
         port: '--port',
         db_username: '--username',
         db_name: '--dbname',
-        command: '--command',
+        command: '--command'
       }
 
       args.each do |k, v|

spec/classes/client_spec.rb

@@ -11,7 +11,7 @@
         validcon_script_path: '/opt/bin/my-validate-con.sh',
         package_ensure: 'absent',
         package_name: 'mypackage',
-        file_ensure: 'file',
+        file_ensure: 'file'
       }
     end
 
@@ -50,7 +50,7 @@ class { 'postgresql::globals':
   describe 'with client package name explicitly set undef' do
     let :params do
       {
-        package_name: 'UNSET',
+        package_name: 'UNSET'
       }
     end
 

spec/classes/globals_spec.rb

@@ -15,7 +15,7 @@
     describe 'manage_package_repo => true' do
       let(:params) do
         {
-          manage_package_repo: true,
+          manage_package_repo: true
         }
       end
 
@@ -38,7 +38,7 @@
       let(:params) do
         {
           manage_package_repo: true,
-          repo_proxy: 'http://proxy-server:8080',
+          repo_proxy: 'http://proxy-server:8080'
         }
       end
 
@@ -63,7 +63,7 @@
         {
           manage_package_repo: true,
           repo_baseurl: 'http://mirror.localrepo.com/pgdg-postgresql',
-          yum_repo_commonurl: 'http://mirror.localrepo.com/pgdg-common',
+          yum_repo_commonurl: 'http://mirror.localrepo.com/pgdg-common'
         }
       end
 

spec/classes/lib/devel_spec.rb

@@ -18,7 +18,7 @@
   describe 'disable link_pg_config' do
     let(:params) do
       {
-        link_pg_config: false,
+        link_pg_config: false
       }
     end
 
@@ -48,7 +48,7 @@
     include_examples 'Gentoo'
     let :params do
       {
-        link_pg_config: false,
+        link_pg_config: false
       }
     end
 

spec/classes/server/contrib_spec.rb

@@ -13,7 +13,7 @@
     let(:params) do
       {
         package_name: 'mypackage',
-        package_ensure: 'absent',
+        package_ensure: 'absent'
       }
     end
 

spec/classes/server/plperl_spec.rb

@@ -22,7 +22,7 @@
     let :params do
       {
         package_ensure: 'absent',
-        package_name: 'mypackage',
+        package_name: 'mypackage'
       }
     end
 

spec/classes/server/plpython_spec.rb

@@ -22,7 +22,7 @@
     let :params do
       {
         package_ensure: 'absent',
-        package_name: 'mypackage',
+        package_name: 'mypackage'
       }
     end