Skip to content

Commit c572647

Browse files
bastelfreakbastelfreak
committed
port: Enforce Stdlib::Port datatype
1 parent c75719d commit c572647

15 files changed

+27
-68
lines changed

‎REFERENCE.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ Default value: `$postgresql::params::listen_addresses`
10301030

10311031
##### <a name="-postgresql--server--port"></a>`port`
10321032

1033-
Data type: `Variant[String[1], Stdlib::Port]`
1033+
Data type: `Stdlib::Port`
10341034

10351035
Specifies the port for the PostgreSQL server to listen on.
10361036
Note: The same port number is used for all IP addresses the server listens on.
@@ -1937,7 +1937,7 @@ Default value: `$postgresql::server::psql_path`
19371937

19381938
##### <a name="-postgresql--server--default_privileges--port"></a>`port`
19391939

1940-
Data type: `Variant[String[1], Stdlib::Port]`
1940+
Data type: `Stdlib::Port`
19411941

19421942
Specifies the port to access the server. Default value: The default user for the module, usually '5432'.
19431943

@@ -2042,7 +2042,7 @@ Default value: `undef`
20422042

20432043
##### <a name="-postgresql--server--extension--port"></a>`port`
20442044

2045-
Data type: `Optional[Variant[String[1], Stdlib::Port]]`
2045+
Data type: `Optional[Stdlib::Port]`
20462046

20472047
Port to use when connecting.
20482048

@@ -2169,7 +2169,7 @@ Default value: `$postgresql::server::user`
21692169

21702170
##### <a name="-postgresql--server--grant--port"></a>`port`
21712171

2172-
Data type: `Variant[String[1], Stdlib::Port]`
2172+
Data type: `Stdlib::Port`
21732173

21742174
Port to use when connecting.
21752175

@@ -2271,7 +2271,7 @@ Default value: `$postgresql::server::user`
22712271

22722272
##### <a name="-postgresql--server--grant_role--port"></a>`port`
22732273

2274-
Data type: `Variant[String[1], Stdlib::Port]`
2274+
Data type: `Stdlib::Port`
22752275

22762276
Port to use when connecting.
22772277

@@ -2352,7 +2352,7 @@ Default value: `$postgresql::server::listen_addresses`
23522352

23532353
##### <a name="-postgresql--server--instance--config--port"></a>`port`
23542354

2355-
Data type: `Variant[String[1], Stdlib::Port]`
2355+
Data type: `Stdlib::Port`
23562356

23572357
Specifies the port for the PostgreSQL server to listen on.
23582358
Note: The same port number is used for all IP addresses the server listens on. Also, for Red Hat systems and early Debian systems,
@@ -2776,7 +2776,7 @@ Default value: `$postgresql::server::psql_path`
27762776

27772777
##### <a name="-postgresql--server--instance--late_initdb--port"></a>`port`
27782778

2779-
Data type: `Variant[String[1], Stdlib::Port]`
2779+
Data type: `Stdlib::Port`
27802780

27812781
Specifies the port for the PostgreSQL server to listen on.
27822782
Note: The same port number is used for all IP addresses the server listens on. Also, for Red Hat systems and early Debian systems,
@@ -2835,7 +2835,7 @@ Default value: `$postgresql::server::psql_path`
28352835

28362836
##### <a name="-postgresql--server--instance--passwd--port"></a>`port`
28372837

2838-
Data type: `Variant[String[1], Stdlib::Port]`
2838+
Data type: `Stdlib::Port`
28392839

28402840
Specifies the port for the PostgreSQL server to listen on.
28412841
Note: The same port number is used for all IP addresses the server listens on. Also, for Red Hat systems and early Debian systems,
@@ -2973,7 +2973,7 @@ Default value: `$postgresql::server::user`
29732973

29742974
##### <a name="-postgresql--server--instance--service--port"></a>`port`
29752975

2976-
Data type: `Variant[String[1], Stdlib::Port]`
2976+
Data type: `Stdlib::Port`
29772977

29782978
Specifies the port for the PostgreSQL server to listen on.
29792979
Note: The same port number is used for all IP addresses the server listens on. Also, for Red Hat systems and early Debian systems,
@@ -3210,7 +3210,7 @@ Default value: `$postgresql::server::user`
32103210

32113211
##### <a name="-postgresql--server--reassign_owned_by--port"></a>`port`
32123212

3213-
Data type: `Variant[String[1], Stdlib::Port]`
3213+
Data type: `Stdlib::Port`
32143214

32153215
Port to use when connecting.
32163216

@@ -3456,7 +3456,7 @@ Default value: `$postgresql::server::default_database`
34563456

34573457
##### <a name="-postgresql--server--role--port"></a>`port`
34583458

3459-
Data type: `Optional[Variant[String[1], Stdlib::Port]]`
3459+
Data type: `Optional[Stdlib::Port]`
34603460

34613461
Port to use when connecting.
34623462

@@ -3691,7 +3691,7 @@ Default value: `undef`
36913691

36923692
##### <a name="-postgresql--server--table_grant--port"></a>`port`
36933693

3694-
Data type: `Optional[Variant[String[1], Stdlib::Port]]`
3694+
Data type: `Optional[Stdlib::Port]`
36953695

36963696
Port to use when connecting.
36973697

‎manifests/server.pp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
String[1] $default_database = $postgresql::params::default_database,
134134
Hash $default_connect_settings = $postgresql::globals::default_connect_settings,
135135
Optional[Variant[String[1], Array[String[1]]]] $listen_addresses = $postgresql::params::listen_addresses,
136-
Variant[String[1], Stdlib::Port] $port = $postgresql::params::port,
136+
Stdlib::Port $port = $postgresql::params::port,
137137
String[1] $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
138138
String[1] $ip_mask_allow_all_users = $postgresql::params::ip_mask_allow_all_users,
139139
Array[String[1]] $ipv4acls = $postgresql::params::ipv4acls,
@@ -191,11 +191,7 @@
191191
Hash $backup_options = {},
192192
Enum['pg_dump'] $backup_provider = $postgresql::params::backup_provider,
193193
) inherits postgresql::params {
194-
if $port =~ String {
195-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
196-
}
197194
$_version = $postgresql::params::version
198-
199195
if $createdb_path != undef {
200196
warning('Passing "createdb_path" to postgresql::server is deprecated, it can be removed safely for the same behaviour')
201197
}

‎manifests/server/default_privileges.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,13 @@
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] $port = $postgresql::server::port,
31+
Stdlib::Port $port = $postgresql::server::port,
3232
Hash $connect_settings = $postgresql::server::default_connect_settings,
3333
Enum['present', 'absent'] $ensure = 'present',
3434
String $group = $postgresql::server::group,
3535
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
3636
Optional[String] $target_role = undef,
3737
) {
38-
if $port =~ String {
39-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
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 'DBVERSION' in $connect_settings {

‎manifests/server/extension.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,10 @@
2929
Optional[String[1]] $version = undef,
3030
Enum['present', 'absent'] $ensure = 'present',
3131
Optional[String[1]] $package_name = undef,
32-
Optional[Variant[String[1], Stdlib::Port]] $port = undef,
32+
Optional[Stdlib::Port] $port = undef,
3333
Hash $connect_settings = postgresql::default('default_connect_settings'),
3434
String[1] $database_resource_name = $database,
3535
) {
36-
if $port =~ String {
37-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
38-
}
3936
$user = postgresql::default('user')
4037
$group = postgresql::default('group')
4138
$psql_path = postgresql::default('psql_path')

‎manifests/server/grant.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,13 @@
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] $port = $postgresql::server::port,
44+
Stdlib::Port $port = $postgresql::server::port,
4545
Boolean $onlyif_exists = false,
4646
Hash $connect_settings = $postgresql::server::default_connect_settings,
4747
Enum['present', 'absent'] $ensure = 'present',
4848
String $group = $postgresql::server::group,
4949
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
5050
) {
51-
if $port =~ String {
52-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
53-
}
5451
case $ensure {
5552
default: {
5653
# default is 'present'

‎manifests/server/grant_role.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@
1313
Enum['present', 'absent'] $ensure = 'present',
1414
String[1] $psql_db = $postgresql::server::default_database,
1515
String[1] $psql_user = $postgresql::server::user,
16-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
16+
Stdlib::Port $port = $postgresql::server::port,
1717
Hash $connect_settings = $postgresql::server::default_connect_settings,
1818
) {
19-
if $port =~ String {
20-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
21-
}
2219
case $ensure {
2320
'present': {
2421
$command = "GRANT \"${group}\" TO \"${role}\""

‎manifests/server/instance/config.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
String[1] $ip_mask_deny_postgres_user = $postgresql::server::ip_mask_deny_postgres_user,
4949
String[1] $ip_mask_allow_all_users = $postgresql::server::ip_mask_allow_all_users,
5050
Optional[Variant[String[1], Array[String[1]]]] $listen_addresses = $postgresql::server::listen_addresses,
51-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
51+
Stdlib::Port $port = $postgresql::server::port,
5252
Array[String[1]] $ipv4acls = $postgresql::server::ipv4acls,
5353
Array[String[1]] $ipv6acls = $postgresql::server::ipv6acls,
5454
Variant[String[1], Stdlib::Absolutepath] $pg_hba_conf_path = $postgresql::server::pg_hba_conf_path,
@@ -73,9 +73,6 @@
7373
Optional[Postgresql::Pg_password_encryption] $password_encryption = $postgresql::server::password_encryption,
7474
Optional[String] $extra_systemd_config = $postgresql::server::extra_systemd_config,
7575
) {
76-
if $port =~ String {
77-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
78-
}
7976
if ($manage_pg_hba_conf == true) {
8077
# Prepare the main pg_hba file
8178
concat { $pg_hba_conf_path:

‎manifests/server/instance/late_initdb.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
String[1] $user = $postgresql::server::user,
1717
String[1] $group = $postgresql::server::group,
1818
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
19-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
19+
Stdlib::Port $port = $postgresql::server::port,
2020
String[1] $module_workdir = $postgresql::server::module_workdir,
2121
) {
22-
if $port =~ String {
23-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
24-
}
2522
# Set the defaults for the postgresql_psql resource
2623
Postgresql_psql {
2724
psql_user => $user,

‎manifests/server/instance/passwd.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@
1717
String[1] $user = $postgresql::server::user,
1818
String[1] $group = $postgresql::server::group,
1919
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
20-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
20+
Stdlib::Port $port = $postgresql::server::port,
2121
String[1] $database = $postgresql::server::default_database,
2222
String[1] $module_workdir = $postgresql::server::module_workdir,
2323
Optional[Variant[String[1], Sensitive[String[1]], Integer]] $postgres_password = $postgresql::server::postgres_password,
2424
) {
25-
if $port =~ String {
26-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
27-
}
2825
$real_postgres_password = if $postgres_password =~ Sensitive {
2926
$postgres_password.unwrap
3027
} else {

‎manifests/server/instance/service.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,11 @@
2525
Optional[String[1]] $service_provider = $postgresql::server::service_provider,
2626
String[1] $service_status = $postgresql::server::service_status,
2727
String[1] $user = $postgresql::server::user,
28-
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
28+
Stdlib::Port $port = $postgresql::server::port,
2929
String[1] $default_database = $postgresql::server::default_database,
3030
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
3131
Hash $connect_settings = $postgresql::server::default_connect_settings,
3232
) {
33-
if $port =~ String {
34-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
35-
}
3633
anchor { "postgresql::server::service::begin::${name}": }
3734

3835
if $service_manage {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy