Skip to content

Commit 7992559

Browse files
LukasAudLukasAud
authored
Merge pull request #1339 from puppetlabs/pdksync_maint/pdk_update_20-04
pdksync - (Maint) PDK Update
2 parents dafb829 + 46007d8 commit 7992559

19 files changed

+144
-153
lines changed

‎.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,5 +200,5 @@ jobs:
200200
repo_token: ${{ secrets.GITHUB_TOKEN }}
201201
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
202202
# Optional Input
203-
channel: '#team-ia-bots'
203+
channel: '#team-cat-bots'
204204
name: 'GABot'

‎.github/workflows/spec.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ jobs:
5454
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
5555
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5656
echo STEP_START=$(date +%s) >> $GITHUB_ENV
57-
# - name: Run Static & Syntax Tests
58-
# if: ${{ github.repository_owner == 'puppetlabs' }}
59-
# run: |
60-
# buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
57+
- name: Run Static & Syntax Tests
58+
if: ${{ github.repository_owner == 'puppetlabs' }}
59+
run: |
60+
buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
6161
6262
- name: Setup Spec Test Matrix
6363
id: get-matrix

‎.puppet-lint.rc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
--relative
2+
--no-parameter_types-check
3+
--no-parameter_documentation-check
4+
--no-anchor_resource-check
5+
--no-params_empty_string_assignment-check

‎.sync.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,9 @@ spec/spec_helper.rb:
5858
unmanaged: false
5959
.travis.yml:
6060
delete: true
61+
Rakefile:
62+
extra_disabled_lint_checks:
63+
- parameter_types
64+
- parameter_documentation
65+
- anchor_resource
66+
- params_empty_string_assignment

‎Rakefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').a
1010

1111
def changelog_user
1212
return unless Rake.application.top_level_tasks.include? "changelog"
13-
returnVal = "puppetlabs" || JSON.load(File.read('metadata.json'))['author']
13+
returnVal = nil || JSON.load(File.read('metadata.json'))['author']
1414
raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
1515
puts "GitHubChangelogGenerator user:#{returnVal}"
1616
returnVal
@@ -42,14 +42,17 @@ def changelog_future_release
4242
end
4343

4444
PuppetLint.configuration.send('disable_relative')
45+
PuppetLint.configuration.send('disable_parameter_types')
46+
PuppetLint.configuration.send('disable_parameter_documentation')
47+
PuppetLint.configuration.send('disable_anchor_resource')
48+
PuppetLint.configuration.send('disable_params_empty_string_assignment')
4549

4650

4751
if Bundler.rubygems.find_name('github_changelog_generator').any?
4852
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
4953
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
5054
config.user = "#{changelog_user}"
5155
config.project = "#{changelog_project}"
52-
config.max_issues = 500
5356
config.future_release = "#{changelog_future_release}"
5457
config.exclude_labels = ['maintenance']
5558
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."

‎manifests/repo/apt_postgresql_org.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
},
2828
}
2929

30-
Apt::Source['apt.postgresql.org']->Package<|tag == 'puppetlabs-postgresql'|>
30+
Apt::Source['apt.postgresql.org'] -> Package<|tag == 'puppetlabs-postgresql'|>
3131
Class['Apt::Update'] -> Package<|tag == 'puppetlabs-postgresql'|>
3232
}

‎manifests/server/config.pp

Lines changed: 37 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -52,49 +52,43 @@
5252

5353
postgresql::server::pg_hba_rule {
5454
'local access as postgres user':
55-
type => 'local',
56-
user => $user,
57-
auth_method => 'ident',
58-
auth_option => $local_auth_option,
59-
order => 1,
60-
;
55+
type => 'local',
56+
user => $user,
57+
auth_method => 'ident',
58+
auth_option => $local_auth_option,
59+
order => 1;
6160

6261
'local access to database with same name':
63-
type => 'local',
64-
auth_method => 'ident',
65-
auth_option => $local_auth_option,
66-
order => 2,
67-
;
62+
type => 'local',
63+
auth_method => 'ident',
64+
auth_option => $local_auth_option,
65+
order => 2;
6866

6967
'allow localhost TCP access to postgresql user':
70-
type => 'host',
71-
user => $user,
72-
address => '127.0.0.1/32',
73-
auth_method => 'md5',
74-
order => 3,
75-
;
68+
type => 'host',
69+
user => $user,
70+
address => '127.0.0.1/32',
71+
auth_method => 'md5',
72+
order => 3;
7673

7774
'deny access to postgresql user':
78-
type => 'host',
79-
user => $user,
80-
address => $ip_mask_deny_postgres_user,
81-
auth_method => 'reject',
82-
order => 4,
83-
;
75+
type => 'host',
76+
user => $user,
77+
address => $ip_mask_deny_postgres_user,
78+
auth_method => 'reject',
79+
order => 4;
8480

8581
'allow access to all users':
86-
type => 'host',
87-
address => $ip_mask_allow_all_users,
88-
auth_method => 'md5',
89-
order => 100,
90-
;
82+
type => 'host',
83+
address => $ip_mask_allow_all_users,
84+
auth_method => 'md5',
85+
order => 100;
9186

9287
'allow access to ipv6 localhost':
93-
type => 'host',
94-
address => '::1/128',
95-
auth_method => 'md5',
96-
order => 101,
97-
;
88+
type => 'host',
89+
address => '::1/128',
90+
auth_method => 'md5',
91+
order => 101;
9892
}
9993
}
10094

@@ -233,17 +227,15 @@
233227

234228
file {
235229
default:
236-
ensure => file,
237-
owner => root,
238-
group => root,
239-
notify => [Exec['restart-systemd'], Class['postgresql::server::service']],
240-
before => Class['postgresql::server::reload'],
241-
;
230+
ensure => file,
231+
owner => root,
232+
group => root,
233+
notify => [Exec['restart-systemd'], Class['postgresql::server::service']],
234+
before => Class['postgresql::server::reload'];
242235

243236
'systemd-conf-dir':
244-
ensure => directory,
245-
path => "/etc/systemd/system/${service_name}.service.d",
246-
;
237+
ensure => directory,
238+
path => "/etc/systemd/system/${service_name}.service.d";
247239

248240
# Template uses:
249241
# - $facts['os']['name']
@@ -253,10 +245,9 @@
253245
# - $datadir
254246
# - $extra_systemd_config
255247
'systemd-override':
256-
path => "/etc/systemd/system/${service_name}.service.d/${service_name}.conf",
257-
content => template('postgresql/systemd-override.erb'),
258-
require => File['systemd-conf-dir'],
259-
;
248+
path => "/etc/systemd/system/${service_name}.service.d/${service_name}.conf",
249+
content => template('postgresql/systemd-override.erb'),
250+
require => File['systemd-conf-dir'];
260251
}
261252

262253
if $service_enable != 'mask' {

‎manifests/server/database.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
}
121121

122122
if defined(Postgresql::Server::Role[$owner]) {
123-
Postgresql::Server::Role[$owner]->Postgresql_psql["ALTER DATABASE \"${dbname}\" OWNER TO \"${owner}\""]
123+
Postgresql::Server::Role[$owner] -> Postgresql_psql["ALTER DATABASE \"${dbname}\" OWNER TO \"${owner}\""]
124124
}
125125
}
126126

@@ -132,7 +132,7 @@
132132

133133
if defined(Postgresql::Server::Tablespace[$tablespace]) {
134134
# The tablespace must be there, before we create the database.
135-
Postgresql::Server::Tablespace[$tablespace]->Postgresql_psql["CREATE DATABASE \"${dbname}\""]
135+
Postgresql::Server::Tablespace[$tablespace] -> Postgresql_psql["CREATE DATABASE \"${dbname}\""]
136136
}
137137
}
138138
}

‎manifests/server/db.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
} -> Postgresql_conn_validator<| db_name == $dbname |>
5252
}
5353

54-
if($tablespace != undef and defined(Postgresql::Server::Tablespace[$tablespace])) {
55-
Postgresql::Server::Tablespace[$tablespace]->Postgresql::Server::Database[$name]
54+
if ($tablespace != undef and defined(Postgresql::Server::Tablespace[$tablespace])) {
55+
Postgresql::Server::Tablespace[$tablespace] -> Postgresql::Server::Database[$name]
5656
}
5757
}

‎manifests/server/default_privileges.pp

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,16 @@
2525
/(?i:^TYPES$)/,
2626
/(?i:^SCHEMAS$)/
2727
] $object_type,
28-
String $schema = 'public',
29-
String $psql_db = $postgresql::server::default_database,
30-
String $psql_user = $postgresql::server::user,
31-
Integer $port = $postgresql::server::port,
32-
Hash $connect_settings = $postgresql::server::default_connect_settings,
33-
Enum['present',
34-
'absent'
35-
] $ensure = 'present',
36-
String $group = $postgresql::server::group,
37-
String $psql_path = $postgresql::server::psql_path,
38-
Optional[String] $target_role = undef,
28+
String $schema = 'public',
29+
String $psql_db = $postgresql::server::default_database,
30+
String $psql_user = $postgresql::server::user,
31+
Integer $port = $postgresql::server::port,
32+
Hash $connect_settings = $postgresql::server::default_connect_settings,
33+
Enum['present', 'absent'] $ensure = 'present',
34+
String $group = $postgresql::server::group,
35+
String $psql_path = $postgresql::server::psql_path,
36+
Optional[String] $target_role = undef,
3937
) {
40-
4138
# If possible use the version of the remote database, otherwise
4239
# fallback to our local DB version
4340
if $connect_settings != undef and has_key( $connect_settings, 'DBVERSION') {
@@ -113,9 +110,9 @@
113110
'SEQUENCES': {
114111
case $_privilege {
115112
/^(ALL)$/: { $_check_privilege = 'rwU' }
116-
/^SELECT$/: { $_check_privilege = 'r'}
117-
/^UPDATE$/: { $_check_privilege = 'w'}
118-
/^USAGE$/: { $_check_privilege = 'U'}
113+
/^SELECT$/: { $_check_privilege = 'r' }
114+
/^UPDATE$/: { $_check_privilege = 'w' }
115+
/^USAGE$/: { $_check_privilege = 'U' }
119116
default: { fail('Illegal value for $privilege parameter') }
120117
}
121118
$_check_type = 'S'
@@ -136,7 +133,7 @@
136133
}
137134
'TYPES': {
138135
case $_privilege {
139-
/^(ALL|USAGE)$/: { $_check_privilege = 'U'}
136+
/^(ALL|USAGE)$/: { $_check_privilege = 'U' }
140137
default: { fail('Illegal value for $privilege parameter') }
141138
}
142139
$_check_type = 'T'
@@ -178,14 +175,14 @@
178175
psql_group => $group,
179176
psql_path => $psql_path,
180177
unless => $unless_cmd,
181-
environment => 'PGOPTIONS=--client-min-messages=error'
178+
environment => 'PGOPTIONS=--client-min-messages=error',
182179
}
183180

184181
if($role != undef and defined(Postgresql::Server::Role[$role])) {
185-
Postgresql::Server::Role[$role]->Postgresql_psql["default_privileges:${name}"]
182+
Postgresql::Server::Role[$role] -> Postgresql_psql["default_privileges:${name}"]
186183
}
187184

188185
if($db != undef and defined(Postgresql::Server::Database[$db])) {
189-
Postgresql::Server::Database[$db]->Postgresql_psql["default_privileges:${name}"]
186+
Postgresql::Server::Database[$db] -> Postgresql_psql["default_privileges:${name}"]
190187
}
191188
}

‎manifests/server/grant.pp

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
define postgresql::server::grant (
1717
String $role,
1818
String $db,
19-
String $privilege = '',
19+
String $privilege = '',
2020
Pattern[#/(?i:^COLUMN$)/,
2121
/(?i:^ALL SEQUENCES IN SCHEMA$)/,
2222
/(?i:^ALL TABLES IN SCHEMA$)/,
@@ -31,23 +31,17 @@
3131
/(?i:^SCHEMA$)/,
3232
/(?i:^SEQUENCE$)/
3333
#/(?i:^VIEW$)/
34-
] $object_type = 'database',
35-
Optional[Variant[
36-
Array[String,2,2],
37-
String[1]]
38-
] $object_name = undef,
39-
Array[String[1],0]
40-
$object_arguments = [],
41-
String $psql_db = $postgresql::server::default_database,
42-
String $psql_user = $postgresql::server::user,
43-
Integer $port = $postgresql::server::port,
44-
Boolean $onlyif_exists = false,
45-
Hash $connect_settings = $postgresql::server::default_connect_settings,
46-
Enum['present',
47-
'absent'
48-
] $ensure = 'present',
49-
String $group = $postgresql::server::group,
50-
String $psql_path = $postgresql::server::psql_path,
34+
] $object_type = 'database',
35+
Optional[Variant[Array[String,2,2],String[1]]] $object_name = undef,
36+
Array[String[1],0] $object_arguments = [],
37+
String $psql_db = $postgresql::server::default_database,
38+
String $psql_user = $postgresql::server::user,
39+
Integer $port = $postgresql::server::port,
40+
Boolean $onlyif_exists = false,
41+
Hash $connect_settings = $postgresql::server::default_connect_settings,
42+
Enum['present', 'absent'] $ensure = 'present',
43+
String $group = $postgresql::server::group,
44+
String $psql_path = $postgresql::server::psql_path,
5145
) {
5246
case $ensure {
5347
default: {
@@ -476,10 +470,10 @@
476470
}
477471

478472
if($role != undef and defined(Postgresql::Server::Role[$role])) {
479-
Postgresql::Server::Role[$role]->Postgresql_psql["grant:${name}"]
473+
Postgresql::Server::Role[$role] -> Postgresql_psql["grant:${name}"]
480474
}
481475

482476
if($db != undef and defined(Postgresql::Server::Database[$db])) {
483-
Postgresql::Server::Database[$db]->Postgresql_psql["grant:${name}"]
477+
Postgresql::Server::Database[$db] -> Postgresql_psql["grant:${name}"]
484478
}
485479
}

‎manifests/server/grant_role.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
}
4141

4242
if ! $connect_settings or empty($connect_settings) {
43-
Class['postgresql::server']->Postgresql_psql["grant_role:${name}"]
43+
Class['postgresql::server'] -> Postgresql_psql["grant_role:${name}"]
4444
}
4545
if defined(Postgresql::Server::Role[$role]) {
46-
Postgresql::Server::Role[$role]->Postgresql_psql["grant_role:${name}"]
46+
Postgresql::Server::Role[$role] -> Postgresql_psql["grant_role:${name}"]
4747
}
4848
if defined(Postgresql::Server::Role[$group]) {
49-
Postgresql::Server::Role[$group]->Postgresql_psql["grant_role:${name}"]
49+
Postgresql::Server::Role[$group] -> Postgresql_psql["grant_role:${name}"]
5050
}
5151
}

‎manifests/server/late_initdb.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
WHERE datname = 'template1'",
3535
unless => "SELECT datname FROM pg_database WHERE
3636
datname = 'template1' AND encoding = pg_char_to_encoding('${encoding}')",
37-
before => Anchor['postgresql::server::service::end']
37+
before => Anchor['postgresql::server::service::end'],
3838
}
3939
}

‎manifests/server/reassign_owned_by.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@
5555
}
5656

5757
if($old_role != undef and defined(Postgresql::Server::Role[$old_role])) {
58-
Postgresql::Server::Role[$old_role]->Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
58+
Postgresql::Server::Role[$old_role] -> Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
5959
}
6060
if($new_role != undef and defined(Postgresql::Server::Role[$new_role])) {
61-
Postgresql::Server::Role[$new_role]->Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
61+
Postgresql::Server::Role[$new_role] -> Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
6262
}
6363

6464
if($db != undef and defined(Postgresql::Server::Database[$db])) {
65-
Postgresql::Server::Database[$db]->Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
65+
Postgresql::Server::Database[$db] -> Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
6666
}
6767
}

‎manifests/server/schema.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
}
5858

5959
if defined(Postgresql::Server::Role[$owner]) {
60-
Postgresql::Server::Role[$owner]->Postgresql_psql["${db}: ALTER SCHEMA \"${schema}\" OWNER TO \"${owner}\""]
60+
Postgresql::Server::Role[$owner] -> Postgresql_psql["${db}: ALTER SCHEMA \"${schema}\" OWNER TO \"${owner}\""]
6161
}
6262
}
6363
}

0 commit comments

Comments
 (0)