Skip to content

Commit 934c5bb

Browse files
bastelfreakbastelfreak
authored
Merge pull request #1487 from bastelfreak/connection
Cleanup useless $connect_setting validation
2 parents 8ac380b + ece7751 commit 934c5bb

File tree

9 files changed

+23
-28
lines changed

9 files changed

+23
-28
lines changed

‎manifests/server/database.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727

2828
# If possible use the version of the remote database, otherwise
2929
# fallback to our local DB version
30-
if $connect_settings != undef and 'DBVERSION' in $connect_settings {
30+
if 'DBVERSION' in $connect_settings {
3131
$version = $connect_settings['DBVERSION']
3232
} else {
3333
$version = $postgresql::server::_version
3434
}
3535

3636
# If the connection settings do not contain a port, then use the local server port
37-
if $connect_settings != undef and 'PGPORT' in $connect_settings {
37+
if 'PGPORT' in $connect_settings {
3838
$port = undef
3939
} else {
4040
$port = $postgresql::server::port

‎manifests/server/default_privileges.pp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
) {
3838
# If possible use the version of the remote database, otherwise
3939
# fallback to our local DB version
40-
if $connect_settings != undef and 'DBVERSION' in $connect_settings {
40+
if 'DBVERSION' in $connect_settings {
4141
$version = $connect_settings['DBVERSION']
4242
} else {
4343
$version = $postgresql::server::_version
@@ -62,15 +62,15 @@
6262
#
6363
# Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
6464
#
65-
if $port != undef {
65+
if $port {
6666
$port_override = $port
67-
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
67+
} elsif 'PGPORT' in $connect_settings {
6868
$port_override = undef
6969
} else {
7070
$port_override = $postgresql::server::port
7171
}
7272

73-
if $target_role != undef {
73+
if $target_role {
7474
$_target_role = " FOR ROLE ${target_role}"
7575
$_check_target_role = "/${target_role}"
7676
} else {
@@ -178,11 +178,11 @@
178178
environment => 'PGOPTIONS=--client-min-messages=error',
179179
}
180180

181-
if($role != undef and defined(Postgresql::Server::Role[$role])) {
181+
if defined(Postgresql::Server::Role[$role]) {
182182
Postgresql::Server::Role[$role] -> Postgresql_psql["default_privileges:${name}"]
183183
}
184184

185-
if($db != undef and defined(Postgresql::Server::Database[$db])) {
185+
if defined(Postgresql::Server::Database[$db]) {
186186
Postgresql::Server::Database[$db] -> Postgresql_psql["default_privileges:${name}"]
187187
}
188188
}

‎manifests/server/extension.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
#
7878
# Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
7979
#
80-
if $port != undef {
80+
if $port {
8181
$port_override = $port
82-
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
82+
} elsif 'PGPORT' in $connect_settings {
8383
$port_override = undef
8484
} else {
8585
$port_override = $postgresql::server::port

‎manifests/server/grant.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
#
7878
# Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
7979
#
80-
if $port != undef {
80+
if $port {
8181
$port_override = $port
8282
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
8383
$port_override = undef
@@ -483,11 +483,11 @@
483483
onlyif => $_onlyif,
484484
}
485485

486-
if($role != undef and defined(Postgresql::Server::Role[$role])) {
486+
if defined(Postgresql::Server::Role[$role]) {
487487
Postgresql::Server::Role[$role] -> Postgresql_psql["grant:${name}"]
488488
}
489489

490-
if($db != undef and defined(Postgresql::Server::Database[$db])) {
490+
if defined(Postgresql::Server::Database[$db]) {
491491
Postgresql::Server::Database[$db] -> Postgresql_psql["grant:${name}"]
492492
}
493493
}

‎manifests/server/grant_role.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
connect_settings => $connect_settings,
4040
}
4141

42-
if ! $connect_settings or empty($connect_settings) {
42+
if empty($connect_settings) {
4343
Class['postgresql::server'] -> Postgresql_psql["grant_role:${name}"]
4444
}
4545
if defined(Postgresql::Server::Role[$role]) {

‎manifests/server/reassign_owned_by.pp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,10 @@
2121
$group = $postgresql::server::group
2222
$psql_path = $postgresql::server::psql_path
2323

24-
#
25-
# Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
26-
#
27-
if $port {
28-
$port_override = $port
29-
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
24+
if 'PGPORT' in $connect_settings {
3025
$port_override = undef
3126
} else {
32-
$port_override = $postgresql::server::port
27+
$port_override = $port
3328
}
3429

3530
$onlyif = "SELECT tablename FROM pg_catalog.pg_tables WHERE
@@ -54,14 +49,14 @@
5449
onlyif => $onlyif,
5550
}
5651

57-
if($old_role != undef and defined(Postgresql::Server::Role[$old_role])) {
52+
if defined(Postgresql::Server::Role[$old_role]) {
5853
Postgresql::Server::Role[$old_role] -> Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
5954
}
6055
if($new_role != undef and defined(Postgresql::Server::Role[$new_role])) {
6156
Postgresql::Server::Role[$new_role] -> Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
6257
}
6358

64-
if($db != undef and defined(Postgresql::Server::Database[$db])) {
59+
if defined(Postgresql::Server::Database[$db]) {
6560
Postgresql::Server::Database[$db] -> Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
6661
}
6762
}

‎manifests/server/role.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@
5353
#
5454
# Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
5555
#
56-
if $port != undef {
56+
if $port {
5757
$port_override = $port
58-
} elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
58+
} elsif 'PGPORT' in $connect_settings {
5959
$port_override = undef
6060
} else {
6161
$port_override = $postgresql::server::port
6262
}
6363

6464
# If possible use the version of the remote database, otherwise
6565
# fallback to our local DB version
66-
if $connect_settings != undef and 'DBVERSION' in $connect_settings {
66+
if 'DBVERSION' in $connect_settings {
6767
$version = $connect_settings['DBVERSION']
6868
} else {
6969
$version = $postgresql::server::_version

‎manifests/server/schema.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Postgresql::Server::Db <| dbname == $db |> -> Postgresql::Server::Schema[$name]
2828

2929
# If the connection settings do not contain a port, then use the local server port
30-
if $connect_settings != undef and 'PGPORT' in $connect_settings {
30+
if 'PGPORT' in $connect_settings {
3131
$port = undef
3232
} else {
3333
$port = $postgresql::server::port

‎manifests/server/tablespace.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
$module_workdir = $postgresql::server::module_workdir
1919

2020
# If the connection settings do not contain a port, then use the local server port
21-
if $connect_settings != undef and 'PGPORT' in $connect_settings {
21+
if 'PGPORT' in $connect_settings {
2222
$port = undef
2323
} else {
2424
$port = $postgresql::server::port

0 commit comments

Comments
 (0)