Prefixes WIP

Author: dragomirp

lib/charms/data_platform_libs/v0/data_interfaces.py

@@ -17,7 +17,8 @@ jinja2 = "^3.1.6"
 lightkube = "^0.17.2"
 lightkube-models = "^1.28.1.4"
 psycopg2 = "^2.9.10"
-postgresql-charms-single-kernel = "16.1.0"
+charmlibs-interfaces-tls-certificates = "^1.0.0.post1"
+postgresql-charms-single-kernel = {url = "https://github.com/canonical/postgresql-single-kernel-library/archive/63673568ebe99c3ce4030fb5769b4d88085bc0c5.zip"}
 
 [tool.poetry.group.charm-libs.dependencies]
 # data_platform_libs/v0/data_interfaces.py

lib/charms/tls_certificates_interface/v4/tls_certificates.py

@@ -2406,7 +2406,8 @@ def relations_user_databases_map(self) -> dict:
         except PostgreSQLListGroupsError as e:
             logger.warning(f"Failed to list access groups: {e}")
             return {USER: "all", REPLICATION_USER: "all", REWIND_USER: "all"}
-        user_database_map = {}
+
+        user_database_map = self._collect_user_relations()
         for user in self.postgresql.list_users(current_host=self.is_connectivity_enabled):
             if user in (
                 "backup",
@@ -2426,30 +2427,26 @@ def relations_user_databases_map(self) -> dict:
             else:
                 logger.debug(f"User {user} has no databases to connect to")
 
-        # Copy relations users directly instead of waiting for them to be created
-        custom_username_mapping = self.postgresql_client_relation.get_username_mapping()
-        for relation in self.model.relations[self.postgresql_client_relation.relation_name]:
-            user = custom_username_mapping.get(str(relation.id), f"relation_id_{relation.id}")
-            if user not in user_database_map and (
-                database := self.postgresql_client_relation.database_provides.fetch_relation_field(
-                    relation.id, "database"
-                )
-            ):
-                user_database_map[user] = database
         return user_database_map
 
-    @cached_property
-    def generate_user_hash(self) -> str:
-        """Generate expected user and database hash."""
+    def _collect_user_relations(self) -> dict[str, str]:
         user_db_pairs = {}
         custom_username_mapping = self.postgresql_client_relation.get_username_mapping()
+        prefix_database_mapping = self.postgresql_client_relation.get_databases_prefix_mapping()
+
         for relation in self.model.relations[self.postgresql_client_relation.relation_name]:
             if database := self.postgresql_client_relation.database_provides.fetch_relation_field(
                 relation.id, "database"
             ):
                 user = custom_username_mapping.get(str(relation.id), f"relation_id_{relation.id}")
+                database = ",".join(prefix_database_mapping.get(str(relation.id), [database]))
                 user_db_pairs[user] = database
-        return shake_128(str(user_db_pairs).encode()).hexdigest(16)
+        return user_db_pairs
+
+    @cached_property
+    def generate_user_hash(self) -> str:
+        """Generate expected user and database hash."""
+        return shake_128(str(self._collect_user_relations()).encode()).hexdigest(16)
 
     def override_patroni_on_failure_condition(
         self, new_condition: str, repeat_cause: str | None

poetry.lock

@@ -42,6 +42,7 @@
 SYSTEM_USERS_PASSWORD_CONFIG = "system-users"  # noqa: S105
 
 USERNAME_MAPPING_LABEL = "custom-usernames"
+DATABASE_MAPPING_LABEL = "prefix-databases"
 
 APP_SCOPE = "app"
 UNIT_SCOPE = "unit"