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

0 commit comments

Comments
 (0)