chartreuse 6.1.0__tar.gz → 7.0.0.dev0__tar.gz

{chartreuse-6.1.0/src/chartreuse.egg-info → chartreuse-7.0.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartreuse
-Version: 6.1.0
+Version: 7.0.0.dev0
 Summary: Helper for Alembic migrations within Kubernetes.
 Author-email: wiremind <dev@wiremind.io>
 License-Expression: LGPL-3.0-or-later
@@ -9,7 +9,7 @@ Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENCE.md
 Requires-Dist: alembic
-Requires-Dist: psycopg2
+Requires-Dist: psycopg[binary]
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: PyYAML
 Requires-Dist: wiremind-kubernetes~=7.0

chartreuse-7.0.0.dev0/VERSION

@@ -0,0 +1 @@
+7.0.0-dev0

{chartreuse-6.1.0 → chartreuse-7.0.0.dev0}/pyproject.toml

@@ -11,7 +11,7 @@ requires-python = ">=3.11.0"
 
 dependencies = [
   "alembic",
-  "psycopg2",
+  "psycopg[binary]",
   "pydantic>=2.0.0",
   "PyYAML",
   "wiremind-kubernetes~=7.0",
@@ -76,4 +76,4 @@ known-first-party = ["chartreuse"]
 log_level = "INFO"
 # Deterministic ordering for tests; useful for pytest-xdist.
 env = ["PYTHONHASHSEED=0"]
-filterwarnings = ["ignore::pytest.PytestUnknownMarkWarning"]
+filterwarnings = ["ignore::pytest.PytestUnknownMarkWarning"]

{chartreuse-6.1.0 → chartreuse-7.0.0.dev0}/src/chartreuse/chartreuse.py

@@ -49,7 +49,6 @@ class Chartreuse:
                 allow_migration_for_empty_database=db_config.allow_migration_for_empty_database,
                 additional_parameters=additional_params,
                 alembic_section_name=db_name,
-                is_patroni_postgresql=db_config.is_patroni_postgresql,
             )
             self.migration_helpers[db_name] = helper
 

{chartreuse-6.1.0 → chartreuse-7.0.0.dev0}/src/chartreuse/config_loader.py

@@ -28,7 +28,6 @@ class DatabaseConfig(BaseModel):
     # Optional migration settings
     allow_migration_for_empty_database: bool = Field(default=True, description="Allow migrations on empty database")
     additional_parameters: str = Field(default="", description="Additional Alembic parameters")
-    is_patroni_postgresql: bool = Field(default=False, description="Whether this is a Patroni PostgreSQL database")
 
     @computed_field
     @property
@@ -40,7 +39,7 @@ class DatabaseConfig(BaseModel):
     @classmethod
     def validate_dialect(cls, v: str) -> str:
         """Validate database dialect."""
-        supported_dialects = ["postgresql", "clickhouse"]
+        supported_dialects = ["postgresql+psycopg", "mysql", "sqlite", "oracle", "mssql", "clickhouse"]
         if v.lower() not in supported_dialects:
             logger.warning("Dialect '%s' might not be supported. Supported dialects: %s", v, supported_dialects)
         return v
@@ -87,7 +86,7 @@ def load_multi_database_config(config_path: str) -> dict[str, DatabaseConfig]:
     ```yaml
     databases:
       main:  # Database name/identifier
-        dialect: postgresql
+        dialect: postgresql+psycopg
         user: app_user
         password: app_password
         host: postgres-main
@@ -97,11 +96,10 @@ def load_multi_database_config(config_path: str) -> dict[str, DatabaseConfig]:
         alembic_config_file_path: alembic.ini
         allow_migration_for_empty_database: true
         additional_parameters: ""
-        is_patroni_postgresql: false
 
       # For single database setups, just include one database:
       # analytics:
-      #   dialect: postgresql
+      #   dialect: postgresql+psycopg
       #   user: analytics_user
       #   password: analytics_password
       #   host: postgres-analytics
@@ -111,7 +109,6 @@ def load_multi_database_config(config_path: str) -> dict[str, DatabaseConfig]:
       #   alembic_config_file_path: alembic.ini
       #   allow_migration_for_empty_database: false
       #   additional_parameters: ""
-      #   is_patroni_postgresql: true
     ```
     """
     try:

{chartreuse-6.1.0 → chartreuse-7.0.0.dev0}/src/chartreuse/utils/alembic_migration_helper.py

@@ -1,13 +1,10 @@
 import logging
-import os
 import re
 from configparser import ConfigParser
 from subprocess import SubprocessError
-from time import sleep, time
 
 import sqlalchemy
-from sqlalchemy import inspect, text
-from sqlalchemy.pool import NullPool
+from sqlalchemy import inspect
 from wiremind_kubernetes.utils import run_command
 
 logger = logging.getLogger(__name__)
@@ -26,7 +23,6 @@ class AlembicMigrationHelper:
         configure: bool = True,
         # skip_db_checks is used for testing purposes only
         skip_db_checks: bool = False,
-        is_patroni_postgresql: bool = False,
     ):
         if not database_url:
             raise ValueError("database_url not set, not upgrading database.")
@@ -38,12 +34,6 @@ class AlembicMigrationHelper:
         self.alembic_config_file_path = alembic_config_file_path
         self.alembic_section_name = alembic_section_name
         self.skip_db_checks = skip_db_checks
-        self.is_patroni_postgresql = is_patroni_postgresql
-
-        # Chartreuse will upgrade a PG managed/configured by postgres-operator
-        if self.is_patroni_postgresql and not skip_db_checks:
-            self.additional_parameters += " -x patroni_postgresql=yes"
-            self._wait_postgres_is_configured()
 
         if configure:
             self._configure()
@@ -73,53 +63,6 @@ class AlembicMigrationHelper:
 
         logger.info("alembic.ini was configured for section %s.", self.alembic_section_name)
 
-    def _wait_postgres_is_configured(self) -> None:
-        """
-        Make sure the user `wiremind_owner_user` was created by the postgres-operator
-        and that default privileges were configured.
-        # TODO: Maybe make this a readinessProbe on Patroni PG Pods
-        # We need to remove this, it's an open source tool...
-        """
-        wait_timeout = int(os.getenv("CHARTREUSE_ALEMBIC_POSTGRES_WAIT_CONFIGURED_TIMEOUT", 60))
-        engine = sqlalchemy.create_engine(self.database_url, poolclass=NullPool, connect_args={"connect_timeout": 1})
-
-        default_privileges_checks: list[str] = [
-            "SET ROLE wiremind_owner",  # The real owner, alembic will switch to it before running migrations.
-            "CREATE TABLE _chartreuse_test_default_privileges(id serial)",
-            "SET ROLE wiremind_writer_user",
-            "INSERT INTO _chartreuse_test_default_privileges VALUES(1)",  # id = 1
-            "SET ROLE wiremind_reader_user",
-            "SELECT id from _chartreuse_test_default_privileges",
-        ]
-        start_time = time()
-
-        while time() - start_time < wait_timeout:
-            try:
-                # Yes, we may create a connection each time.
-                with engine.connect() as connection:
-                    transac = connection.begin()
-                    # TODO: Use scalar_one() once sqlachemly >= 1.4
-                    _id = connection.execute(text(";".join(default_privileges_checks))).scalar()
-                    assert _id == 1
-                    transac.rollback()
-                logger.info(
-                    "The role wiremind_owner_user was created and the default privileges"
-                    " were set by the postgres-operator."
-                )
-                return
-            except Exception as e:
-                # TODO: Learn about exceptions that should be caught here, otherwise we'll wait for nothing
-                logger.info("Caught: %s", e)
-                logger.info(
-                    "Waiting for the postgres-operator to create the user wiremind_owner_user"
-                    " (that alembic and I use) and to set default privileges..."
-                )
-                sleep(2)
-        raise Exception(
-            f"I'm fed up! Waited {wait_timeout}s for postgres-operator to configure the"
-            f" Postgres database. Check the Postgres logs and then postgres-operator for anything fishy."
-        )
-
     def _get_table_list(self) -> list[str]:
         return inspect(sqlalchemy.create_engine(self.database_url)).get_table_names()
 

{chartreuse-6.1.0 → chartreuse-7.0.0.dev0/src/chartreuse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartreuse
-Version: 6.1.0
+Version: 7.0.0.dev0
 Summary: Helper for Alembic migrations within Kubernetes.
 Author-email: wiremind <dev@wiremind.io>
 License-Expression: LGPL-3.0-or-later
@@ -9,7 +9,7 @@ Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENCE.md
 Requires-Dist: alembic
-Requires-Dist: psycopg2
+Requires-Dist: psycopg[binary]
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: PyYAML
 Requires-Dist: wiremind-kubernetes~=7.0

{chartreuse-6.1.0 → chartreuse-7.0.0.dev0}/src/chartreuse.egg-info/requires.txt

@@ -1,5 +1,5 @@
 alembic
-psycopg2
+psycopg[binary]
 pydantic>=2.0.0
 PyYAML
 wiremind-kubernetes~=7.0

chartreuse-6.1.0/VERSION

@@ -1 +0,0 @@
-6.1.0