Try to disable pgaudit before changing exts

Author: dragomirp

lib/charms/postgresql_k8s/v0/postgresql.py

@@ -35,7 +35,7 @@
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 48
+LIBPATCH = 50
 
 # Groups to distinguish HBA access
 ACCESS_GROUP_IDENTITY = "identity_access"
@@ -435,6 +435,7 @@ def enable_disable_extensions(
             for extension, enable in extensions.items():
                 ordered_extensions[extension] = enable
 
+            self._configure_pgaudit(False)
             # Enable/disabled the extension in each database.
             for database in databases:
                 with self._connect_to_database(
@@ -446,14 +447,14 @@ def enable_disable_extensions(
                             if enable
                             else f"DROP EXTENSION IF EXISTS {extension};"
                         )
-            self._configure_pgaudit(ordered_extensions.get("pgaudit", False))
         except psycopg2.errors.UniqueViolation:
             pass
         except psycopg2.errors.DependentObjectsStillExist:
             raise
         except psycopg2.Error as e:
             raise PostgreSQLEnableDisableExtensionError() from e
         finally:
+            self._configure_pgaudit(ordered_extensions.get("pgaudit", False))
             if connection is not None:
                 connection.close()
 
@@ -626,6 +627,7 @@ def list_access_groups(self) -> Set[str]:
         Returns:
             List of PostgreSQL database access groups.
         """
+        connection = None
         try:
             with self._connect_to_database() as connection, connection.cursor() as cursor:
                 cursor.execute(
@@ -646,6 +648,7 @@ def list_users(self) -> Set[str]:
         Returns:
             List of PostgreSQL database users.
         """
+        connection = None
         try:
             with self._connect_to_database() as connection, connection.cursor() as cursor:
                 cursor.execute("SELECT usename FROM pg_catalog.pg_user;")
@@ -664,6 +667,7 @@ def list_users_from_relation(self) -> Set[str]:
         Returns:
             List of PostgreSQL database users.
         """
+        connection = None
         try:
             with self._connect_to_database() as connection, connection.cursor() as cursor:
                 cursor.execute(

tests/integration/test_plugins.py

@@ -96,7 +96,7 @@ async def test_plugins(ops_test: OpsTest, charm) -> None:
     # Build and deploy the PostgreSQL charm.
     async with ops_test.fast_forward():
         # TODO Figure out how to deal with pgaudit
-        await build_and_deploy(ops_test, charm, 2, extra_config={"plugin_audit_enable": "False"})
+        await build_and_deploy(ops_test, charm, 2)
 
     sql_tests = {
         "plugin_citext_enable": CITEXT_EXTENSION_STATEMENT,