Skip to content

Commit 86efa5c

Browse files
SimonHoenscheidSimonHoenscheid
committed
implement feedback
1 parent d5192aa commit 86efa5c

File tree

6 files changed

+12
-37
lines changed

6 files changed

+12
-37
lines changed

‎manifests/server/database.pp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Optional[String[1]] $locale = $postgresql::server::locale,
2121
Boolean $istemplate = false,
2222
Hash $connect_settings = $postgresql::server::default_connect_settings,
23-
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::params::port,
23+
Optional[Variant[String[1], Stdlib::Port, Integer]] $port = undef,
2424
) {
2525
$createdb_path = $postgresql::server::createdb_path
2626
$user = $postgresql::server::user
@@ -36,11 +36,7 @@
3636
$version = $postgresql::server::_version
3737
}
3838

39-
if $connect_settings != undef and 'PGPORT' in $connect_settings {
40-
$port_override = $port
41-
} else {
42-
$port_override = $port
43-
}
39+
$port_override = pick($port, $postgresql::server::port)
4440

4541
# Set the defaults for the postgresql_psql resource
4642
Postgresql_psql {

‎manifests/server/default_privileges.pp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
String $schema = 'public',
2929
String $psql_db = $postgresql::server::default_database,
3030
String $psql_user = $postgresql::server::user,
31-
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
31+
Optional[Variant[String[1], Stdlib::Port, Integer]] $port = undef,
3232
Hash $connect_settings = $postgresql::server::default_connect_settings,
3333
Enum['present', 'absent'] $ensure = 'present',
3434
String $group = $postgresql::server::group,
@@ -59,11 +59,7 @@
5959
}
6060
}
6161

62-
if $connect_settings != undef and 'PGPORT' in $connect_settings {
63-
$port_override = $port
64-
} else {
65-
$port_override = $port
66-
}
62+
$port_override = pick($port, $postgresql::server::port)
6763

6864
if $target_role != undef {
6965
$_target_role = " FOR ROLE ${target_role}"

‎manifests/server/extension.pp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
Optional[String[1]] $version = undef,
3030
Enum['present', 'absent'] $ensure = 'present',
3131
Optional[String[1]] $package_name = undef,
32-
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
32+
Optional[Variant[String[1], Stdlib::Port, Integer]] $port = undef,
3333
Hash $connect_settings = postgresql::default('default_connect_settings'),
3434
String[1] $database_resource_name = $database,
3535
) {
@@ -73,12 +73,7 @@
7373
fail("Unknown value for ensure '${ensure}'.")
7474
}
7575
}
76-
77-
if $connect_settings != undef and 'PGPORT' in $connect_settings {
78-
$port_override = $port
79-
} else {
80-
$port_override = $port
81-
}
76+
$port_override = pick($port, $postgresql::server::port)
8277

8378
postgresql_psql { "${database}: ${command}":
8479
psql_user => $user,

‎manifests/server/grant.pp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Array[String[1],0] $object_arguments = [],
4242
String $psql_db = $postgresql::server::default_database,
4343
String $psql_user = $postgresql::server::user,
44-
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
44+
Optional[Variant[String[1], Stdlib::Port, Integer]] $port = undef,
4545
Boolean $onlyif_exists = false,
4646
Hash $connect_settings = $postgresql::server::default_connect_settings,
4747
Enum['present', 'absent'] $ensure = 'present',
@@ -74,11 +74,7 @@
7474
$_object_name = $object_name
7575
}
7676

77-
if $connect_settings != undef and 'PGPORT' in $connect_settings {
78-
$port_override = $port
79-
} else {
80-
$port_override = $port
81-
}
77+
$port_override = pick($port, $postgresql::server::port)
8278

8379
## Munge the input values
8480
$_object_type = upcase($object_type)

‎manifests/server/reassign_owned_by.pp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,15 @@
1313
String $new_role,
1414
String $db,
1515
String $psql_user = $postgresql::server::user,
16-
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
16+
Optional[Variant[String[1], Stdlib::Port, Integer]] $port = undef,
1717
Hash $connect_settings = $postgresql::server::default_connect_settings,
1818
) {
1919
$sql_command = "REASSIGN OWNED BY \"${old_role}\" TO \"${new_role}\""
2020

2121
$group = $postgresql::server::group
2222
$psql_path = $postgresql::server::psql_path
2323

24-
if $connect_settings != undef and 'PGPORT' in $connect_settings {
25-
$port_override = $port
26-
} else {
27-
$port_override = $port
28-
}
24+
$port_override = pick($port, $postgresql::server::port)
2925

3026
$onlyif = "SELECT tablename FROM pg_catalog.pg_tables WHERE
3127
schemaname NOT IN ('pg_catalog', 'information_schema') AND

‎manifests/server/role.pp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
Boolean $createdb = false,
3030
Boolean $createrole = false,
3131
String[1] $db = $postgresql::server::default_database,
32-
Variant[String[1], Stdlib::Port, Integer] $port = $postgresql::server::port,
32+
Optional[Variant[String[1], Stdlib::Port, Integer]] $port = undef,
3333
Boolean $login = true,
3434
Boolean $inherit = true,
3535
Boolean $superuser = false,
@@ -51,11 +51,7 @@
5151
$password_hash
5252
}
5353

54-
if $connect_settings != undef and 'PGPORT' in $connect_settings {
55-
$port_override = $port
56-
} else {
57-
$port_override = $port
58-
}
54+
$port_override = pick($port, $postgresql::server::port)
5955

6056
# If possible use the version of the remote database, otherwise
6157
# fallback to our local DB version

0 commit comments

Comments
 (0)