From cdf408054207c7ff765689fe302aeb840ad1d357 Mon Sep 17 00:00:00 2001
From: Matt Darcy <matt@projecthugo.co.uk>
Date: Wed, 27 May 2026 19:19:41 +0100
Subject: [PATCH 1/3] add loop through grant_role type

---
 manifests/server.pp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/manifests/server.pp b/manifests/server.pp
index cf3bda0848..eb8dff9553 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -103,6 +103,7 @@
 # @param grants Specifies a hash from which to generate postgresql::server::grant resources.
 # @param config_entries Specifies a hash from which to generate postgresql::server::config_entry resources.
 # @param pg_hba_rules Specifies a hash from which to generate postgresql::server::pg_hba_rule resources.
+# @param grant_roles Specifies a hash from which to generate postgresql::server::grant_role resources. 
 #
 # @param backup_enable Whether a backup job should be enabled.
 # @param backup_options A hash of options that should be passed through to the backup provider.
@@ -189,6 +190,7 @@
   Hash[String[1], Hash]                              $grants                       = {},
   Hash[String, Any]                                  $config_entries               = {},
   Postgresql::Pg_hba_rules                           $pg_hba_rules                 = {},
+  Hash[String[1], Hash]                              $grant_roles                  = {},
 
   Boolean                                            $backup_enable                = $postgresql::params::backup_enable,
   Hash                                               $backup_options               = {},
@@ -225,6 +227,12 @@
     }
   }
 
+ $grant_roles.each |$grantname, $grant_role| {
+   postgresql::server::grant_role { $grantname:
+     * => $grant_role, 
+   }
+ }
+
   $config_entries.each |$entry, $value| {
     postgresql::server::config_entry { $entry:
       ensure => bool2str($value =~ Undef, 'absent', 'present'),

From 6f6985397239ad83466decb7c01bad5386e684a3 Mon Sep 17 00:00:00 2001
From: Matt Darcy <matt@projecthugo.co.uk>
Date: Wed, 27 May 2026 19:40:43 +0100
Subject: [PATCH 2/3] updated linting to standards

---
 manifests/server.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/server.pp b/manifests/server.pp
index eb8dff9553..33f9045513 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -227,11 +227,11 @@
     }
   }
 
- $grant_roles.each |$grantname, $grant_role| {
-   postgresql::server::grant_role { $grantname:
-     * => $grant_role, 
-   }
- }
+  $grant_roles.each |$grantname, $grant_role| {
+    postgresql::server::grant_role { $grantname:
+      * => $grant_role,
+    }
+  }
 
   $config_entries.each |$entry, $value| {
     postgresql::server::config_entry { $entry:

From 6fb225fda9e93c7fe7b9f98882952bfc4b49199a Mon Sep 17 00:00:00 2001
From: Matt Darcy <matt@projecthugo.co.uk>
Date: Wed, 27 May 2026 20:53:33 +0100
Subject: [PATCH 3/3] fix dependency cycle loop on postgresql::server

---
 manifests/server/grant_role.pp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/manifests/server/grant_role.pp b/manifests/server/grant_role.pp
index 11ef6a70de..48b69d04fd 100644
--- a/manifests/server/grant_role.pp
+++ b/manifests/server/grant_role.pp
@@ -42,9 +42,6 @@
     connect_settings => $connect_settings,
   }
 
-  if empty($connect_settings) {
-    Class['postgresql::server'] -> Postgresql_psql["grant_role:${name}"]
-  }
   if defined(Postgresql::Server::Role[$role]) {
     Postgresql::Server::Role[$role] -> Postgresql_psql["grant_role:${name}"]
   }