Skip to content

Commit 192beac

Browse files
LukasAudLukasAud
committed
Adjusting datatypes
1 parent 5ae2e79 commit 192beac

30 files changed

+157
-157
lines changed

‎manifests/backup/pg_dump.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
#
4343
class postgresql::backup::pg_dump (
4444
String[1] $dir,
45+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $ensure = 'present',
4546
Boolean $compress = true,
4647
Array $databases = [],
4748
Boolean $delete_before_dump = false,
4849
String[1] $dir_group = '0',
4950
String[1] $dir_mode = '0700',
5051
String[1] $dir_owner = 'root',
51-
Enum['present','absent'] $ensure = 'present',
5252
Enum['plain','custom','directory','tar'] $format = 'plain',
5353
Boolean $install_cron = true,
5454
Boolean $manage_user = false,

‎manifests/client.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
# @param package_ensure
1313
# Ensure the client package is installed
1414
class postgresql::client (
15-
Enum['file', 'absent'] $file_ensure = 'file',
16-
Stdlib::Absolutepath $validcon_script_path = $postgresql::params::validcon_script_path,
17-
String[1] $package_name = $postgresql::params::client_package_name,
18-
Enum['present', 'absent', 'latest'] $package_ensure = 'present'
15+
Enum['file', 'absent'] $file_ensure = 'file',
16+
Stdlib::Absolutepath $validcon_script_path = $postgresql::params::validcon_script_path,
17+
String[1] $package_name = $postgresql::params::client_package_name,
18+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
1919
) inherits postgresql::params {
2020
if $package_name != 'UNSET' {
2121
package { 'postgresql-client':

‎manifests/dnfmodule.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# @api private
88
class postgresql::dnfmodule (
9-
String[1] $ensure = 'installed',
9+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $ensure = 'installed',
1010
String[1] $module = 'postgresql',
1111
) {
1212
package { 'postgresql dnf module':

‎manifests/globals.pp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@
115115

116116
Optional[String[1]] $validcon_script_path = undef,
117117

118-
Optional[String[1]] $initdb_path = undef,
119-
Optional[String[1]] $createdb_path = undef,
120-
Optional[String[1]] $psql_path = undef,
121-
Optional[String[1]] $pg_hba_conf_path = undef,
122-
Optional[String[1]] $pg_ident_conf_path = undef,
123-
Optional[String[1]] $postgresql_conf_path = undef,
124-
Optional[Stdlib::Filemode] $postgresql_conf_mode = undef,
125-
Optional[String[1]] $recovery_conf_path = undef,
126-
Hash $default_connect_settings = {},
118+
Optional[Variant[String[1], Stdlib::Absolutepath]] $initdb_path = undef,
119+
Optional[Variant[String[1], Stdlib::Absolutepath]] $createdb_path = undef,
120+
Optional[Variant[String[1], Stdlib::Absolutepath]] $psql_path = undef,
121+
Optional[Variant[String[1], Stdlib::Absolutepath]] $pg_hba_conf_path = undef,
122+
Optional[Variant[String[1], Stdlib::Absolutepath]] $pg_ident_conf_path = undef,
123+
Optional[Variant[String[1], Stdlib::Absolutepath]] $postgresql_conf_path = undef,
124+
Optional[Stdlib::Filemode] $postgresql_conf_mode = undef,
125+
Optional[Variant[String[1], Stdlib::Absolutepath]] $recovery_conf_path = undef,
126+
Hash $default_connect_settings = {},
127127

128128
Optional[Boolean] $pg_hba_conf_defaults = undef,
129129

‎manifests/lib/devel.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#
1010
#
1111
class postgresql::lib::devel (
12-
String $package_name = $postgresql::params::devel_package_name,
13-
Enum['present', 'absent', 'latest'] $package_ensure = 'present',
14-
Boolean $link_pg_config = $postgresql::params::link_pg_config
12+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
13+
String $package_name = $postgresql::params::devel_package_name,
14+
Boolean $link_pg_config = $postgresql::params::link_pg_config
1515
) inherits postgresql::params {
1616
if $facts['os']['family'] == 'Gentoo' {
1717
fail('osfamily Gentoo does not have a separate "devel" package, postgresql::lib::devel is not supported')

‎manifests/lib/docs.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#
1111
#
1212
class postgresql::lib::docs (
13-
String $package_name = $postgresql::params::docs_package_name,
14-
Enum['present', 'absent', 'latest'] $package_ensure = 'present',
13+
String $package_name = $postgresql::params::docs_package_name,
14+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present',
1515
) inherits postgresql::params {
1616
package { 'postgresql-docs':
1717
ensure => $package_ensure,

‎manifests/lib/java.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
# Specifies whether the package is present.
1010
#
1111
class postgresql::lib::java (
12-
String $package_name = $postgresql::params::java_package_name,
13-
Enum['present', 'absent', 'latest'] $package_ensure = 'present'
12+
String $package_name = $postgresql::params::java_package_name,
13+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
1414
) inherits postgresql::params {
1515
package { 'postgresql-jdbc':
1616
ensure => $package_ensure,

‎manifests/lib/perl.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# Ensure the perl libs for postgresql are installed.
77
#
88
class postgresql::lib::perl (
9-
String $package_name = $postgresql::params::perl_package_name,
10-
Enum['present', 'absent', 'latest'] $package_ensure = 'present'
9+
String $package_name = $postgresql::params::perl_package_name,
10+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
1111
) inherits postgresql::params {
1212
package { 'perl-DBD-Pg':
1313
ensure => $package_ensure,

‎manifests/lib/python.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# Ensure the python libs for postgresql are installed.
77
#
88
class postgresql::lib::python (
9-
String[1] $package_name = $postgresql::params::python_package_name,
10-
Enum['present', 'absent', 'latest'] $package_ensure = 'present'
9+
String[1] $package_name = $postgresql::params::python_package_name,
10+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
1111
) inherits postgresql::params {
1212
package { 'python-psycopg2':
1313
ensure => $package_ensure,

‎manifests/server.pp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
class postgresql::server (
9292
Optional[Variant[String[1], Sensitive[String[1]], Integer]] $postgres_password = undef,
9393

94+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = $postgresql::params::package_ensure,
9495
String[1] $package_name = $postgresql::params::server_package_name,
95-
Enum['present', 'absent', 'latest'] $package_ensure = $postgresql::params::package_ensure,
9696

9797
Optional[String[1]] $plperl_package_name = $postgresql::params::plperl_package_name,
9898
Optional[String[1]] $plpython_package_name = $postgresql::params::plpython_package_name,
@@ -108,20 +108,20 @@
108108
String[1] $default_database = $postgresql::params::default_database,
109109
Hash $default_connect_settings = $postgresql::globals::default_connect_settings,
110110
Optional[String[1]] $listen_addresses = $postgresql::params::listen_addresses,
111-
Variant[String[1], Integer] $port = $postgresql::params::port,
111+
Variant[String[1], Stdlib::Port] $port = $postgresql::params::port,
112112
String[1] $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
113113
String[1] $ip_mask_allow_all_users = $postgresql::params::ip_mask_allow_all_users,
114114
Array[String[1]] $ipv4acls = $postgresql::params::ipv4acls,
115115
Array[String[1]] $ipv6acls = $postgresql::params::ipv6acls,
116116

117-
String[1] $initdb_path = $postgresql::params::initdb_path,
118-
Optional[String[1]] $createdb_path = $postgresql::params::createdb_path,
119-
String[1] $psql_path = $postgresql::params::psql_path,
120-
String[1] $pg_hba_conf_path = $postgresql::params::pg_hba_conf_path,
121-
String[1] $pg_ident_conf_path = $postgresql::params::pg_ident_conf_path,
122-
String[1] $postgresql_conf_path = $postgresql::params::postgresql_conf_path,
123-
Optional[Stdlib::Filemode] $postgresql_conf_mode = $postgresql::params::postgresql_conf_mode,
124-
String[1] $recovery_conf_path = $postgresql::params::recovery_conf_path,
117+
Variant[String[1], Stdlib::Absolutepath] $initdb_path = $postgresql::params::initdb_path,
118+
Optional[Variant[String[1], Stdlib::Absolutepath]] $createdb_path = $postgresql::params::createdb_path,
119+
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::params::psql_path,
120+
Variant[String[1], Stdlib::Absolutepath] $pg_hba_conf_path = $postgresql::params::pg_hba_conf_path,
121+
Variant[String[1], Stdlib::Absolutepath] $pg_ident_conf_path = $postgresql::params::pg_ident_conf_path,
122+
Variant[String[1], Stdlib::Absolutepath] $postgresql_conf_path = $postgresql::params::postgresql_conf_path,
123+
Optional[Stdlib::Filemode] $postgresql_conf_mode = $postgresql::params::postgresql_conf_mode,
124+
Variant[String[1], Stdlib::Absolutepath] $recovery_conf_path = $postgresql::params::recovery_conf_path,
125125

126126
String[1] $datadir = $postgresql::params::datadir,
127127
Optional[String[1]] $xlogdir = $postgresql::params::xlogdir,

‎manifests/server/config_entry.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# @param path Path for postgresql.conf
66
#
77
define postgresql::server::config_entry (
8-
Enum['present', 'absent', 'latest'] $ensure = 'present',
8+
Enum['present', 'absent'] $ensure = 'present',
99
Optional[Variant[String[1], Integer]] $value = undef,
10-
Boolean $path = false
10+
Variant[Boolean, String[1]] $path = false
1111
) {
1212
$postgresql_conf_path = $postgresql::server::postgresql_conf_path
1313

‎manifests/server/contrib.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Ensure the contrib package is installed.
77
class postgresql::server::contrib (
88
Optional[String[1]] $package_name = $postgresql::params::contrib_package_name,
9-
Enum['present', 'absent', 'latest'] $package_ensure = 'present'
9+
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]] $package_ensure = 'present'
1010
) inherits postgresql::params {
1111
if $package_name {
1212
package { 'postgresql-contrib':

‎manifests/server/database_grant.pp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
# @param psql_user Specifies the OS user for running psql. Default value: The default user for the module, usually 'postgres'.
99
# @param connect_settings Specifies a hash of environment variables used when connecting to a remote server.
1010
define postgresql::server::database_grant (
11-
Enum['ALL', 'CREATE', 'CONNECT', 'TEMPORARY', 'TEMP'] $privilege,
12-
String[1] $db,
13-
String[1] $role,
14-
Optional[Enum['present', 'absent']] $ensure = undef,
15-
Optional[String[1]] $psql_db = undef,
16-
Optional[String[1]] $psql_user = undef,
17-
Optional[Hash] $connect_settings = undef,
11+
Enum['ALL', 'CREATE', 'CONNECT', 'TEMPORARY', 'TEMP', 'all', 'create', 'connect', 'temporary', 'temp'] $privilege,
12+
String[1] $db,
13+
String[1] $role,
14+
Optional[Enum['present', 'absent']] $ensure = undef,
15+
Optional[String[1]] $psql_db = undef,
16+
Optional[String[1]] $psql_user = undef,
17+
Optional[Hash] $connect_settings = undef,
1818
) {
1919
postgresql::server::grant { "database:${name}":
2020
ensure => $ensure,

‎manifests/server/default_privileges.pp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
/(?i:^TYPES$)/,
2626
/(?i:^SCHEMAS$)/ # lint:ignore:trailing_comma
2727
] $object_type,
28-
String $schema = 'public',
29-
String $psql_db = $postgresql::server::default_database,
30-
String $psql_user = $postgresql::server::user,
31-
Integer $port = $postgresql::server::port,
32-
Hash $connect_settings = $postgresql::server::default_connect_settings,
33-
Enum['present', 'absent'] $ensure = 'present',
34-
String $group = $postgresql::server::group,
35-
String $psql_path = $postgresql::server::psql_path,
36-
Optional[String] $target_role = undef,
28+
String $schema = 'public',
29+
String $psql_db = $postgresql::server::default_database,
30+
String $psql_user = $postgresql::server::user,
31+
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
32+
Hash $connect_settings = $postgresql::server::default_connect_settings,
33+
Enum['present', 'absent'] $ensure = 'present',
34+
String $group = $postgresql::server::group,
35+
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
36+
Optional[String] $target_role = undef,
3737
) {
3838
# If possible use the version of the remote database, otherwise
3939
# fallback to our local DB version

‎manifests/server/extension.pp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
# @param connect_settings Specifies a hash of environment variables used when connecting to a remote server.
1818
# @param database_resource_name Specifies the resource name of the DB being managed. Defaults to the parameter $database, if left blank.
1919
define postgresql::server::extension (
20-
String[1] $database,
21-
String[1] $extension = $name,
22-
Optional[String[1]] $schema = undef,
23-
Optional[String[1]] $version = undef,
24-
Enum['present', 'absent'] $ensure = 'present',
25-
Optional[String[1]] $package_name = undef,
26-
Optional[Enum['present', 'absent']] $package_ensure = undef,
27-
Optional[Integer] $port = undef,
28-
Hash $connect_settings = postgresql::default('default_connect_settings'),
29-
String[1] $database_resource_name = $database,
20+
String[1] $database,
21+
Optional[Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], Pattern[/./]]] $package_ensure = undef,
22+
String[1] $extension = $name,
23+
Optional[String[1]] $schema = undef,
24+
Optional[String[1]] $version = undef,
25+
Enum['present', 'absent'] $ensure = 'present',
26+
Optional[String[1]] $package_name = undef,
27+
Optional[Variant[String[1], Stdlib::Port]] $port = undef,
28+
Hash $connect_settings = postgresql::default('default_connect_settings'),
29+
String[1] $database_resource_name = $database,
3030
) {
3131
$user = postgresql::default('user')
3232
$group = postgresql::default('group')

‎manifests/server/grant.pp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
/(?i:^SCHEMA$)/,
3333
/(?i:^SEQUENCE$)/ # lint:ignore:trailing_comma
3434
#/(?i:^VIEW$)/
35-
] $object_type = 'database',
36-
Optional[Variant[Array[String,2,2],String[1]]] $object_name = undef,
37-
Array[String[1],0] $object_arguments = [],
38-
String $psql_db = $postgresql::server::default_database,
39-
String $psql_user = $postgresql::server::user,
40-
Integer $port = $postgresql::server::port,
41-
Boolean $onlyif_exists = false,
42-
Hash $connect_settings = $postgresql::server::default_connect_settings,
43-
Enum['present', 'absent'] $ensure = 'present',
44-
String $group = $postgresql::server::group,
45-
String $psql_path = $postgresql::server::psql_path,
35+
] $object_type = 'database',
36+
Optional[Variant[Array[String,2,2],String[1]]] $object_name = undef,
37+
Array[String[1],0] $object_arguments = [],
38+
String $psql_db = $postgresql::server::default_database,
39+
String $psql_user = $postgresql::server::user,
40+
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
41+
Boolean $onlyif_exists = false,
42+
Hash $connect_settings = $postgresql::server::default_connect_settings,
43+
Enum['present', 'absent'] $ensure = 'present',
44+
String $group = $postgresql::server::group,
45+
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
4646
) {
4747
case $ensure {
4848
default: {

‎manifests/server/grant_role.pp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
# @param port Port to use when connecting.
99
# @param connect_settings Specifies a hash of environment variables used when connecting to a remote server.
1010
define postgresql::server::grant_role (
11-
String[1] $group,
12-
String[1] $role = $name,
13-
Enum['present', 'absent'] $ensure = 'present',
14-
String[1] $psql_db = $postgresql::server::default_database,
15-
String[1] $psql_user = $postgresql::server::user,
16-
Variant[String[1], Integer] $port = $postgresql::server::port,
17-
Hash $connect_settings = $postgresql::server::default_connect_settings,
11+
String[1] $group,
12+
String[1] $role = $name,
13+
Enum['present', 'absent'] $ensure = 'present',
14+
String[1] $psql_db = $postgresql::server::default_database,
15+
String[1] $psql_user = $postgresql::server::user,
16+
Variant[String[1], Stdlib::Port] $port = $postgresql::server::port,
17+
Hash $connect_settings = $postgresql::server::default_connect_settings,
1818
) {
1919
case $ensure {
2020
'present': {

0 commit comments

Comments
 (0)