From f5704bef18089ab5eef5087cc382f62494230a7a Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 28 Aug 2023 14:25:15 +0200 Subject: [PATCH] port: Enforce Stdlib::Port datatype --- REFERENCE.md | 24 ++++++++++++------------ manifests/server.pp | 2 +- manifests/server/default_privileges.pp | 2 +- manifests/server/extension.pp | 2 +- manifests/server/grant.pp | 2 +- manifests/server/grant_role.pp | 2 +- manifests/server/instance/config.pp | 2 +- manifests/server/instance/late_initdb.pp | 2 +- manifests/server/instance/passwd.pp | 2 +- manifests/server/instance/service.pp | 2 +- manifests/server/instance/systemd.pp | 2 +- manifests/server/reassign_owned_by.pp | 2 +- manifests/server/role.pp | 2 +- manifests/server/table_grant.pp | 2 +- spec/defines/server/extension_spec.rb | 4 ++-- spec/defines/server/grant_role_spec.rb | 2 +- templates/systemd-override.conf.epp | 2 +- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index a19903bff8..2ded6c667d 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -1031,7 +1031,7 @@ Default value: `$postgresql::params::listen_addresses` ##### `port` -Data type: `Variant[String[1], Stdlib::Port]` +Data type: `Stdlib::Port` Specifies the port for the PostgreSQL server to listen on. 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` ##### `port` -Data type: `Variant[String[1], Stdlib::Port]` +Data type: `Stdlib::Port` Specifies the port to access the server. Default value: The default user for the module, usually '5432'. @@ -2051,7 +2051,7 @@ Default value: `undef` ##### `port` -Data type: `Optional[Variant[String[1], Stdlib::Port]]` +Data type: `Optional[Stdlib::Port]` Port to use when connecting. @@ -2178,7 +2178,7 @@ Default value: `$postgresql::server::user` ##### `port` -Data type: `Variant[String[1], Stdlib::Port]` +Data type: `Stdlib::Port` Port to use when connecting. @@ -2280,7 +2280,7 @@ Default value: `$postgresql::server::user` ##### `port` -Data type: `Variant[String[1], Stdlib::Port]` +Data type: `Stdlib::Port` Port to use when connecting. @@ -2361,7 +2361,7 @@ Default value: `$postgresql::server::listen_addresses` ##### `port` -Data type: `Variant[String[1], Stdlib::Port]` +Data type: `Stdlib::Port` Specifies the port for the PostgreSQL server to listen on. 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` ##### `port` -Data type: `Variant[String[1], Stdlib::Port]` +Data type: `Stdlib::Port` Specifies the port for the PostgreSQL server to listen on. 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` ##### `port` -Data type: `Variant[String[1], Stdlib::Port]` +Data type: `Stdlib::Port` Specifies the port for the PostgreSQL server to listen on. 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` ##### `port` -Data type: `Variant[String[1], Stdlib::Port]` +Data type: `Stdlib::Port` Specifies the port for the PostgreSQL server to listen on. 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` ##### `port` -Data type: `Variant[String[1], Stdlib::Port]` +Data type: `Stdlib::Port` Port to use when connecting. @@ -3465,7 +3465,7 @@ Default value: `$postgresql::server::default_database` ##### `port` -Data type: `Optional[Variant[String[1], Stdlib::Port]]` +Data type: `Optional[Stdlib::Port]` Port to use when connecting. @@ -3700,7 +3700,7 @@ Default value: `undef` ##### `port` -Data type: `Optional[Variant[String[1], Stdlib::Port]]` +Data type: `Optional[Stdlib::Port]` Port to use when connecting. diff --git a/manifests/server.pp b/manifests/server.pp index 71936b790f..b221a24392 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -135,7 +135,7 @@ String[1] $default_database = $postgresql::params::default_database, Hash $default_connect_settings = $postgresql::globals::default_connect_settings, Optional[Variant[String[1], Array[String[1]]]] $listen_addresses = $postgresql::params::listen_addresses, - Variant[String[1], Stdlib::Port] $port = $postgresql::params::port, + Stdlib::Port $port = $postgresql::params::port, String[1] $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user, String[1] $ip_mask_allow_all_users = $postgresql::params::ip_mask_allow_all_users, Array[String[1]] $ipv4acls = $postgresql::params::ipv4acls, diff --git a/manifests/server/default_privileges.pp b/manifests/server/default_privileges.pp index cef1d541d9..6a9541864e 100644 --- a/manifests/server/default_privileges.pp +++ b/manifests/server/default_privileges.pp @@ -28,7 +28,7 @@ String $schema = 'public', String $psql_db = $postgresql::server::default_database, String $psql_user = $postgresql::server::user, - Variant[String[1], Stdlib::Port] $port = $postgresql::server::port, + Stdlib::Port $port = $postgresql::server::port, Hash $connect_settings = $postgresql::server::default_connect_settings, Enum['present', 'absent'] $ensure = 'present', String $group = $postgresql::server::group, diff --git a/manifests/server/extension.pp b/manifests/server/extension.pp index 9594d9c388..227e451d1a 100644 --- a/manifests/server/extension.pp +++ b/manifests/server/extension.pp @@ -29,7 +29,7 @@ Optional[String[1]] $version = undef, Enum['present', 'absent'] $ensure = 'present', Optional[String[1]] $package_name = undef, - Optional[Variant[String[1], Stdlib::Port]] $port = undef, + Optional[Stdlib::Port] $port = undef, Hash $connect_settings = postgresql::default('default_connect_settings'), String[1] $database_resource_name = $database, ) { diff --git a/manifests/server/grant.pp b/manifests/server/grant.pp index 56ee563330..ec4d5d2c98 100644 --- a/manifests/server/grant.pp +++ b/manifests/server/grant.pp @@ -41,7 +41,7 @@ Array[String[1],0] $object_arguments = [], String $psql_db = $postgresql::server::default_database, String $psql_user = $postgresql::server::user, - Variant[String[1], Stdlib::Port] $port = $postgresql::server::port, + Stdlib::Port $port = $postgresql::server::port, Boolean $onlyif_exists = false, Hash $connect_settings = $postgresql::server::default_connect_settings, Enum['present', 'absent'] $ensure = 'present', diff --git a/manifests/server/grant_role.pp b/manifests/server/grant_role.pp index 6f507a9b34..a061a8341f 100644 --- a/manifests/server/grant_role.pp +++ b/manifests/server/grant_role.pp @@ -13,7 +13,7 @@ Enum['present', 'absent'] $ensure = 'present', String[1] $psql_db = $postgresql::server::default_database, String[1] $psql_user = $postgresql::server::user, - Variant[String[1], Stdlib::Port] $port = $postgresql::server::port, + Stdlib::Port $port = $postgresql::server::port, Hash $connect_settings = $postgresql::server::default_connect_settings, ) { case $ensure { diff --git a/manifests/server/instance/config.pp b/manifests/server/instance/config.pp index f34f896aaa..3eeb855a6a 100644 --- a/manifests/server/instance/config.pp +++ b/manifests/server/instance/config.pp @@ -48,7 +48,7 @@ String[1] $ip_mask_deny_postgres_user = $postgresql::server::ip_mask_deny_postgres_user, String[1] $ip_mask_allow_all_users = $postgresql::server::ip_mask_allow_all_users, Optional[Variant[String[1], Array[String[1]]]] $listen_addresses = $postgresql::server::listen_addresses, - Variant[String[1], Stdlib::Port] $port = $postgresql::server::port, + Stdlib::Port $port = $postgresql::server::port, Array[String[1]] $ipv4acls = $postgresql::server::ipv4acls, Array[String[1]] $ipv6acls = $postgresql::server::ipv6acls, Variant[String[1], Stdlib::Absolutepath] $pg_hba_conf_path = $postgresql::server::pg_hba_conf_path, diff --git a/manifests/server/instance/late_initdb.pp b/manifests/server/instance/late_initdb.pp index dcec18b63a..ef7971cd0a 100644 --- a/manifests/server/instance/late_initdb.pp +++ b/manifests/server/instance/late_initdb.pp @@ -16,7 +16,7 @@ String[1] $user = $postgresql::server::user, String[1] $group = $postgresql::server::group, Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path, - Variant[String[1], Stdlib::Port] $port = $postgresql::server::port, + Stdlib::Port $port = $postgresql::server::port, String[1] $module_workdir = $postgresql::server::module_workdir, ) { # Set the defaults for the postgresql_psql resource diff --git a/manifests/server/instance/passwd.pp b/manifests/server/instance/passwd.pp index 526d55a9e4..4221f94f5d 100644 --- a/manifests/server/instance/passwd.pp +++ b/manifests/server/instance/passwd.pp @@ -17,7 +17,7 @@ String[1] $user = $postgresql::server::user, String[1] $group = $postgresql::server::group, Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path, - Variant[String[1], Stdlib::Port] $port = $postgresql::server::port, + Stdlib::Port $port = $postgresql::server::port, String[1] $database = $postgresql::server::default_database, String[1] $module_workdir = $postgresql::server::module_workdir, Optional[Variant[String[1], Sensitive[String[1]], Integer]] $postgres_password = $postgresql::server::postgres_password, diff --git a/manifests/server/instance/service.pp b/manifests/server/instance/service.pp index 48f5c603e7..af917308e8 100644 --- a/manifests/server/instance/service.pp +++ b/manifests/server/instance/service.pp @@ -25,7 +25,7 @@ Optional[String[1]] $service_provider = $postgresql::server::service_provider, String[1] $service_status = $postgresql::server::service_status, String[1] $user = $postgresql::server::user, - Variant[String[1], Stdlib::Port] $port = $postgresql::server::port, + Stdlib::Port $port = $postgresql::server::port, String[1] $default_database = $postgresql::server::default_database, Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path, Hash $connect_settings = $postgresql::server::default_connect_settings, diff --git a/manifests/server/instance/systemd.pp b/manifests/server/instance/systemd.pp index 9d7302882f..3a75ce2ab0 100644 --- a/manifests/server/instance/systemd.pp +++ b/manifests/server/instance/systemd.pp @@ -3,7 +3,7 @@ # @param drop_in_ensure sets the Systemd drop-in file to present or absent # @api private define postgresql::server::instance::systemd ( - Variant[String[1], Stdlib::Port] $port, + Stdlib::Port $port, Stdlib::Absolutepath $datadir, Optional[String[1]] $extra_systemd_config = undef, String[1] $service_name = $name, diff --git a/manifests/server/reassign_owned_by.pp b/manifests/server/reassign_owned_by.pp index 314381336f..b8ea96cdb8 100644 --- a/manifests/server/reassign_owned_by.pp +++ b/manifests/server/reassign_owned_by.pp @@ -13,7 +13,7 @@ String $new_role, String $db, String $psql_user = $postgresql::server::user, - Variant[String[1], Stdlib::Port] $port = $postgresql::server::port, + Stdlib::Port $port = $postgresql::server::port, Hash $connect_settings = $postgresql::server::default_connect_settings, ) { $sql_command = "REASSIGN OWNED BY \"${old_role}\" TO \"${new_role}\"" diff --git a/manifests/server/role.pp b/manifests/server/role.pp index 968e806d5b..576a71abd9 100644 --- a/manifests/server/role.pp +++ b/manifests/server/role.pp @@ -29,7 +29,7 @@ Boolean $createdb = false, Boolean $createrole = false, String[1] $db = $postgresql::server::default_database, - Optional[Variant[String[1], Stdlib::Port]] $port = undef, + Optional[Stdlib::Port] $port = undef, Boolean $login = true, Boolean $inherit = true, Boolean $superuser = false, diff --git a/manifests/server/table_grant.pp b/manifests/server/table_grant.pp index 69a1afa91d..9168dd9ce0 100644 --- a/manifests/server/table_grant.pp +++ b/manifests/server/table_grant.pp @@ -19,7 +19,7 @@ String[1] $db, String[1] $role, Optional[Enum['present', 'absent']] $ensure = undef, - Optional[Variant[String[1], Stdlib::Port]] $port = undef, + Optional[Stdlib::Port] $port = undef, Optional[String[1]] $psql_db = undef, Optional[String[1]] $psql_user = undef, Optional[Hash] $connect_settings = undef, diff --git a/spec/defines/server/extension_spec.rb b/spec/defines/server/extension_spec.rb index 251f45a990..68a161584b 100644 --- a/spec/defines/server/extension_spec.rb +++ b/spec/defines/server/extension_spec.rb @@ -198,7 +198,7 @@ extension: 'pg_repack', connect_settings: { 'PGHOST' => 'postgres-db-server', 'DBVERSION' => '9.1', - 'PGPORT' => '1234' } + 'PGPORT' => 1234 } } end @@ -222,7 +222,7 @@ extension: 'pg_repack', connect_settings: { 'PGHOST' => 'postgres-db-server', 'DBVERSION' => '9.1', - 'PGPORT' => '1234' }, + 'PGPORT' => 1234 }, port: 5678 } end diff --git a/spec/defines/server/grant_role_spec.rb b/spec/defines/server/grant_role_spec.rb index 31d45f7c8c..016255aa70 100644 --- a/spec/defines/server/grant_role_spec.rb +++ b/spec/defines/server/grant_role_spec.rb @@ -31,7 +31,7 @@ let(:params) do super().merge(psql_db: 'postgres', psql_user: 'postgres', - port: '5432') + port: 5432) end it { diff --git a/templates/systemd-override.conf.epp b/templates/systemd-override.conf.epp index 830c3007d5..48b02c72f4 100644 --- a/templates/systemd-override.conf.epp +++ b/templates/systemd-override.conf.epp @@ -1,5 +1,5 @@ <%- | - Variant[String[1], Stdlib::Port] $port, + Stdlib::Port $port, Stdlib::Absolutepath $datadir, Optional[String[1]] $extra_systemd_config, | -%>