postgresql-charms-single-kernel 16.3.4__tar.gz → 16.3.6__tar.gz

{postgresql_charms_single_kernel-16.3.4 → postgresql_charms_single_kernel-16.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: postgresql-charms-single-kernel
-Version: 16.3.4
+Version: 16.3.6
 Summary: Shared and reusable code for PostgreSQL-related charms
 Author: Canonical Data Platform
 Author-email: Canonical Data Platform <data-platform@lists.launchpad.net>
@@ -212,6 +212,8 @@ Classifier: Operating System :: POSIX :: Linux
 Requires-Dist: ops>=2.0.0
 Requires-Dist: tenacity>=9.0.0
 Requires-Dist: psycopg2>=2.9.10 ; extra == 'db-driver'
+Requires-Dist: lightkube>=0.21.0 ; python_full_version >= '3.12' and extra == 'k8s'
+Requires-Dist: lightkube-models>=1.28.1.4 ; python_full_version >= '3.12' and extra == 'k8s'
 Requires-Dist: httpx ; python_full_version >= '3.12' and extra == 'postgresql'
 Requires-Dist: data-platform-helpers>=0.1.7 ; python_full_version >= '3.12' and extra == 'postgresql'
 Requires-Dist: charmlibs-pathops>=1.0.1 ; python_full_version >= '3.12' and extra == 'postgresql'
@@ -228,6 +230,7 @@ Requires-Dist: charmlibs-snap>=1.0.1 ; python_full_version >= '3.12' and extra =
 Requires-Dist: charmlibs-systemd>=1.0.0.post0 ; python_full_version >= '3.12' and extra == 'vm'
 Requires-Python: >=3.8, <4.0
 Provides-Extra: db-driver
+Provides-Extra: k8s
 Provides-Extra: postgresql
 Provides-Extra: vm
 Description-Content-Type: text/markdown

postgresql_charms_single_kernel-16.3.6/pyproject.toml

@@ -0,0 +1,166 @@
+[project]
+name = "postgresql-charms-single-kernel"
+description = "Shared and reusable code for PostgreSQL-related charms"
+version = "16.3.6"
+readme = "README.md"
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "Operating System :: POSIX :: Linux",
+]
+requires-python = ">=3.8,<4.0"
+dependencies = [
+    "ops>=2.0.0",
+    "tenacity>=9.0.0",
+]
+
+[project.license]
+file = "LICENSE"
+
+[[project.authors]]
+name = "Canonical Data Platform"
+email = "data-platform@lists.launchpad.net"
+
+[project.optional-dependencies]
+postgresql = [
+    "httpx; python_version >= '3.12'",
+    "data-platform-helpers>=0.1.7; python_version >= '3.12'",
+    "charmlibs-pathops>=1.0.1; python_version >= '3.12'",
+    "charmlibs-interfaces-tls-certificates>=1.8.3; python_version >= '3.12'",
+    "charm-refresh; python_version >= '3.12'",
+    "requests; python_version >= '3.12'",
+    "tomli; python_version >= '3.12'",
+    "pydantic>=2.0; python_version >= '3.12'",
+    "jinja2 >=3.1.6; python_version >= '3.12'",
+    "charmlibs-rollingops>=1.1.1; python_version >= '3.12'",
+]
+vm = [
+    "pysyncobj>=0.3.15; python_version >= '3.12'",
+    "psutil>=7.2.2; python_version >= '3.12'",
+    "charmlibs-snap>=1.0.1; python_version >= '3.12'",
+    "charmlibs-systemd>=1.0.0.post0; python_version >= '3.12'",
+]
+k8s = [
+    "lightkube>=0.21.0; python_version >= '3.12'",
+    "lightkube-models>=1.28.1.4; python_version >= '3.12'",
+]
+db-driver = ["psycopg2>=2.9.10"]
+
+[build-system]
+requires = ["uv_build>=0.12.1,<0.13.0"]
+build-backend = "uv_build"
+
+[tool.uv]
+exclude-newer = "1 day"
+
+[tool.uv.build-backend]
+module-name = "single_kernel_postgresql"
+module-root = ""
+
+[tool.uv.dependency-groups.unit]
+requires-python = ">=3.12"
+
+[tool.uv.dependency-groups.lint]
+requires-python = ">=3.12"
+
+[tool.uv.dependency-groups.format]
+requires-python = ">=3.12"
+
+[tool.coverage.run]
+branch = true
+
+[tool.coverage.report]
+show_missing = true
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+log_cli_level = "INFO"
+
+[tool.ruff]
+preview = true
+target-version = "py312"
+src = [
+    "src",
+    ".",
+]
+line-length = 99
+
+[tool.ruff.lint]
+explicit-preview-rules = true
+select = [
+    "A",
+    "E",
+    "W",
+    "F",
+    "C",
+    "N",
+    "D",
+    "I001",
+    "B",
+    "CPY001",
+    "RUF",
+    "S",
+    "SIM",
+    "UP",
+    "TCH",
+]
+extend-ignore = [
+    "D203",
+    "D204",
+    "D213",
+    "D215",
+    "D400",
+    "D404",
+    "D406",
+    "D407",
+    "D408",
+    "D409",
+    "D413",
+]
+ignore = [
+    "E501",
+    "D107",
+]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = [
+    "D100",
+    "D101",
+    "D102",
+    "D103",
+    "D104",
+    "B011",
+    "S",
+]
+
+[tool.ruff.lint.flake8-copyright]
+author = "Canonical Ltd."
+notice-rgx = 'Copyright\s\d{4}([-,]\d{4})*\s+'
+min-file-size = 1
+
+[tool.ruff.lint.mccabe]
+max-complexity = 10
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.ty.environment]
+python = ".tox/lint/"
+python-version = "3.12"
+
+[tool.ty.src]
+exclude = [
+    "tests",
+    "single_kernel_postgresql/lib",
+]
+
+[dependency-groups]
+format = ["ruff==0.16.3"]
+lint = [
+    "codespell==2.4.3",
+    "ty==0.0.72",
+]
+unit = [
+    "coverage[toml]==7.15.4",
+    "pytest==9.1.1",
+]

postgresql_charms_single_kernel-16.3.4/pyproject.toml → postgresql_charms_single_kernel-16.3.6/pyproject.toml.orig

@@ -4,7 +4,7 @@
 [project]
 name = "postgresql-charms-single-kernel"
 description = "Shared and reusable code for PostgreSQL-related charms"
-version = "16.3.4"
+version = "16.3.6"
 readme = "README.md"
 license = {file = "LICENSE"}
 authors = [
@@ -40,12 +40,16 @@ vm = [
     "charmlibs-snap>=1.0.1; python_version >= '3.12'",
     "charmlibs-systemd>=1.0.0.post0; python_version >= '3.12'"
 ]
+k8s = [
+    "lightkube>=0.21.0; python_version >= '3.12'",
+    "lightkube-models>=1.28.1.4; python_version >= '3.12'",
+]
 db-driver = [
     "psycopg2>=2.9.10",
 ]
 
 [build-system]
-requires = ["uv_build>=0.11.0,<0.12.0"]
+requires = ["uv_build>=0.12.1,<0.13.0"]
 build-backend = "uv_build"
 
 [tool.uv]
@@ -57,14 +61,14 @@ module-root = ""
 
 [dependency-groups]
 format = [
-    "ruff==0.15.21"
+    "ruff==0.16.3"
 ]
 lint = [
-    "codespell==2.4.2",
-    "ty==0.0.59"
+    "codespell==2.4.3",
+    "ty==0.0.72"
 ]
 unit = [
-    "coverage[toml]==7.15.1",
+    "coverage[toml]==7.15.4",
     "pytest==9.1.1"
 ]
 

postgresql_charms_single_kernel-16.3.6/single_kernel_postgresql/charms/abstract_charm.py

@@ -0,0 +1,152 @@
+# Copyright 2025 Canonical Ltd.
+# See LICENSE file for licensing details.
+"""Skeleton for the abstract charm."""
+
+from abc import ABC, abstractmethod
+
+from data_platform_helpers.advanced_statuses import StatusHandler
+from ops import StatusBase
+from ops.charm import CharmBase
+
+from single_kernel_postgresql.core.state import CharmState
+from single_kernel_postgresql.events.database import DatabaseEventsHandler
+from single_kernel_postgresql.events.postgresql import PostgreSQLEventsHandler
+from single_kernel_postgresql.events.tls import TLS
+from single_kernel_postgresql.lib.charms.data_platform_libs.v0.data_interfaces import (
+    DatabaseProvides,
+)
+from single_kernel_postgresql.managers.cluster import ClusterManager
+from single_kernel_postgresql.managers.config import ConfigManager
+from single_kernel_postgresql.managers.database import DatabaseManager
+from single_kernel_postgresql.managers.patroni import PatroniManager
+from single_kernel_postgresql.managers.tls import TLSManager
+from single_kernel_postgresql.workload.base import BaseWorkload, ResourceProvider
+
+from ..config.enums import Substrates
+from ..config.literals import DATABASE
+from ..utils.postgresql import PostgreSQL
+
+
+class AbstractPostgreSQLCharm(CharmBase, ABC):
+    """An abstract PostgreSQL charm."""
+
+    def __init__(self, *args):
+        super().__init__(*args)
+
+        # State
+        self.state = CharmState(charm=self, substrate=self.substrate)
+
+        # TLS events handler owns the two certificate requirers; build it before the
+        # TLS manager so the manager can constructor-inject them for its live-fetch getters.
+        self.tls = TLS(self, self.state)
+
+        # Managers
+        self.tls_manager = TLSManager(
+            state=self.state,
+            workload=self.workload,
+            client_certificate=self.tls.client_certificate,
+            peer_certificate=self.tls.peer_certificate,
+        )
+        self.patroni_manager = PatroniManager(state=self.state, workload=self.workload)
+        self.cluster_manager = ClusterManager(state=self.state, workload=self.workload)
+
+        # Client-relation subsystem: the charm is the composition root, as with the
+        # other managers; the handler owns only the observers and guard/defer decisions.
+        self.database_manager = DatabaseManager(
+            state=self.state,
+            workload=self.workload,
+            database_provides=DatabaseProvides(self, relation_name=DATABASE),
+            set_unit_status=self.set_unit_status,
+        )
+        self.database = DatabaseEventsHandler(
+            self, self.state, self.database_manager, self.patroni_manager, self.tls_manager
+        )
+
+        self.config_manager = ConfigManager(
+            state=self.state,
+            workload=self.workload,
+            tls_manager=self.tls_manager,
+            patroni_manager=self.patroni_manager,
+            database_manager=self.database_manager,
+            resource_provider=self.get_resource_provider,
+            request_restart=self.request_restart,
+            restart_services=self.restart_services,
+        )
+
+        # Events Handler
+        self.postgresql_events_handler = PostgreSQLEventsHandler(
+            self,
+            self.workload,
+            self.state,
+            self.cluster_manager,
+            self.tls_manager,
+            self.config_manager,
+            self.patroni_manager,
+        )
+
+        # Status Handler
+        self.status_handler = StatusHandler(
+            self,
+            self.cluster_manager,
+            self.tls_manager,
+            self.config_manager,
+            self.patroni_manager,
+        )
+
+    # Postgresql Client
+    @property
+    @abstractmethod
+    def postgresql(self) -> PostgreSQL:
+        """Return a PostgreSQL client."""
+        pass
+
+    # Postgresql Workload
+    @property
+    @abstractmethod
+    def workload(self) -> BaseWorkload:
+        """Access current workload."""
+        pass
+
+    # Postgresql Substrate
+    @property
+    @abstractmethod
+    def substrate(self) -> Substrates:
+        """Access current substrate."""
+        pass
+
+    # Charm-side bridges the lib calls back into. request_restart/restart_services are
+    # substrate-tangled and stay until their own migration phases; update_config still
+    # supplies the ldap/async/watcher values those phases own; primary_endpoint is the
+    # VM's Patroni-derived primary lookup. set_unit_status routes status writes through
+    # the charm_refresh priority gate and stays until the refresh logic itself migrates
+    # into the library, at which point the managers own their status writes.
+    @abstractmethod
+    def get_resource_provider(self) -> ResourceProvider:
+        """Return the substrate's (cpu_cores, memory_bytes) introspector."""
+        pass
+
+    @abstractmethod
+    def request_restart(self) -> None:
+        """Run the substrate pre-restart side effect and acquire the restart lock."""
+        pass
+
+    @abstractmethod
+    def restart_services(self) -> None:
+        """Restart the monitoring and LDAP-sync sidecar services."""
+        pass
+
+    @abstractmethod
+    def set_unit_status(self, status: StatusBase) -> None:
+        """Set the unit status without overriding a higher-priority refresh status."""
+        pass
+
+    @abstractmethod
+    def update_config(self) -> bool:
+        """Re-render the Patroni configuration and apply it."""
+        pass
+
+    @property
+    @abstractmethod
+    def primary_endpoint(self) -> str | None:
+        """Address of the cluster primary, or None when there is not one."""
+        pass

{postgresql_charms_single_kernel-16.3.4 → postgresql_charms_single_kernel-16.3.6}/single_kernel_postgresql/charms/k8s_charm.py

@@ -6,6 +6,8 @@
 
 import logging
 
+from ops import StatusBase
+
 from single_kernel_postgresql.charms.abstract_charm import AbstractPostgreSQLCharm, PostgreSQL
 from single_kernel_postgresql.config.enums import Substrates
 from single_kernel_postgresql.config.literals import CONTAINER_NAME, SYSTEM_USERS, USER
@@ -52,7 +54,8 @@ class PostgreSQLK8sCharm(AbstractPostgreSQLCharm):
             BaseWorkload: The K8sWorkload instance for this charm
         """
         return K8sWorkload(
-            charm_dir=self.charm_dir, container=self.unit.get_container(CONTAINER_NAME)
+            charm_dir=self.charm_dir,
+            container=self.unit.get_container(CONTAINER_NAME),
         )
 
     @property
@@ -63,3 +66,29 @@ class PostgreSQLK8sCharm(AbstractPostgreSQLCharm):
             Substrates: always Substrates.K8S for this charm
         """
         return Substrates.K8S
+
+    # The concrete production charm owns these bridges (update_scrape_job_spec +
+    # acquire_lock, pebble metrics/ldap restarts, the refresh-aware status write and the
+    # config re-render), so they are minimal here.
+    def get_resource_provider(self) -> K8sManager:
+        """Return the substrate's (cpu_cores, memory_bytes) introspector."""
+        return self.k8s_manager
+
+    def request_restart(self) -> None:
+        """Run the substrate pre-restart side effect and acquire the restart lock."""
+
+    def restart_services(self) -> None:
+        """Restart the monitoring and LDAP-sync sidecar services."""
+
+    def set_unit_status(self, status: StatusBase) -> None:
+        """Set the unit status without overriding a higher-priority refresh status."""
+        self.unit.status = status
+
+    def update_config(self) -> bool:
+        """Re-render the Patroni configuration and apply it."""
+        return self.config_manager.update_config(self.postgresql)
+
+    @property
+    def primary_endpoint(self) -> str | None:
+        """Address of the cluster primary's Service."""
+        return self.state.primary_endpoint

{postgresql_charms_single_kernel-16.3.4 → postgresql_charms_single_kernel-16.3.6}/single_kernel_postgresql/charms/vm_charm.py

@@ -6,10 +6,11 @@
 
 import logging
 
+from ops import StatusBase
+
 from single_kernel_postgresql.charms.abstract_charm import AbstractPostgreSQLCharm, PostgreSQL
 from single_kernel_postgresql.config.enums import Substrates
 from single_kernel_postgresql.config.literals import SYSTEM_USERS, USER
-from single_kernel_postgresql.workload.base import BaseWorkload
 from single_kernel_postgresql.workload.vm import VMWorkload
 
 logger = logging.getLogger(__name__)
@@ -38,13 +39,13 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
         )
 
     @property
-    def workload(self) -> BaseWorkload:
+    def workload(self) -> VMWorkload:
         """Access current workload instance.
 
         Returns the workload object.
 
         Returns:
-            BaseWorkload: The VMWorkload instance for this charm
+            VMWorkload: The VMWorkload instance for this charm
         """
         return VMWorkload(charm_dir=self.charm_dir)
 
@@ -56,3 +57,30 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
             Substrates: always Substrates.VM for this charm
         """
         return Substrates.VM
+
+    # The concrete production charm owns these bridges (pops postgresql_restarted +
+    # acquire_lock, snap metrics/ldap restarts, the refresh-aware status write, the
+    # Patroni-derived primary lookup and the config re-render), so they are minimal here.
+    def get_resource_provider(self) -> VMWorkload:
+        """Return the substrate's (cpu_cores, memory_bytes) introspector."""
+        return self.workload
+
+    def request_restart(self) -> None:
+        """Run the substrate pre-restart side effect and acquire the restart lock."""
+
+    def restart_services(self) -> None:
+        """Restart the monitoring and LDAP-sync sidecar services."""
+
+    def set_unit_status(self, status: StatusBase) -> None:
+        """Set the unit status without overriding a higher-priority refresh status."""
+        self.unit.status = status
+
+    def update_config(self) -> bool:
+        """Re-render the Patroni configuration and apply it."""
+        return self.config_manager.update_config(self.postgresql)
+
+    @property
+    def primary_endpoint(self) -> str | None:
+        """Address of the cluster primary, or None when there is not one."""
+        primary = self.patroni_manager.get_primary()
+        return self.patroni_manager.get_member_ip(primary) if primary else None

{postgresql_charms_single_kernel-16.3.4 → postgresql_charms_single_kernel-16.3.6}/single_kernel_postgresql/config/exceptions.py

@@ -73,3 +73,7 @@ class SwitchoverNotSyncError(SwitchoverFailedError):
 
 class UpdateSyncNodeCountError(Exception):
     """Raised when updating synchronous_node_count failed for some reason."""
+
+
+class DeployedWithoutTrustError(Exception):
+    """Raised when the K8s API denies access because the app wasn't deployed with --trust."""

{postgresql_charms_single_kernel-16.3.4 → postgresql_charms_single_kernel-16.3.6}/single_kernel_postgresql/core/peer_relation.py

@@ -225,6 +225,48 @@ class PostgreSQLPeer(RelationState):
             return True
         return self.relation.data[self.unit].get("connectivity", "on") == "on"
 
+    @property
+    def config_hash(self) -> str | None:
+        """Get the last-applied PostgreSQL config hash from the peer relation data."""
+        if not self.relation:
+            return None
+        return self.relation.data[self.unit].get("config_hash")
+
+    @config_hash.setter
+    def config_hash(self, value: str) -> None:
+        """Set the last-applied PostgreSQL config hash in the peer relation data."""
+        if not self.relation:
+            return
+        self.relation.data[self.unit]["config_hash"] = value
+
+    @property
+    def user_hash(self) -> str | None:
+        """Get the last-applied users hash from the peer relation data."""
+        if not self.relation:
+            return None
+        return self.relation.data[self.unit].get("user_hash")
+
+    @user_hash.setter
+    def user_hash(self, value: str) -> None:
+        """Set the last-applied users hash in the peer relation data."""
+        if not self.relation:
+            return
+        self.relation.data[self.unit]["user_hash"] = value
+
+    @property
+    def tls(self) -> bool:
+        """Get the last-rendered TLS flag from the peer relation data."""
+        if not self.relation:
+            return False
+        return self.relation.data[self.unit].get("tls") == "enabled"
+
+    @tls.setter
+    def tls(self, value: bool) -> None:
+        """Set the last-rendered TLS flag in the peer relation data."""
+        if not self.relation:
+            return
+        self.relation.data[self.unit]["tls"] = "enabled" if value else ""
+
     @cached_property
     def data(self) -> MutableMapping[str, str]:
         """Escape hatch method to access the peer data directly."""
@@ -418,6 +460,20 @@ class PostgreSQLApplication(RelationState):
         """Return whether this unit has LDAP enabled."""
         return self.is_ldap_charm_related and self.is_cluster_initialised
 
+    @property
+    def user_hash(self) -> str | None:
+        """Get the last-applied users hash from the peer relation data."""
+        if not self.relation:
+            return None
+        return self.relation.data[self.app].get("user_hash")
+
+    @user_hash.setter
+    def user_hash(self, value: str) -> None:
+        """Set the last-applied users hash in the peer relation data."""
+        if not self.relation:
+            return
+        self.relation.data[self.app]["user_hash"] = value
+
     def get_secret(self, key: str) -> str | None:
         """Get the secret value for 'key' from the peer relation data."""
         if not self.relation:

{postgresql_charms_single_kernel-16.3.4 → postgresql_charms_single_kernel-16.3.6}/single_kernel_postgresql/core/state.py

@@ -235,6 +235,13 @@ class CharmState(Object):
             addresses.remove(current_unit_ip)
         return addresses
 
+    def unit_database_address(self, unit: Unit, relation_name: str = DATABASE) -> str | None:
+        """The client-facing address a peer unit published for the given relation."""
+        if not (peer_relation := self.peer_relation):
+            return None
+        with suppress(KeyError):
+            return peer_relation.data[unit].get(f"{relation_name}-address")
+
     @property
     def host(self) -> str:
         """Current unit host."""
@@ -526,3 +533,8 @@ class CharmState(Object):
     def primary_endpoint(self) -> str:
         """Returns the endpoint of the primary instance's service."""
         return self._build_service_name("primary")
+
+    @property
+    def replicas_endpoint(self) -> str:
+        """Returns the endpoint of the replicas instances' service."""
+        return self._build_service_name("replicas")