From ebc9d7e3b5a7a82ee49cad3265a2a771daf1b231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Wed, 3 Jan 2024 12:10:08 -1000
Subject: [PATCH] Fix anchoring in `postgresql::server::instance::service`

Some resources where not properly ordered between the "begin" and "end"
anchors.  Make sure they are properly bound to them.
---
 manifests/server/instance/service.pp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/manifests/server/instance/service.pp b/manifests/server/instance/service.pp
index f778518dc0..47e7ecda25 100644
--- a/manifests/server/instance/service.pp
+++ b/manifests/server/instance/service.pp
@@ -42,6 +42,10 @@
       status    => $service_status,
     }
 
+    Anchor["postgresql::server::service::begin::${name}"]
+    -> Service["postgresqld_instance_${name}"]
+    -> Anchor["postgresql::server::service::end::${name}"]
+
     if $service_ensure in ['running', true] {
       # This blocks the class before continuing if chained correctly, making
       # sure the service really is 'up' before continuing.
@@ -56,10 +60,13 @@
         sleep            => 1,
         tries            => 60,
         psql_path        => $psql_path,
-        require          => Service["postgresqld_instance_${name}"],
-        before           => Anchor["postgresql::server::service::end::${name}"],
       }
-      Postgresql::Server::Database <| title == $default_database |> -> Postgresql_conn_validator["validate_service_is_running_instance_${name}"]
+
+      Anchor["postgresql::server::service::begin::${name}"]
+      -> Service["postgresqld_instance_${name}"]
+      -> Postgresql::Server::Database <| title == $default_database |>
+      -> Postgresql_conn_validator["validate_service_is_running_instance_${name}"]
+      -> Anchor["postgresql::server::service::end::${name}"]
     }
   }