postgresql-charms-single-kernel 16.1.1__tar.gz → 16.1.2__tar.gz

{postgresql_charms_single_kernel-16.1.1 → postgresql_charms_single_kernel-16.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresql-charms-single-kernel
-Version: 16.1.1
+Version: 16.1.2
 Summary: Shared and reusable code for PostgreSQL-related charms
 Author-email: Canonical Data Platform <data-platform@lists.launchpad.net>
 License-Expression: Apache-2.0

{postgresql_charms_single_kernel-16.1.1 → postgresql_charms_single_kernel-16.1.2}/postgresql_charms_single_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresql-charms-single-kernel
-Version: 16.1.1
+Version: 16.1.2
 Summary: Shared and reusable code for PostgreSQL-related charms
 Author-email: Canonical Data Platform <data-platform@lists.launchpad.net>
 License-Expression: Apache-2.0

{postgresql_charms_single_kernel-16.1.1 → postgresql_charms_single_kernel-16.1.2}/pyproject.toml

@@ -4,7 +4,7 @@
 [project]
 name = "postgresql-charms-single-kernel"
 description = "Shared and reusable code for PostgreSQL-related charms"
-version = "16.1.1"
+version = "16.1.2"
 readme = "README.md"
 license = "Apache-2.0"
 authors = [
@@ -23,11 +23,11 @@ lib = [
     "psycopg2>=2.9.10",
 ]
 format = [
-    "ruff==0.14.1"
+    "ruff==0.14.3"
 ]
 lint = [
     "codespell==2.4.1",
-    "pyright==1.1.406"
+    "pyright==1.1.407"
 ]
 unit = [
     "coverage[toml]==7.11.0; python_version >= '3.10'",

{postgresql_charms_single_kernel-16.1.1 → postgresql_charms_single_kernel-16.1.2}/single_kernel_postgresql/utils/postgresql.py

@@ -1885,7 +1885,7 @@ $$ LANGUAGE plpgsql security definer;"""  # noqa: S608
     def add_user_to_databases(
         self, user: str, databases: List[str], extra_user_roles: Optional[List[str]] = None
     ) -> None:
-        """Grant user access to database."""
+        """Grant user access to a database."""
         try:
             roles, _ = self._process_extra_user_roles(user, extra_user_roles)
             connect_stmt = []
@@ -1907,5 +1907,34 @@ $$ LANGUAGE plpgsql security definer;"""  # noqa: S608
                 for statement in connect_stmt:
                     cursor.execute(statement)
         except psycopg2.Error as e:
-            logger.error(f"Failed to create user: {e}")
+            logger.error(f"Failed to add user: {e}")
+            raise PostgreSQLUpdateUserError() from e
+
+    def remove_user_from_databases(self, user: str, databases: List[str]) -> None:
+        """Revoke user access to a database."""
+        try:
+            for database in databases:
+                with self._connect_to_database() as connection, connection.cursor() as cursor:
+                    cursor.execute(
+                        SQL("REVOKE CONNECT ON DATABASE {} FROM {};").format(
+                            Identifier(database), Identifier(user)
+                        )
+                    )
+                    cursor.execute(
+                        SQL("REVOKE {} FROM {};").format(
+                            Identifier(f"charmed_{database}_owner"), Identifier(user)
+                        )
+                    )
+                    cursor.execute(
+                        SQL("REVOKE {} FROM {};").format(
+                            Identifier(f"charmed_{database}_admin"), Identifier(user)
+                        )
+                    )
+                    cursor.execute(
+                        SQL("REVOKE {} FROM {};").format(
+                            Identifier(f"charmed_{database}_dml"), Identifier(user)
+                        )
+                    )
+        except psycopg2.Error as e:
+            logger.error(f"Failed to remove user: {e}")
             raise PostgreSQLUpdateUserError() from e