From ece77516a4f9f4badd18e25c8b3ae974ef5be459 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Wed, 30 Aug 2023 22:42:04 +0200
Subject: [PATCH] Cleanup useless $connect_setting validation

In the past we checked if $connect_setting isn't undef. That is not
required because the default is {} and the Datatype is hash. Undef isn't
allowed.
---
 manifests/server/database.pp           |  4 ++--
 manifests/server/default_privileges.pp | 12 ++++++------
 manifests/server/extension.pp          |  4 ++--
 manifests/server/grant.pp              |  6 +++---
 manifests/server/grant_role.pp         |  2 +-
 manifests/server/reassign_owned_by.pp  | 13 ++++---------
 manifests/server/role.pp               |  6 +++---
 manifests/server/schema.pp             |  2 +-
 manifests/server/tablespace.pp         |  2 +-
 9 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/manifests/server/database.pp b/manifests/server/database.pp
index 27e49e2eab..2b6db8f10e 100644
--- a/manifests/server/database.pp
+++ b/manifests/server/database.pp
@@ -27,14 +27,14 @@
 
   # If possible use the version of the remote database, otherwise
   # fallback to our local DB version
-  if $connect_settings != undef and 'DBVERSION' in $connect_settings {
+  if 'DBVERSION' in $connect_settings {
     $version = $connect_settings['DBVERSION']
   } else {
     $version = $postgresql::server::_version
   }
 
   # If the connection settings do not contain a port, then use the local server port
-  if $connect_settings != undef and 'PGPORT' in $connect_settings {
+  if 'PGPORT' in $connect_settings {
     $port = undef
   } else {
     $port = $postgresql::server::port
diff --git a/manifests/server/default_privileges.pp b/manifests/server/default_privileges.pp
index 6a9541864e..ac8052ba35 100644
--- a/manifests/server/default_privileges.pp
+++ b/manifests/server/default_privileges.pp
@@ -37,7 +37,7 @@
 ) {
   # If possible use the version of the remote database, otherwise
   # fallback to our local DB version
-  if $connect_settings != undef and 'DBVERSION' in $connect_settings {
+  if 'DBVERSION' in $connect_settings {
     $version = $connect_settings['DBVERSION']
   } else {
     $version = $postgresql::server::_version
@@ -62,15 +62,15 @@
   #
   # Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
   #
-  if $port != undef {
+  if $port {
     $port_override = $port
-  } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
+  } elsif 'PGPORT' in $connect_settings {
     $port_override = undef
   } else {
     $port_override = $postgresql::server::port
   }
 
-  if $target_role != undef {
+  if $target_role {
     $_target_role = " FOR ROLE ${target_role}"
     $_check_target_role = "/${target_role}"
   } else {
@@ -178,11 +178,11 @@
     environment      => 'PGOPTIONS=--client-min-messages=error',
   }
 
-  if($role != undef and defined(Postgresql::Server::Role[$role])) {
+  if defined(Postgresql::Server::Role[$role]) {
     Postgresql::Server::Role[$role] -> Postgresql_psql["default_privileges:${name}"]
   }
 
-  if($db != undef and defined(Postgresql::Server::Database[$db])) {
+  if defined(Postgresql::Server::Database[$db]) {
     Postgresql::Server::Database[$db] -> Postgresql_psql["default_privileges:${name}"]
   }
 }
diff --git a/manifests/server/extension.pp b/manifests/server/extension.pp
index 227e451d1a..581c8d8e81 100644
--- a/manifests/server/extension.pp
+++ b/manifests/server/extension.pp
@@ -77,9 +77,9 @@
   #
   # Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
   #
-  if $port != undef {
+  if $port {
     $port_override = $port
-  } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
+  } elsif 'PGPORT' in $connect_settings {
     $port_override = undef
   } else {
     $port_override = $postgresql::server::port
diff --git a/manifests/server/grant.pp b/manifests/server/grant.pp
index ec4d5d2c98..30b698c54b 100644
--- a/manifests/server/grant.pp
+++ b/manifests/server/grant.pp
@@ -77,7 +77,7 @@
   #
   # Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
   #
-  if $port != undef {
+  if $port {
     $port_override = $port
   } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
     $port_override = undef
@@ -483,11 +483,11 @@
     onlyif           => $_onlyif,
   }
 
-  if($role != undef and defined(Postgresql::Server::Role[$role])) {
+  if defined(Postgresql::Server::Role[$role]) {
     Postgresql::Server::Role[$role] -> Postgresql_psql["grant:${name}"]
   }
 
-  if($db != undef and defined(Postgresql::Server::Database[$db])) {
+  if defined(Postgresql::Server::Database[$db]) {
     Postgresql::Server::Database[$db] -> Postgresql_psql["grant:${name}"]
   }
 }
diff --git a/manifests/server/grant_role.pp b/manifests/server/grant_role.pp
index a061a8341f..4edf59ea0d 100644
--- a/manifests/server/grant_role.pp
+++ b/manifests/server/grant_role.pp
@@ -39,7 +39,7 @@
     connect_settings => $connect_settings,
   }
 
-  if ! $connect_settings or empty($connect_settings) {
+  if empty($connect_settings) {
     Class['postgresql::server'] -> Postgresql_psql["grant_role:${name}"]
   }
   if defined(Postgresql::Server::Role[$role]) {
diff --git a/manifests/server/reassign_owned_by.pp b/manifests/server/reassign_owned_by.pp
index c0b15461fc..0a40bdc35d 100644
--- a/manifests/server/reassign_owned_by.pp
+++ b/manifests/server/reassign_owned_by.pp
@@ -21,15 +21,10 @@
   $group     = $postgresql::server::group
   $psql_path = $postgresql::server::psql_path
 
-  #
-  # Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
-  #
-  if $port {
-    $port_override = $port
-  } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
+  if 'PGPORT' in $connect_settings {
     $port_override = undef
   } else {
-    $port_override = $postgresql::server::port
+    $port_override = $port
   }
 
   $onlyif = "SELECT tablename FROM pg_catalog.pg_tables WHERE
@@ -54,14 +49,14 @@
     onlyif           => $onlyif,
   }
 
-  if($old_role != undef and defined(Postgresql::Server::Role[$old_role])) {
+  if defined(Postgresql::Server::Role[$old_role]) {
     Postgresql::Server::Role[$old_role] -> Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
   }
   if($new_role != undef and defined(Postgresql::Server::Role[$new_role])) {
     Postgresql::Server::Role[$new_role] -> Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
   }
 
-  if($db != undef and defined(Postgresql::Server::Database[$db])) {
+  if defined(Postgresql::Server::Database[$db]) {
     Postgresql::Server::Database[$db] -> Postgresql_psql["reassign_owned_by:${db}:${sql_command}"]
   }
 }
diff --git a/manifests/server/role.pp b/manifests/server/role.pp
index 576a71abd9..40d581f266 100644
--- a/manifests/server/role.pp
+++ b/manifests/server/role.pp
@@ -53,9 +53,9 @@
   #
   # Port, order of precedence: $port parameter, $connect_settings[PGPORT], $postgresql::server::port
   #
-  if $port != undef {
+  if $port {
     $port_override = $port
-  } elsif $connect_settings != undef and 'PGPORT' in $connect_settings {
+  } elsif 'PGPORT' in $connect_settings {
     $port_override = undef
   } else {
     $port_override = $postgresql::server::port
@@ -63,7 +63,7 @@
 
   # If possible use the version of the remote database, otherwise
   # fallback to our local DB version
-  if $connect_settings != undef and 'DBVERSION' in $connect_settings {
+  if 'DBVERSION' in $connect_settings {
     $version = $connect_settings['DBVERSION']
   } else {
     $version = $postgresql::server::_version
diff --git a/manifests/server/schema.pp b/manifests/server/schema.pp
index ad160367ca..20c47ac877 100644
--- a/manifests/server/schema.pp
+++ b/manifests/server/schema.pp
@@ -27,7 +27,7 @@
   Postgresql::Server::Db <| dbname == $db |> -> Postgresql::Server::Schema[$name]
 
   # If the connection settings do not contain a port, then use the local server port
-  if $connect_settings != undef and 'PGPORT' in $connect_settings {
+  if 'PGPORT' in $connect_settings {
     $port = undef
   } else {
     $port = $postgresql::server::port
diff --git a/manifests/server/tablespace.pp b/manifests/server/tablespace.pp
index aa96f926e7..93d790e695 100644
--- a/manifests/server/tablespace.pp
+++ b/manifests/server/tablespace.pp
@@ -18,7 +18,7 @@
   $module_workdir = $postgresql::server::module_workdir
 
   # If the connection settings do not contain a port, then use the local server port
-  if $connect_settings != undef and 'PGPORT' in $connect_settings {
+  if 'PGPORT' in $connect_settings {
     $port = undef
   } else {
     $port = $postgresql::server::port