Skip to content

Commit 83be16e

Browse files
author
jordanbreen28
committed
(CONT-792) - Correct Style/TrailingCommaInHashLiteral
1 parent c4b5bbf commit 83be16e

34 files changed

+137
-144
lines changed

‎.rubocop_todo.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,3 @@ Style/OptionalBooleanParameter:
167167
Exclude:
168168
- 'lib/puppet/functions/postgresql/postgresql_password.rb'
169169
- 'lib/puppet/type/postgresql_psql.rb'
170-
171-
# Offense count: 137
172-
# This cop supports safe autocorrection (--autocorrect).
173-
# Configuration parameters: EnforcedStyleForMultiline.
174-
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
175-
Style/TrailingCommaInHashLiteral:
176-
Enabled: false

‎lib/puppet/functions/postgresql/postgresql_acls_to_resources_hash.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def default_impl(acls, id, offset)
3434
'type' => parts[0],
3535
'database' => parts[1],
3636
'user' => parts[2],
37-
'order' => '%03d' % (offset + index),
37+
'order' => '%03d' % (offset + index)
3838
}
3939
if parts[0] == 'local'
4040
resource['auth_method'] = parts[3]

‎lib/puppet/functions/postgresql/postgresql_password.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def pg_sha256(password, salt)
4949
iterations: '4096',
5050
salt: Base64.strict_encode64(salt),
5151
client_key: Base64.strict_encode64(client_key(digest)),
52-
server_key: Base64.strict_encode64(server_key(digest)),
52+
server_key: Base64.strict_encode64(server_key(digest))
5353
}
5454
end
5555

‎lib/puppet/util/postgresql_validator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def build_psql_cmd
1717
port: '--port',
1818
db_username: '--username',
1919
db_name: '--dbname',
20-
command: '--command',
20+
command: '--command'
2121
}
2222

2323
args.each do |k, v|

‎spec/classes/client_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
validcon_script_path: '/opt/bin/my-validate-con.sh',
1212
package_ensure: 'absent',
1313
package_name: 'mypackage',
14-
file_ensure: 'file',
14+
file_ensure: 'file'
1515
}
1616
end
1717

@@ -50,7 +50,7 @@ class { 'postgresql::globals':
5050
describe 'with client package name explicitly set undef' do
5151
let :params do
5252
{
53-
package_name: 'UNSET',
53+
package_name: 'UNSET'
5454
}
5555
end
5656

‎spec/classes/globals_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
describe 'manage_package_repo => true' do
1616
let(:params) do
1717
{
18-
manage_package_repo: true,
18+
manage_package_repo: true
1919
}
2020
end
2121

@@ -38,7 +38,7 @@
3838
let(:params) do
3939
{
4040
manage_package_repo: true,
41-
repo_proxy: 'http://proxy-server:8080',
41+
repo_proxy: 'http://proxy-server:8080'
4242
}
4343
end
4444

@@ -63,7 +63,7 @@
6363
{
6464
manage_package_repo: true,
6565
repo_baseurl: 'http://mirror.localrepo.com/pgdg-postgresql',
66-
yum_repo_commonurl: 'http://mirror.localrepo.com/pgdg-common',
66+
yum_repo_commonurl: 'http://mirror.localrepo.com/pgdg-common'
6767
}
6868
end
6969

‎spec/classes/lib/devel_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
describe 'disable link_pg_config' do
1919
let(:params) do
2020
{
21-
link_pg_config: false,
21+
link_pg_config: false
2222
}
2323
end
2424

@@ -48,7 +48,7 @@
4848
include_examples 'Gentoo'
4949
let :params do
5050
{
51-
link_pg_config: false,
51+
link_pg_config: false
5252
}
5353
end
5454

‎spec/classes/server/contrib_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
let(:params) do
1414
{
1515
package_name: 'mypackage',
16-
package_ensure: 'absent',
16+
package_ensure: 'absent'
1717
}
1818
end
1919

‎spec/classes/server/plperl_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
let :params do
2323
{
2424
package_ensure: 'absent',
25-
package_name: 'mypackage',
25+
package_name: 'mypackage'
2626
}
2727
end
2828

‎spec/classes/server/plpython_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
let :params do
2323
{
2424
package_ensure: 'absent',
25-
package_name: 'mypackage',
25+
package_name: 'mypackage'
2626
}
2727
end
2828

‎spec/classes/server/postgis_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
let(:params) do
1313
{
1414
package_name: 'mypackage',
15-
package_ensure: 'absent',
15+
package_ensure: 'absent'
1616
}
1717
end
1818

‎spec/classes/server_spec.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class { 'postgresql::globals':
5252
let(:params) do
5353
{
5454
service_ensure: 'running',
55-
postgres_password: 'new-p@s$word-to-set',
55+
postgres_password: 'new-p@s$word-to-set'
5656
}
5757
end
5858

@@ -76,7 +76,7 @@ class { 'postgresql::globals':
7676
let(:params) do
7777
{
7878
service_ensure: true,
79-
postgres_password: 'new-p@s$word-to-set',
79+
postgres_password: 'new-p@s$word-to-set'
8080
}
8181
end
8282

@@ -171,7 +171,7 @@ class { 'postgresql::globals':
171171
describe 'package_ensure => absent' do
172172
let(:params) do
173173
{
174-
package_ensure: 'absent',
174+
package_ensure: 'absent'
175175
}
176176
end
177177

@@ -187,7 +187,7 @@ class { 'postgresql::globals':
187187
describe 'needs_initdb => true' do
188188
let(:params) do
189189
{
190-
needs_initdb: true,
190+
needs_initdb: true
191191
}
192192
end
193193

@@ -219,8 +219,8 @@ class { 'postgresql::globals':
219219
let(:params) do
220220
{
221221
roles: {
222-
username: { createdb: true },
223-
},
222+
username: { createdb: true }
223+
}
224224
}
225225
end
226226

@@ -234,8 +234,8 @@ class { 'postgresql::globals':
234234
config_entries: {
235235
fsync: 'off',
236236
checkpoint_segments: '20',
237-
remove_me: :undef,
238-
},
237+
remove_me: :undef
238+
}
239239
}
240240
end
241241

@@ -254,9 +254,9 @@ class { 'postgresql::globals':
254254
database: 'mydb',
255255
user: 'myuser',
256256
auth_method: 'md5',
257-
address: '192.0.2.100',
258-
},
259-
},
257+
address: '192.0.2.100'
258+
}
259+
}
260260
}
261261
end
262262

@@ -291,8 +291,8 @@ class { 'postgresql::globals':
291291
db_user: 'backupuser',
292292
db_password: 'backuppass',
293293
dir: '/tmp/backuptest',
294-
manage_user: true,
295-
},
294+
manage_user: true
295+
}
296296
}
297297
end
298298

‎spec/defines/server/database_grant_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{
1414
privilege: 'ALL',
1515
db: 'test',
16-
role: 'test',
16+
role: 'test'
1717
}
1818
end
1919

‎spec/defines/server/db_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{
1515
user: 'test',
1616
password: 'test',
17-
owner: 'tester',
17+
owner: 'tester'
1818
}
1919
end
2020

@@ -34,7 +34,7 @@
3434
dbname: 'testtest',
3535
user: 'test',
3636
password: 'test',
37-
owner: 'tester',
37+
owner: 'tester'
3838
}
3939
end
4040

‎spec/defines/server/default_privileges_spec.rb

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
db: 'test',
1818
role: 'test',
1919
privilege: 'all',
20-
object_type: 'tables',
20+
object_type: 'tables'
2121
}
2222
end
2323

@@ -34,7 +34,7 @@
3434
db: 'test',
3535
role: 'test',
3636
privilege: 'aLl',
37-
object_type: 'TaBlEs',
37+
object_type: 'TaBlEs'
3838
}
3939
end
4040

@@ -58,7 +58,7 @@
5858
db: 'test',
5959
role: 'test',
6060
privilege: 'all',
61-
object_type: 'wrong_type',
61+
object_type: 'wrong_type'
6262
}
6363
end
6464

@@ -77,7 +77,7 @@
7777
db: 'test',
7878
role: 'test',
7979
privilege: 'all',
80-
object_type: 'tables',
80+
object_type: 'tables'
8181
}
8282
end
8383

@@ -103,7 +103,7 @@
103103
db: 'test',
104104
role: 'test',
105105
privilege: 'wrong_privilege',
106-
object_type: 'tables',
106+
object_type: 'tables'
107107
}
108108
end
109109

@@ -123,7 +123,7 @@
123123
role: 'test',
124124
privilege: 'all',
125125
object_type: 'schemas',
126-
schema: '',
126+
schema: ''
127127
}
128128
end
129129

@@ -143,7 +143,7 @@
143143
role: 'test',
144144
privilege: 'all',
145145
object_type: 'schemas',
146-
schema: '',
146+
schema: ''
147147
}
148148
end
149149

@@ -177,7 +177,7 @@ class { 'postgresql::server': }
177177
role: 'test',
178178
privilege: 'all',
179179
object_type: 'schemas',
180-
schema: 'public',
180+
schema: 'public'
181181
}
182182
end
183183

@@ -202,7 +202,7 @@ class { 'postgresql::server': }
202202
privilege: 'all',
203203
object_type: 'tables',
204204
connect_settings: { 'PGHOST' => 'postgres-db-server',
205-
'DBVERSION' => '9.6' },
205+
'DBVERSION' => '9.6' }
206206
}
207207
end
208208

@@ -224,7 +224,7 @@ class { 'postgresql::server': }
224224
object_type: 'tables',
225225
connect_settings: { 'PGHOST' => 'postgres-db-server',
226226
'DBVERSION' => '9.6',
227-
'PGPORT' => '1234' },
227+
'PGPORT' => '1234' }
228228
}
229229
end
230230

@@ -247,7 +247,7 @@ class { 'postgresql::server': }
247247
connect_settings: { 'PGHOST' => 'postgres-db-server',
248248
'DBVERSION' => '9.6',
249249
'PGPORT' => '1234' },
250-
port: 5678,
250+
port: 5678
251251
}
252252
end
253253

@@ -320,7 +320,7 @@ class { 'postgresql::server': }
320320
db: 'test',
321321
role: 'test',
322322
privilege: 'all',
323-
object_type: 'tables',
323+
object_type: 'tables'
324324
}
325325
end
326326

@@ -348,7 +348,7 @@ class {'postgresql::server':}
348348
db: 'test',
349349
role: 'test',
350350
privilege: 'all',
351-
object_type: 'tables',
351+
object_type: 'tables'
352352
}
353353
end
354354

@@ -384,7 +384,7 @@ class {'postgresql::server':}
384384
psql_user: 'postgres',
385385
psql_db: 'db',
386386
port: 1542,
387-
connect_settings: { 'DBVERSION' => '9.6' },
387+
connect_settings: { 'DBVERSION' => '9.6' }
388388
}
389389
end
390390

0 commit comments

Comments
 (0)