pgbelt 0.5.4__tar.gz → 0.6.1__tar.gz

{pgbelt-0.5.4 → pgbelt-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pgbelt
-Version: 0.5.4
+Version: 0.6.1
 Summary: A CLI tool used to manage Postgres data migrations from beginning to end, for a single database or a fleet, leveraging pglogical replication.
 Author: Varjitt Jeeva
 Author-email: varjitt.jeeva@autodesk.com
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiofiles (>=0.8,<23.3)
 Requires-Dist: asyncpg (>=0.27,<0.30)
 Requires-Dist: pydantic (>=2.0,<3.0)

{pgbelt-0.5.4 → pgbelt-0.6.1}/pgbelt/cmd/teardown.py

@@ -79,15 +79,14 @@ async def teardown(
             teardown_node(src_root_pool, "pg1", src_logger),
             teardown_node(dst_root_pool, "pg2", dst_logger),
         )
+        await gather(
+            revoke_pgl(src_root_pool, conf.tables, src_logger),
+            revoke_pgl(dst_root_pool, conf.tables, dst_logger),
+        )
 
         if full:
             await sleep(15)
 
-            await gather(
-                revoke_pgl(src_root_pool, conf.tables, src_logger),
-                revoke_pgl(dst_root_pool, conf.tables, dst_logger),
-            )
-
             await gather(
                 teardown_pgl(src_root_pool, src_logger),
                 teardown_pgl(dst_root_pool, dst_logger),

{pgbelt-0.5.4 → pgbelt-0.6.1}/pgbelt/config/remote.py

@@ -154,7 +154,9 @@ async def resolve_remote_config(
         )
         return None
     except RemoteConfigError as e:
-        logger.error(f"Failed to resolve remote configuration for {db} {dc}. RemoteConfigError {e}")
+        logger.error(
+            f"Failed to resolve remote configuration for {db} {dc}. RemoteConfigError {e}"
+        )
         return None
     except ValidationError:
         logger.error(

{pgbelt-0.5.4 → pgbelt-0.6.1}/pgbelt/util/pglogical.py

@@ -209,20 +209,15 @@ async def teardown_replication_set(pool: Pool, logger: Logger) -> None:
 
 async def revoke_pgl(pool: Pool, tables: list[str], logger: Logger) -> None:
     """
-    Revoke data access permissions from pglogical
+    Revoke data access permissions from pglogical, and drop the pglogical role
     """
     logger.info("Revoking data access permissions from pglogical...")
     async with pool.acquire() as conn:
         async with conn.transaction():
             try:
-                if tables:
-                    await conn.execute(
-                        f"REVOKE ALL ON TABLE {','.join(tables)} FROM pglogical;"
-                    )
-                else:
-                    await conn.execute(
-                        "REVOKE ALL ON ALL TABLES IN SCHEMA public FROM pglogical;"
-                    )
+                await conn.execute(
+                    "REVOKE ALL ON ALL TABLES IN SCHEMA public FROM pglogical;"
+                )
                 await conn.execute(
                     "REVOKE ALL ON ALL SEQUENCES IN SCHEMA public FROM pglogical;"
                 )
@@ -233,10 +228,16 @@ async def revoke_pgl(pool: Pool, tables: list[str], logger: Logger) -> None:
                 else:
                     raise e
 
+    logger.info("Dropping pglogical role...")
+    async with pool.acquire() as conn:
+        async with conn.transaction():
+            await conn.execute("DROP ROLE IF EXISTS pglogical;")
+            logger.debug("Pglogical role dropped")
+
 
 async def teardown_pgl(pool: Pool, logger: Logger) -> None:
     """
-    If they exist, drop the pglogical extension and then the user
+    If they exist, drop the pglogical extension
     """
     logger.info("Dropping pglogical extension...")
     async with pool.acquire() as conn:
@@ -244,12 +245,6 @@ async def teardown_pgl(pool: Pool, logger: Logger) -> None:
             await conn.execute("DROP EXTENSION IF EXISTS pglogical;")
             logger.debug("Pglogical extension dropped")
 
-    logger.info("Dropping pglogical user...")
-    async with pool.acquire() as conn:
-        async with conn.transaction():
-            await conn.execute("DROP ROLE IF EXISTS pglogical;")
-            logger.debug("Pglogical user dropped")
-
 
 async def subscription_status(pool: Pool, logger: Logger) -> str:
     """

{pgbelt-0.5.4 → pgbelt-0.6.1}/pgbelt/util/postgres.py

@@ -74,7 +74,6 @@ async def compare_data(
     await dst_pool.execute("SET extra_float_digits TO 0;")
 
     for table in set(pkeys):
-
         # If specific table list is defined and iterated table is not in that list, skip.
         if tables and (table not in tables):
             continue

{pgbelt-0.5.4 → pgbelt-0.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pgbelt"
-version = "0.5.4"
+version = "0.6.1"
 description = "A CLI tool used to manage Postgres data migrations from beginning to end, for a single database or a fleet, leveraging pglogical replication."
 authors = ["Varjitt Jeeva <varjitt.jeeva@autodesk.com>"]
 readme = "README.md"
@@ -18,14 +18,14 @@ tabulate = "^0.9.0"
 typer = "^0.9.0"
 
 [tool.poetry.dev-dependencies]
-black = "~23.11.0"
-pre-commit = "~3.5.0"
-flake8 = "^6.0.0"
+black = "~23.12.1"
+pre-commit = "~3.6.0"
+flake8 = "^7.0.0"
 pytest-cov = "~4.1.0"
-pytest = "^7.4.3"
-coverage = {extras = ["toml"], version = "^7.2"}
+pytest = "^7.4.4"
+coverage = {extras = ["toml"], version = "^7.4"}
 safety = "^2.3.1"
-mypy = "^1.6"
+mypy = "^1.8"
 xdoctest = {extras = ["colors"], version = "^1.1.2"}
 flake8-bandit = "~4.1.1"
 flake8-bugbear = ">=21.9.2"
@@ -35,10 +35,10 @@ pep8-naming = "^0.13.2"
 darglint = "^1.8.1"
 reorder-python-imports = "^3.9.0"
 pre-commit-hooks = "^4.5.0"
-Pygments = "^2.13.0"
+Pygments = "^2.17.2"
 pyupgrade = "^3.15.0"
-pylint = "^3.0.2"
-pytest-asyncio = "~0.21.0"
+pylint = "^3.0.3"
+pytest-asyncio = "~0.23.3"
 
 [build-system]
 requires = ["poetry-core>=1.0.0", "setuptools"]