Skip to content

Commit cd20e36

Browse files
cruelsmithcruelsmith
committed
Testing fixes
1 parent 8358483 commit cd20e36

File tree

11 files changed

+26
-74
lines changed

11 files changed

+26
-74
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "ci"
22

33
on:
4+
push:
45
pull_request:
56
branches:
67
- "main"

‎manifests/server/instance/config.pp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@
7777
Optional[Postgresql::Pg_password_encryption] $pg_hba_auth_password_encryption = $postgresql::server::pg_hba_auth_password_encryption,
7878
Optional[String] $extra_systemd_config = $postgresql::server::extra_systemd_config,
7979
) {
80-
if $pg_hba_auth_password_encryption {
81-
$override_pg_hba_auth_password_encryption = $pg_hba_auth_password_encryption
82-
} else {
83-
$override_pg_hba_auth_password_encryption = $password_encryption
84-
}
80+
$_pg_hba_auth_password_encryption = pick($pg_hba_auth_password_encryption,$password_encryption)
8581

8682
if ($manage_pg_hba_conf == true) {
8783
# Prepare the main pg_hba file
@@ -115,7 +111,7 @@
115111
type => 'host',
116112
user => $user,
117113
address => '127.0.0.1/32',
118-
auth_method => $password_encryption,
114+
auth_method => $_pg_hba_auth_password_encryption,
119115
order => 3;
120116

121117
"deny access to postgresql user for instance ${name}":
@@ -128,13 +124,13 @@
128124
"allow access to all users for instance ${name}":
129125
type => 'host',
130126
address => $ip_mask_allow_all_users,
131-
auth_method => $password_encryption,
127+
auth_method => $_pg_hba_auth_password_encryption,
132128
order => 100;
133129

134130
"allow access to ipv6 localhost for instance ${name}":
135131
type => 'host',
136132
address => '::1/128',
137-
auth_method => $password_encryption,
133+
auth_method => $_pg_hba_auth_password_encryption,
138134
order => 101;
139135
}
140136
}

‎metadata.json

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -26,66 +26,20 @@
2626
}
2727
],
2828
"operatingsystem_support": [
29-
{
30-
"operatingsystem": "RedHat",
31-
"operatingsystemrelease": [
32-
"7",
33-
"8",
34-
"9"
35-
]
36-
},
3729
{
3830
"operatingsystem": "CentOS",
3931
"operatingsystemrelease": [
4032
"7",
4133
"8"
4234
]
4335
},
44-
{
45-
"operatingsystem": "OracleLinux",
46-
"operatingsystemrelease": [
47-
"7"
48-
]
49-
},
50-
{
51-
"operatingsystem": "Scientific",
52-
"operatingsystemrelease": [
53-
"7"
54-
]
55-
},
56-
{
57-
"operatingsystem": "Debian",
58-
"operatingsystemrelease": [
59-
"10",
60-
"11"
61-
]
62-
},
63-
{
64-
"operatingsystem": "SLES",
65-
"operatingsystemrelease": [
66-
"12",
67-
"15"
68-
]
69-
},
7036
{
7137
"operatingsystem": "Ubuntu",
7238
"operatingsystemrelease": [
7339
"18.04",
7440
"20.04",
7541
"22.04"
7642
]
77-
},
78-
{
79-
"operatingsystem": "Rocky",
80-
"operatingsystemrelease": [
81-
"8"
82-
]
83-
},
84-
{
85-
"operatingsystem": "AlmaLinux",
86-
"operatingsystemrelease": [
87-
"8"
88-
]
8943
}
9044
],
9145
"requirements": [

‎spec/acceptance/overridden_settings_spec.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,24 @@
1111

1212
let(:pp) do
1313
<<-MANIFEST
14-
$auth_method = $facts['os']['release']['major'] ? { '7' => 'md5', default => 'scram-sha-256'}
14+
include postgresql::params
1515
class { 'postgresql::server':
1616
roles => {
1717
'testusername' => {
18-
password_hash => postgresql::postgresql_password('testusername', 'supersecret'),
18+
password_hash => postgresql::postgresql_password('testusername', 'supersecret', undef, $postgresql::params::password_encryption),
1919
createdb => true,
2020
},
2121
},
2222
config_entries => {
2323
max_connections => 21,
2424
},
25+
pg_hba_auth_password_encryption => $postgresql::params::password_encryption,
2526
pg_hba_rules => {
2627
'from_remote_host' => {
2728
type => 'host',
2829
database => 'mydb',
2930
user => 'myuser',
30-
auth_method => $auth_method,
31+
auth_method => $postgresql::params::password_encryption,
3132
address => '192.0.2.100/32',
3233
},
3334
},

‎spec/acceptance/postgresql_conn_validator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class { 'postgresql::server':
99
postgres_password => 'space password',
1010
}->
1111
postgresql::server::role { 'testuser':
12-
password_hash => postgresql::postgresql_password('testuser','test1'),
12+
password_hash => postgresql::postgresql_password('testuser','test1', undef, $postgresql::server::password_encryption),
1313
}->
1414
postgresql::server::database { 'testdb':
1515
owner => 'testuser',

‎spec/acceptance/server/default_privileges_spec.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class { 'postgresql::server': }
2424
2525
postgresql::server::role { $user:
26-
password_hash => postgresql::postgresql_password($user, $password),
26+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
2727
}
2828
2929
postgresql::server::database { $db:
@@ -50,7 +50,7 @@ class { 'postgresql::server': }
5050
class { 'postgresql::server': }
5151
5252
postgresql::server::role { $user:
53-
password_hash => postgresql::postgresql_password($user, $password),
53+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
5454
}
5555
postgresql::server::database { $db:
5656
require => Postgresql::Server::Role[$user],
@@ -96,11 +96,11 @@ class { 'postgresql::server': }
9696
class { 'postgresql::server': }
9797
9898
postgresql::server::role { $user:
99-
password_hash => postgresql::postgresql_password($user, $password),
99+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
100100
}
101101
102102
postgresql::server::role { $target_user:
103-
password_hash => postgresql::postgresql_password($target_user, $target_password),
103+
password_hash => postgresql::postgresql_password($target_user, $target_password, undef, $postgresql::server::password_encryption),
104104
}
105105
106106
postgresql::server::database { $db:
@@ -142,11 +142,11 @@ class { 'postgresql::server': }
142142
class { 'postgresql::server': }
143143
144144
postgresql::server::role { $user:
145-
password_hash => postgresql::postgresql_password($user, $password),
145+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
146146
}
147147
148148
postgresql::server::role { $target_user:
149-
password_hash => postgresql::postgresql_password($target_user, $target_password),
149+
password_hash => postgresql::postgresql_password($target_user, $target_password, undef, $postgresql::server::password_encryption),
150150
}
151151
152152
postgresql::server::database { $db:
@@ -181,7 +181,7 @@ class { 'postgresql::server': }
181181
class { 'postgresql::server': }
182182
183183
postgresql::server::role { $user:
184-
password_hash => postgresql::postgresql_password($user, $password),
184+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
185185
}
186186
187187
postgresql::server::database { $db:
@@ -209,7 +209,7 @@ class { 'postgresql::server': }
209209
class { 'postgresql::server': }
210210
211211
postgresql::server::role { $user:
212-
password_hash => postgresql::postgresql_password($user, $password),
212+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
213213
}
214214
postgresql::server::database { $db:
215215
require => Postgresql::Server::Role[$user],
@@ -242,7 +242,7 @@ class { 'postgresql::server': }
242242
class { 'postgresql::server': }
243243
244244
postgresql::server::role { $user:
245-
password_hash => postgresql::postgresql_password($user, $password),
245+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
246246
}
247247
248248
postgresql::server::database { $db:
@@ -270,7 +270,7 @@ class { 'postgresql::server': }
270270
class { 'postgresql::server': }
271271
272272
postgresql::server::role { $user:
273-
password_hash => postgresql::postgresql_password($user, $password),
273+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
274274
}
275275
postgresql::server::database { $db:
276276
require => Postgresql::Server::Role[$user],

‎spec/acceptance/server/grant_role_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class { 'postgresql::server': }
2222
}
2323
2424
postgresql::server::role { $user:
25-
password_hash => postgresql::postgresql_password($user, $password),
25+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
2626
}
2727
2828
postgresql::server::database { $db:
@@ -68,7 +68,7 @@ class { 'postgresql::server': }
6868
}
6969
7070
postgresql::server::role { $user:
71-
password_hash => postgresql::postgresql_password($user, $password),
71+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
7272
}
7373
7474
postgresql::server::database { $db:

‎spec/acceptance/server/grant_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
class { 'postgresql::server': }
1818
1919
postgresql::server::role { $owner:
20-
password_hash => postgresql::postgresql_password($owner, $password),
20+
password_hash => postgresql::postgresql_password($owner, $password, undef, $postgresql::server::password_encryption),
2121
}
2222
2323
# Since we are not testing pg_hba or any of that, make a local user for ident auth

‎spec/acceptance/server/reassign_owned_by_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class { 'postgresql::server': }
2020
2121
postgresql::server::role { $old_owner:
22-
password_hash => postgresql::postgresql_password($old_owner, $password),
22+
password_hash => postgresql::postgresql_password($old_owner, $password, undef, $postgresql::server::password_encryption),
2323
}
2424
2525
# Since we are not testing pg_hba or any of that, make a local user for ident auth

‎spec/acceptance/server/schema_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class { 'postgresql::server': }
1717
}
1818
1919
postgresql::server::role { $user:
20-
password_hash => postgresql::postgresql_password($user, $password),
20+
password_hash => postgresql::postgresql_password($user, $password, undef, $postgresql::server::password_encryption),
2121
}
2222
2323
postgresql::server::database { $db:

‎spec/acceptance/sql_task_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
class { 'postgresql::server': } ->
1010
postgresql::server::db { 'spec1':
1111
user => 'root1',
12-
password => postgresql::postgresql_password('root1', 'password'),
12+
password => postgresql::postgresql_password('root1', 'password', undef, $postgresql::server::password_encryption),
1313
}
1414
MANIFEST
1515

0 commit comments

Comments
 (0)