postgresql-charms-single-kernel 16.0.2__tar.gz → 16.1.0__tar.gz

{postgresql_charms_single_kernel-16.0.2 → postgresql_charms_single_kernel-16.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresql-charms-single-kernel
-Version: 16.0.2
+Version: 16.1.0
 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.0.2 → postgresql_charms_single_kernel-16.1.0}/postgresql_charms_single_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresql-charms-single-kernel
-Version: 16.0.2
+Version: 16.1.0
 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.0.2 → postgresql_charms_single_kernel-16.1.0}/pyproject.toml

@@ -4,7 +4,7 @@
 [project]
 name = "postgresql-charms-single-kernel"
 description = "Shared and reusable code for PostgreSQL-related charms"
-version = "16.0.2"
+version = "16.1.0"
 readme = "README.md"
 license = "Apache-2.0"
 authors = [
@@ -23,7 +23,7 @@ lib = [
     "psycopg2>=2.9.10",
 ]
 format = [
-    "ruff==0.13.1"
+    "ruff==0.13.2"
 ]
 lint = [
     "codespell==2.4.1",

{postgresql_charms_single_kernel-16.0.2 → postgresql_charms_single_kernel-16.1.0}/single_kernel_postgresql/abstract_charm.py

@@ -4,7 +4,7 @@
 
 from ops.charm import CharmBase
 
-from .config.literals import SYSTEM_USERS, USER
+from .config.literals import SYSTEM_USERS, USER, Substrates
 from .utils.postgresql import PostgreSQL
 
 
@@ -15,6 +15,7 @@ class AbstractPostgreSQLCharm(CharmBase):
         super().__init__(*args)
 
         self.postgresql = PostgreSQL(
+            substrate=Substrates.VM,
             primary_host="localhost",
             current_host="localhost",
             user=USER,

{postgresql_charms_single_kernel-16.0.2 → postgresql_charms_single_kernel-16.1.0}/single_kernel_postgresql/config/literals.py

@@ -5,6 +5,8 @@
 This module should contain the literals used in the charms (paths, enums, etc).
 """
 
+from enum import Enum
+
 # Permissions.
 POSTGRESQL_STORAGE_PERMISSIONS = 0o700
 
@@ -19,3 +21,10 @@ REWIND_USER = "rewind"
 SNAP_USER = "_daemon_"
 USER = "operator"
 SYSTEM_USERS = [MONITORING_USER, REPLICATION_USER, REWIND_USER, USER]
+
+
+class Substrates(str, Enum):
+    """Possible substrates."""
+
+    K8S = "k8s"
+    VM = "vm"

{postgresql_charms_single_kernel-16.0.2 → postgresql_charms_single_kernel-16.1.0}/single_kernel_postgresql/utils/postgresql.py

@@ -30,7 +30,13 @@ import psycopg2
 from ops import ConfigData
 from psycopg2.sql import SQL, Identifier, Literal
 
-from ..config.literals import BACKUP_USER, POSTGRESQL_STORAGE_PERMISSIONS, SNAP_USER, SYSTEM_USERS
+from ..config.literals import (
+    BACKUP_USER,
+    POSTGRESQL_STORAGE_PERMISSIONS,
+    SNAP_USER,
+    SYSTEM_USERS,
+    Substrates,
+)
 from .filesystem import change_owner
 
 # Groups to distinguish HBA access
@@ -60,6 +66,7 @@ ALLOWED_ROLES = {
 }
 
 INVALID_DATABASE_NAME_BLOCKING_MESSAGE = "invalid database name"
+INVALID_DATABASE_NAMES = ["databases", "postgres", "template0", "template1"]
 INVALID_EXTRA_USER_ROLE_BLOCKING_MESSAGE = "invalid role(s) for extra user roles"
 
 REQUIRED_PLUGINS = {
@@ -216,6 +223,7 @@ class PostgreSQL:
 
     def __init__(
         self,
+        substrate: Substrates,
         primary_host: Optional[str],
         current_host: Optional[str],
         user: str,
@@ -223,6 +231,18 @@ class PostgreSQL:
         database: str,
         system_users: Optional[List[str]] = None,
     ):
+        """Create a PostgreSQL helper.
+
+        Args:
+            substrate: substrate where the charm is running (Substrates.K8S or Substrates.VM).
+            primary_host: hostname or address for primary database host.
+            current_host: hostname or address for the current database host.
+            user: username to connect as.
+            password: password for the user.
+            database: default database name.
+            system_users: list of system users.
+        """
+        self.substrate = substrate
         self.primary_host = primary_host
         self.current_host = current_host
         self.user = user
@@ -322,7 +342,7 @@ class PostgreSQL:
         if len(database) > 49:
             logger.error(f"Invalid database name (it must not exceed 49 characters): {database}.")
             raise PostgreSQLCreateDatabaseError(INVALID_DATABASE_NAME_BLOCKING_MESSAGE)
-        if database in ["postgres", "template0", "template1"]:
+        if database in INVALID_DATABASE_NAMES:
             logger.error(f"Invalid database name: {database}.")
             raise PostgreSQLCreateDatabaseError(INVALID_DATABASE_NAME_BLOCKING_MESSAGE)
         plugins = plugins if plugins else []
@@ -1077,7 +1097,7 @@ class PostgreSQL:
             if temp_location is not None:
                 # Fix permissions on the temporary tablespace location when a reboot happens and tmpfs is being used.
                 temp_location_stats = os.stat(temp_location)
-                if (
+                if self.substrate == Substrates.VM and (
                     pwd.getpwuid(temp_location_stats.st_uid).pw_name != SNAP_USER
                     or int(temp_location_stats.st_mode & 0o777) != POSTGRESQL_STORAGE_PERMISSIONS
                 ):