Skip to content

Commit d69c0b2

Browse files
bastelfreakbastelfreak
committed
port: Enforce Stdlib::Port datatype
1 parent 9ad64cd commit d69c0b2

File tree

15 files changed

+28
-68
lines changed

15 files changed

+28
-68
lines changed

‎REFERENCE.md‎

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

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

1034-
Data type: `Variant[String[1], Stdlib::Port]`
1034+
Data type: `Stdlib::Port`
10351035

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

19471947
##### <a name="-postgresql--server--default_privileges--port"></a>`port`
19481948

1949-
Data type: `Variant[String[1], Stdlib::Port]`
1949+
Data type: `Stdlib::Port`
19501950

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

@@ -2051,7 +2051,7 @@ Default value: `undef`
20512051

20522052
##### <a name="-postgresql--server--extension--port"></a>`port`
20532053

2054-
Data type: `Optional[Variant[String[1], Stdlib::Port]]`
2054+
Data type: `Optional[Stdlib::Port]`
20552055

20562056
Port to use when connecting.
20572057

@@ -2178,7 +2178,7 @@ Default value: `$postgresql::server::user`
21782178

21792179
##### <a name="-postgresql--server--grant--port"></a>`port`
21802180

2181-
Data type: `Variant[String[1], Stdlib::Port]`
2181+
Data type: `Stdlib::Port`
21822182

21832183
Port to use when connecting.
21842184

@@ -2280,7 +2280,7 @@ Default value: `$postgresql::server::user`
22802280

22812281
##### <a name="-postgresql--server--grant_role--port"></a>`port`
22822282

2283-
Data type: `Variant[String[1], Stdlib::Port]`
2283+
Data type: `Stdlib::Port`
22842284

22852285
Port to use when connecting.
22862286

@@ -2361,7 +2361,7 @@ Default value: `$postgresql::server::listen_addresses`
23612361

23622362
##### <a name="-postgresql--server--instance--config--port"></a>`port`
23632363

2364-
Data type: `Variant[String[1], Stdlib::Port]`
2364+
Data type: `Stdlib::Port`
23652365

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

27862786
##### <a name="-postgresql--server--instance--late_initdb--port"></a>`port`
27872787

2788-
Data type: `Variant[String[1], Stdlib::Port]`
2788+
Data type: `Stdlib::Port`
27892789

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

28452845
##### <a name="-postgresql--server--instance--passwd--port"></a>`port`
28462846

2847-
Data type: `Variant[String[1], Stdlib::Port]`
2847+
Data type: `Stdlib::Port`
28482848

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

29832983
##### <a name="-postgresql--server--instance--service--port"></a>`port`
29842984

2985-
Data type: `Variant[String[1], Stdlib::Port]`
2985+
Data type: `Stdlib::Port`
29862986

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

32203220
##### <a name="-postgresql--server--reassign_owned_by--port"></a>`port`
32213221

3222-
Data type: `Variant[String[1], Stdlib::Port]`
3222+
Data type: `Stdlib::Port`
32233223

32243224
Port to use when connecting.
32253225

@@ -3465,7 +3465,7 @@ Default value: `$postgresql::server::default_database`
34653465

34663466
##### <a name="-postgresql--server--role--port"></a>`port`
34673467

3468-
Data type: `Optional[Variant[String[1], Stdlib::Port]]`
3468+
Data type: `Optional[Stdlib::Port]`
34693469

34703470
Port to use when connecting.
34713471

@@ -3700,7 +3700,7 @@ Default value: `undef`
37003700

37013701
##### <a name="-postgresql--server--table_grant--port"></a>`port`
37023702

3703-
Data type: `Optional[Variant[String[1], Stdlib::Port]]`
3703+
Data type: `Optional[Stdlib::Port]`
37043704

37053705
Port to use when connecting.
37063706

‎manifests/server.pp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
String[1] $default_database = $postgresql::params::default_database,
136136
Hash $default_connect_settings = $postgresql::globals::default_connect_settings,
137137
Optional[Variant[String[1], Array[String[1]]]] $listen_addresses = $postgresql::params::listen_addresses,
138-
Variant[String[1], Stdlib::Port] $port = $postgresql::params::port,
138+
Stdlib::Port $port = $postgresql::params::port,
139139
String[1] $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
140140
String[1] $ip_mask_allow_all_users = $postgresql::params::ip_mask_allow_all_users,
141141
Array[String[1]] $ipv4acls = $postgresql::params::ipv4acls,
@@ -196,9 +196,6 @@
196196
#Deprecated
197197
Optional[String[1]] $version = undef,
198198
) inherits postgresql::params {
199-
if $port =~ String {
200-
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
201-
}
202199
if $version != undef {
203200
warning('Passing "version" to postgresql::server is deprecated; please use postgresql::globals instead.')
204201
$_version = $version

‎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)