(CONT-792) - Correct Style/TrailingCommaInHashLiteral

puppetlabs · Apr 19, 2023 · 83be16e · 83be16e
1 parent c4b5bbf
commit 83be16e
Show file tree

Hide file tree

Showing 34 changed files with 137 additions and 144 deletions.
diff --git a/.rubocop_todo.yml b/.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
diff --git a/lib/puppet/functions/postgresql/postgresql_acls_to_resources_hash.rb b/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]

diff --git a/lib/puppet/functions/postgresql/postgresql_password.rb b/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
 

diff --git a/lib/puppet/util/postgresql_validator.rb b/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|

diff --git a/spec/classes/client_spec.rb b/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
 

diff --git a/spec/classes/globals_spec.rb b/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
 

diff --git a/spec/classes/lib/devel_spec.rb b/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
 

diff --git a/spec/classes/server/contrib_spec.rb b/spec/classes/server/contrib_spec.rb
@@ -13,7 +13,7 @@
     let(:params) do
       {
         package_name: 'mypackage',
-        package_ensure: 'absent',
+        package_ensure: 'absent'
       }
     end
 

diff --git a/spec/classes/server/plperl_spec.rb b/spec/classes/server/plperl_spec.rb
@@ -22,7 +22,7 @@
     let :params do
       {
         package_ensure: 'absent',
-        package_name: 'mypackage',
+        package_name: 'mypackage'
       }
     end
 

diff --git a/spec/classes/server/plpython_spec.rb b/spec/classes/server/plpython_spec.rb
@@ -22,7 +22,7 @@
     let :params do
       {
         package_ensure: 'absent',
-        package_name: 'mypackage',
+        package_name: 'mypackage'
       }
     end
 

diff --git a/spec/classes/server/postgis_spec.rb b/spec/classes/server/postgis_spec.rb
@@ -12,7 +12,7 @@
     let(:params) do
       {
         package_name: 'mypackage',
-        package_ensure: 'absent',
+        package_ensure: 'absent'
       }
     end
 

diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
@@ -52,7 +52,7 @@ class { 'postgresql::globals':
     let(:params) do
       {
         service_ensure: 'running',
-        postgres_password: 'new-p@s$word-to-set',
+        postgres_password: 'new-p@s$word-to-set'
       }
     end
 
@@ -76,7 +76,7 @@ class { 'postgresql::globals':
     let(:params) do
       {
         service_ensure: true,
-        postgres_password: 'new-p@s$word-to-set',
+        postgres_password: 'new-p@s$word-to-set'
       }
     end
 
@@ -171,7 +171,7 @@ class { 'postgresql::globals':
   describe 'package_ensure => absent' do
     let(:params) do
       {
-        package_ensure: 'absent',
+        package_ensure: 'absent'
       }
     end
 
@@ -187,7 +187,7 @@ class { 'postgresql::globals':
   describe 'needs_initdb => true' do
     let(:params) do
       {
-        needs_initdb: true,
+        needs_initdb: true
       }
     end
 
@@ -219,8 +219,8 @@ class { 'postgresql::globals':
     let(:params) do
       {
         roles: {
-          username: { createdb: true },
-        },
+          username: { createdb: true }
+        }
       }
     end
 
@@ -234,8 +234,8 @@ class { 'postgresql::globals':
         config_entries: {
           fsync: 'off',
           checkpoint_segments: '20',
-          remove_me: :undef,
-        },
+          remove_me: :undef
+        }
       }
     end
 
@@ -254,9 +254,9 @@ class { 'postgresql::globals':
             database: 'mydb',
             user: 'myuser',
             auth_method: 'md5',
-            address: '192.0.2.100',
-          },
-        },
+            address: '192.0.2.100'
+          }
+        }
       }
     end
 
@@ -291,8 +291,8 @@ class { 'postgresql::globals':
           db_user: 'backupuser',
           db_password: 'backuppass',
           dir: '/tmp/backuptest',
-          manage_user: true,
-        },
+          manage_user: true
+        }
       }
     end
 

diff --git a/spec/defines/server/database_grant_spec.rb b/spec/defines/server/database_grant_spec.rb
@@ -13,7 +13,7 @@
     {
       privilege: 'ALL',
       db: 'test',
-      role: 'test',
+      role: 'test'
     }
   end
 

diff --git a/spec/defines/server/db_spec.rb b/spec/defines/server/db_spec.rb
@@ -14,7 +14,7 @@
       {
         user: 'test',
         password: 'test',
-        owner: 'tester',
+        owner: 'tester'
       }
     end
 
@@ -34,7 +34,7 @@
         dbname: 'testtest',
         user: 'test',
         password: 'test',
-        owner: 'tester',
+        owner: 'tester'
       }
     end
 

diff --git a/spec/defines/server/default_privileges_spec.rb b/spec/defines/server/default_privileges_spec.rb
@@ -17,7 +17,7 @@
         db: 'test',
         role: 'test',
         privilege: 'all',
-        object_type: 'tables',
+        object_type: 'tables'
       }
     end
 
@@ -34,7 +34,7 @@
         db: 'test',
         role: 'test',
         privilege: 'aLl',
-        object_type: 'TaBlEs',
+        object_type: 'TaBlEs'
       }
     end
 
@@ -58,7 +58,7 @@
           db: 'test',
           role: 'test',
           privilege: 'all',
-          object_type: 'wrong_type',
+          object_type: 'wrong_type'
         }
       end
 
@@ -77,7 +77,7 @@
           db: 'test',
           role: 'test',
           privilege: 'all',
-          object_type: 'tables',
+          object_type: 'tables'
         }
       end
 
@@ -103,7 +103,7 @@
           db: 'test',
           role: 'test',
           privilege: 'wrong_privilege',
-          object_type: 'tables',
+          object_type: 'tables'
         }
       end
 
@@ -123,7 +123,7 @@
           role: 'test',
           privilege: 'all',
           object_type: 'schemas',
-          schema: '',
+          schema: ''
         }
       end
 
@@ -143,7 +143,7 @@
           role: 'test',
           privilege: 'all',
           object_type: 'schemas',
-          schema: '',
+          schema: ''
         }
       end
 
@@ -177,7 +177,7 @@ class { 'postgresql::server': }
           role: 'test',
           privilege: 'all',
           object_type: 'schemas',
-          schema: 'public',
+          schema: 'public'
         }
       end
 
@@ -202,7 +202,7 @@ class { 'postgresql::server': }
         privilege: 'all',
         object_type: 'tables',
         connect_settings: { 'PGHOST' => 'postgres-db-server',
-                            'DBVERSION' => '9.6' },
+                            'DBVERSION' => '9.6' }
       }
     end
 
@@ -224,7 +224,7 @@ class { 'postgresql::server': }
         object_type: 'tables',
         connect_settings: { 'PGHOST' => 'postgres-db-server',
                             'DBVERSION' => '9.6',
-                            'PGPORT' => '1234' },
+                            'PGPORT' => '1234' }
       }
     end
 
@@ -247,7 +247,7 @@ class { 'postgresql::server': }
         connect_settings: { 'PGHOST' => 'postgres-db-server',
                             'DBVERSION' => '9.6',
                             'PGPORT' => '1234' },
-        port: 5678,
+        port: 5678
       }
     end
 
@@ -320,7 +320,7 @@ class { 'postgresql::server': }
         db: 'test',
         role: 'test',
         privilege: 'all',
-        object_type: 'tables',
+        object_type: 'tables'
       }
     end
 
@@ -348,7 +348,7 @@ class {'postgresql::server':}
         db: 'test',
         role: 'test',
         privilege: 'all',
-        object_type: 'tables',
+        object_type: 'tables'
       }
     end
 
@@ -384,7 +384,7 @@ class {'postgresql::server':}
         psql_user: 'postgres',
         psql_db: 'db',
         port: 1542,
-        connect_settings: { 'DBVERSION' => '9.6' },
+        connect_settings: { 'DBVERSION' => '9.6' }
       }
     end