Check is_user_in_hba output (#974)

Author: dragomirp

src/constants.py

@@ -71,10 +71,6 @@
 
 SECRET_KEY_OVERRIDES = {"ca": "cauth"}
 
-ENDPOINT_SIMULTANEOUSLY_BLOCKING_MESSAGE = (
-    "Please choose one endpoint to use. No need to relate all of them simultaneously!"
-)
-
 TRACING_PROTOCOL = "otlp_http"
 
 BACKUP_TYPE_OVERRIDES = {"full": "full", "differential": "diff", "incremental": "incr"}

src/relations/postgresql_provider.py

@@ -21,7 +21,7 @@
     PostgreSQLGetPostgreSQLVersionError,
     PostgreSQLListUsersError,
 )
-from ops.charm import RelationBrokenEvent, RelationChangedEvent
+from ops.charm import RelationBrokenEvent
 from ops.framework import Object
 from ops.model import ActiveStatus, BlockedStatus, Relation
 from tenacity import RetryError, Retrying, stop_after_attempt, wait_fixed
@@ -30,7 +30,6 @@
     ALL_CLIENT_RELATIONS,
     APP_SCOPE,
     DATABASE_PORT,
-    ENDPOINT_SIMULTANEOUSLY_BLOCKING_MESSAGE,
 )
 from utils import label2name, new_password
 
@@ -62,10 +61,6 @@ def __init__(self, charm: "PostgresqlOperatorCharm", relation_name: str = "datab
         self.framework.observe(
             charm.on[self.relation_name].relation_broken, self._on_relation_broken
         )
-        self.framework.observe(
-            charm.on[self.relation_name].relation_changed,
-            self._on_relation_changed_event,
-        )
         self.charm = charm
 
         # Charm events defined in the database provides charm library.
@@ -151,12 +146,14 @@ def _on_database_requested(self, event: DatabaseRequestedEvent) -> None:
                     else f"Failed to initialize relation {self.relation_name}"
                 )
             )
+            return
 
         # Try to wait for pg_hba trigger
         try:
             for attempt in Retrying(stop=stop_after_attempt(3), wait=wait_fixed(1)):
                 with attempt:
-                    self.charm.postgresql.is_user_in_hba(user)
+                    if not self.charm.postgresql.is_user_in_hba(user):
+                        raise Exception("pg_hba not ready")
             self.charm.unit_peer_data.update({
                 "pg_hba_needs_update_timestamp": str(datetime.now())
             })
@@ -299,11 +296,6 @@ def update_endpoints(self, event: DatabaseRequestedEvent = None) -> None:  # noq
             self.database_provides.set_tls(relation_id, tls)
             self.database_provides.set_tls_ca(relation_id, ca)
 
-    def _check_multiple_endpoints(self) -> bool:
-        """Checks if there are relations with other endpoints."""
-        relation_names = {relation.name for relation in self.charm.client_relations}
-        return "database" in relation_names and len(relation_names) > 1
-
     def _update_unit_status(self, relation: Relation) -> None:
         """# Clean up Blocked status if it's due to extensions request."""
         if (
@@ -317,27 +309,6 @@ def _update_unit_status(self, relation: Relation) -> None:
         ):
             self.charm.set_unit_status(ActiveStatus())
 
-        self._update_unit_status_on_blocking_endpoint_simultaneously()
-
-    def _on_relation_changed_event(self, event: RelationChangedEvent) -> None:
-        """Event emitted when the relation has changed."""
-        # Leader only
-        if not self.charm.unit.is_leader():
-            return
-
-        if self._check_multiple_endpoints():
-            self.charm.set_unit_status(BlockedStatus(ENDPOINT_SIMULTANEOUSLY_BLOCKING_MESSAGE))
-            return
-
-    def _update_unit_status_on_blocking_endpoint_simultaneously(self):
-        """Clean up Blocked status if this is due related of multiple endpoints."""
-        if (
-            self.charm.is_blocked
-            and self.charm.unit.status.message == ENDPOINT_SIMULTANEOUSLY_BLOCKING_MESSAGE
-            and not self._check_multiple_endpoints()
-        ):
-            self.charm.set_unit_status(ActiveStatus())
-
     def check_for_invalid_extra_user_roles(self, relation_id: int) -> bool:
         """Checks if there are relations with invalid extra user roles.