Merge pull request #1491 from SimonHoenscheid/reasonable_path_datatypes

bastelfreak · web-flow · commit 26b25552f9bf · 2023-08-31T15:12:30.000+02:00
Enforce Stdlib::Absolutepath for filepaths
diff --git a/manifests/globals.pp b/manifests/globals.pp
@@ -122,14 +122,14 @@
 
   Optional[String[1]] $validcon_script_path        = undef,
 
-  Optional[Variant[String[1], Stdlib::Absolutepath]] $initdb_path                 = undef,
-  Optional[Variant[String[1], Stdlib::Absolutepath]] $psql_path                   = undef,
-  Optional[Variant[String[1], Stdlib::Absolutepath]] $pg_hba_conf_path            = undef,
-  Optional[Variant[String[1], Stdlib::Absolutepath]] $pg_ident_conf_path          = undef,
-  Optional[Variant[String[1], Stdlib::Absolutepath]] $postgresql_conf_path        = undef,
-  Optional[Stdlib::Filemode]                         $postgresql_conf_mode        = undef,
-  Optional[Variant[String[1], Stdlib::Absolutepath]] $recovery_conf_path          = undef,
-  Hash                                               $default_connect_settings    = {},
+  Optional[Stdlib::Absolutepath] $initdb_path          = undef,
+  Optional[Stdlib::Absolutepath] $psql_path            = undef,
+  Optional[Stdlib::Absolutepath] $pg_hba_conf_path     = undef,
+  Optional[Stdlib::Absolutepath] $pg_ident_conf_path   = undef,
+  Optional[Stdlib::Absolutepath] $postgresql_conf_path = undef,
+  Optional[Stdlib::Filemode] $postgresql_conf_mode     = undef,
+  Optional[Stdlib::Absolutepath] $recovery_conf_path   = undef,
+  Hash $default_connect_settings                       = {},
 
   Optional[Boolean] $pg_hba_conf_defaults          = undef,
 
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -138,13 +138,13 @@
   Array[String[1]]                                   $ipv4acls                     = $postgresql::params::ipv4acls,
   Array[String[1]]                                   $ipv6acls                     = $postgresql::params::ipv6acls,
 
-  Variant[String[1], Stdlib::Absolutepath]           $initdb_path                  = $postgresql::params::initdb_path,
-  Variant[String[1], Stdlib::Absolutepath]           $psql_path                    = $postgresql::params::psql_path,
-  Variant[String[1], Stdlib::Absolutepath]           $pg_hba_conf_path             = $postgresql::params::pg_hba_conf_path,
-  Variant[String[1], Stdlib::Absolutepath]           $pg_ident_conf_path           = $postgresql::params::pg_ident_conf_path,
-  Variant[String[1], Stdlib::Absolutepath]           $postgresql_conf_path         = $postgresql::params::postgresql_conf_path,
+  Stdlib::Absolutepath                               $initdb_path                  = $postgresql::params::initdb_path,
+  Stdlib::Absolutepath                               $psql_path                    = $postgresql::params::psql_path,
+  Stdlib::Absolutepath                               $pg_hba_conf_path             = $postgresql::params::pg_hba_conf_path,
+  Stdlib::Absolutepath                               $pg_ident_conf_path           = $postgresql::params::pg_ident_conf_path,
+  Stdlib::Absolutepath                               $postgresql_conf_path         = $postgresql::params::postgresql_conf_path,
   Optional[Stdlib::Filemode]                         $postgresql_conf_mode         = $postgresql::params::postgresql_conf_mode,
-  Variant[String[1], Stdlib::Absolutepath]           $recovery_conf_path           = $postgresql::params::recovery_conf_path,
+  Stdlib::Absolutepath                               $recovery_conf_path           = $postgresql::params::recovery_conf_path,
 
   String[1]                                          $datadir                      = $postgresql::params::datadir,
   Optional[String[1]]                                $xlogdir                      = $postgresql::params::xlogdir,
diff --git a/manifests/server/default_privileges.pp b/manifests/server/default_privileges.pp
@@ -25,15 +25,15 @@
     /(?i:^TYPES$)/,
     /(?i:^SCHEMAS$)/
   ] $object_type,
-  String                                    $schema            = 'public',
-  String                                    $psql_db           = $postgresql::server::default_database,
-  String                                    $psql_user         = $postgresql::server::user,
-  Stdlib::Port                              $port              = $postgresql::server::port,
-  Hash                                      $connect_settings  = $postgresql::server::default_connect_settings,
-  Enum['present', 'absent']                 $ensure            = 'present',
-  String                                    $group             = $postgresql::server::group,
-  Variant[String[1], Stdlib::Absolutepath]  $psql_path         = $postgresql::server::psql_path,
-  Optional[String]                          $target_role       = undef,
+  String                    $schema            = 'public',
+  String                    $psql_db           = $postgresql::server::default_database,
+  String                    $psql_user         = $postgresql::server::user,
+  Stdlib::Port              $port              = $postgresql::server::port,
+  Hash                      $connect_settings  = $postgresql::server::default_connect_settings,
+  Enum['present', 'absent'] $ensure            = 'present',
+  String                    $group             = $postgresql::server::group,
+  Stdlib::Absolutepath      $psql_path         = $postgresql::server::psql_path,
+  Optional[String]          $target_role       = undef,
 ) {
   # If possible use the version of the remote database, otherwise
   # fallback to our local DB version
diff --git a/manifests/server/grant.pp b/manifests/server/grant.pp
@@ -46,7 +46,7 @@
   Hash                                           $connect_settings  = $postgresql::server::default_connect_settings,
   Enum['present', 'absent']                      $ensure            = 'present',
   String                                         $group             = $postgresql::server::group,
-  Variant[String[1], Stdlib::Absolutepath]       $psql_path         = $postgresql::server::psql_path,
+  Stdlib::Absolutepath                           $psql_path         = $postgresql::server::psql_path,
 ) {
   case $ensure {
     default: {
diff --git a/manifests/server/instance/config.pp b/manifests/server/instance/config.pp
@@ -51,11 +51,11 @@
   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,
-  Variant[String[1], Stdlib::Absolutepath]       $pg_ident_conf_path           = $postgresql::server::pg_ident_conf_path,
-  Variant[String[1], Stdlib::Absolutepath]       $postgresql_conf_path         = $postgresql::server::postgresql_conf_path,
+  Stdlib::Absolutepath                           $pg_hba_conf_path             = $postgresql::server::pg_hba_conf_path,
+  Stdlib::Absolutepath                           $pg_ident_conf_path           = $postgresql::server::pg_ident_conf_path,
+  Stdlib::Absolutepath                           $postgresql_conf_path         = $postgresql::server::postgresql_conf_path,
   Optional[Stdlib::Filemode]                     $postgresql_conf_mode         = $postgresql::server::postgresql_conf_mode,
-  Variant[String[1], Stdlib::Absolutepath]       $recovery_conf_path           = $postgresql::server::recovery_conf_path,
+  Stdlib::Absolutepath                           $recovery_conf_path           = $postgresql::server::recovery_conf_path,
   Boolean                                        $pg_hba_conf_defaults         = $postgresql::server::pg_hba_conf_defaults,
   String[1]                                      $user                         = $postgresql::server::user,
   String[1]                                      $group                        = $postgresql::server::group,
diff --git a/manifests/server/instance/initdb.pp b/manifests/server/instance/initdb.pp
@@ -32,7 +32,7 @@
   String[1]                                $datadir        = $postgresql::server::datadir,
   Optional[String[1]]                      $encoding       = $postgresql::server::encoding,
   String[1]                                $group          = $postgresql::server::group,
-  Variant[String[1], Stdlib::Absolutepath] $initdb_path    = $postgresql::server::initdb_path,
+  Stdlib::Absolutepath                     $initdb_path    = $postgresql::server::initdb_path,
   Optional[String[1]]                      $lc_messages    = $postgresql::server::lc_messages,
   Optional[String[1]]                      $locale         = $postgresql::server::locale,
   Optional[String[1]]                      $logdir         = $postgresql::server::logdir,
diff --git a/manifests/server/instance/late_initdb.pp b/manifests/server/instance/late_initdb.pp
@@ -15,7 +15,7 @@
   Optional[String[1]]                       $encoding       = $postgresql::server::encoding,
   String[1]                                 $user           = $postgresql::server::user,
   String[1]                                 $group          = $postgresql::server::group,
-  Variant[String[1], Stdlib::Absolutepath]  $psql_path      = $postgresql::server::psql_path,
+  Stdlib::Absolutepath                      $psql_path      = $postgresql::server::psql_path,
   Stdlib::Port                              $port           = $postgresql::server::port,
   String[1]                                 $module_workdir = $postgresql::server::module_workdir,
 ) {
diff --git a/manifests/server/instance/passwd.pp b/manifests/server/instance/passwd.pp
@@ -16,7 +16,7 @@
 define postgresql::server::instance::passwd (
   String[1]                                                   $user              = $postgresql::server::user,
   String[1]                                                   $group             = $postgresql::server::group,
-  Variant[String[1], Stdlib::Absolutepath]                    $psql_path         = $postgresql::server::psql_path,
+  Stdlib::Absolutepath                                        $psql_path         = $postgresql::server::psql_path,
   Stdlib::Port                                                $port              = $postgresql::server::port,
   String[1]                                                   $database          = $postgresql::server::default_database,
   String[1]                                                   $module_workdir    = $postgresql::server::module_workdir,
diff --git a/manifests/server/instance/service.pp b/manifests/server/instance/service.pp
@@ -27,7 +27,7 @@
   String[1]                                    $user             = $postgresql::server::user,
   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,
+  Stdlib::Absolutepath                         $psql_path        = $postgresql::server::psql_path,
   Hash                                         $connect_settings = $postgresql::server::default_connect_settings,
 ) {
   anchor { "postgresql::server::service::begin::${name}": }
diff --git a/manifests/server/pg_ident_rule.pp b/manifests/server/pg_ident_rule.pp
@@ -19,7 +19,7 @@
 
   # Needed for testing primarily, support for multiple files is not really
   # working.
-  Variant[String[1], Stdlib::Absolutepath] $target = $postgresql::server::pg_ident_conf_path
+  Stdlib::Absolutepath $target = $postgresql::server::pg_ident_conf_path
 ) {
   if $postgresql::server::manage_pg_ident_conf == false {
     fail('postgresql::server::manage_pg_ident_conf has been disabled, so this resource is now unused and redundant, either enable that option or remove this resource from your manifests') # lint:ignore:140chars
diff --git a/manifests/server/recovery.pp b/manifests/server/recovery.pp
@@ -46,7 +46,7 @@
   Optional[String[1]] $primary_slot_name         = undef,
   Optional[String[1]] $trigger_file              = undef,
   Optional[Integer]   $recovery_min_apply_delay  = undef,
-  Variant[String[1], Stdlib::Absolutepath] $target = $postgresql::server::recovery_conf_path
+  Stdlib::Absolutepath $target                   = $postgresql::server::recovery_conf_path
 ) {
   if $postgresql::server::manage_recovery_conf == false {
     fail('postgresql::server::manage_recovery_conf has been disabled, so this resource is now unused and redundant, either enable that option or remove this resource from your manifests') # lint:ignore:140chars
diff --git a/manifests/server/role.pp b/manifests/server/role.pp
@@ -24,26 +24,26 @@
 # @param hash Specify the hash method for pg password
 # @param salt Specify the salt use for the scram-sha-256 encoding password (default username)
 define postgresql::server::role (
-  Boolean                                             $update_password  = true,
-  Variant[Boolean, String, Sensitive[String]]         $password_hash    = false,
-  Boolean                                             $createdb         = false,
-  Boolean                                             $createrole       = false,
-  String[1]                                           $db               = $postgresql::server::default_database,
-  Optional[Stdlib::Port]                              $port             = undef,
-  Boolean                                             $login            = true,
-  Boolean                                             $inherit          = true,
-  Boolean                                             $superuser        = false,
-  Boolean                                             $replication      = false,
-  String[1]                                           $connection_limit = '-1',
-  String[1]                                           $username         = $title,
-  Hash                                                $connect_settings = $postgresql::server::default_connect_settings,
-  String[1]                                           $psql_user        = $postgresql::server::user,
-  String[1]                                           $psql_group       = $postgresql::server::group,
-  Variant[String[1], Stdlib::Absolutepath]            $psql_path        = $postgresql::server::psql_path,
-  String[1]                                           $module_workdir   = $postgresql::server::module_workdir,
-  Enum['present', 'absent']                           $ensure           = 'present',
-  Optional[Enum['md5', 'scram-sha-256']]              $hash             = undef,
-  Optional[Variant[String[1], Integer]]               $salt             = undef,
+  Boolean                                     $update_password  = true,
+  Variant[Boolean, String, Sensitive[String]] $password_hash    = false,
+  Boolean                                     $createdb         = false,
+  Boolean                                     $createrole       = false,
+  String[1]                                   $db               = $postgresql::server::default_database,
+  Optional[Stdlib::Port]                      $port             = undef,
+  Boolean                                     $login            = true,
+  Boolean                                     $inherit          = true,
+  Boolean                                     $superuser        = false,
+  Boolean                                     $replication      = false,
+  String[1]                                   $connection_limit = '-1',
+  String[1]                                   $username         = $title,
+  Hash                                        $connect_settings = $postgresql::server::default_connect_settings,
+  String[1]                                   $psql_user        = $postgresql::server::user,
+  String[1]                                   $psql_group       = $postgresql::server::group,
+  Stdlib::Absolutepath                        $psql_path        = $postgresql::server::psql_path,
+  String[1]                                   $module_workdir   = $postgresql::server::module_workdir,
+  Enum['present', 'absent']                   $ensure           = 'present',
+  Optional[Enum['md5', 'scram-sha-256']]      $hash             = undef,
+  Optional[Variant[String[1], Integer]]       $salt             = undef,
 ) {
   $password_hash_unsensitive = if $password_hash =~ Sensitive[String] {
     $password_hash.unwrap
