Skip to content

Commit 6f8e54e

Browse files
Fix lack of new file/folder creation when moving from v0 to v1 for postgresql charm lib (#937)
1 parent 2bb989c commit 6f8e54e

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

lib/charms/postgresql_k8s/v0/postgresql.py renamed to lib/charms/postgresql_k8s/v1/postgresql.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ class PostgreSQLGrantDatabasePrivilegesToUserError(Exception):
138138
"""Exception raised when granting database privileges to user."""
139139

140140

141-
142141
class PostgreSQL:
143142
"""Class to encapsulate all operations related to interacting with PostgreSQL instance."""
144143

@@ -340,7 +339,6 @@ def create_user(
340339
logger.error(f"Failed to create user: {e}")
341340
raise PostgreSQLCreateUserError() from e
342341

343-
344342
def create_predefined_roles(self) -> None:
345343
"""Create predefined roles."""
346344
role_to_queries = {
@@ -380,13 +378,19 @@ def create_predefined_roles(self) -> None:
380378
logger.error(f"Failed to create predefined roles: {e}")
381379
raise PostgreSQLCreatePredefinedRolesError() from e
382380

383-
def grant_database_privileges_to_user(self, user: str, database: str, privileges: list[str]) -> None:
384-
"""Grant the specified priviliges on the provided database for the user."""
381+
def grant_database_privileges_to_user(
382+
self, user: str, database: str, privileges: list[str]
383+
) -> None:
384+
"""Grant the specified privileges on the provided database for the user."""
385385
try:
386386
with self._connect_to_database() as connection, connection.cursor() as cursor:
387-
cursor.execute(SQL("GRANT {} ON DATABASE {} TO {};").format(Identifier(", ".join(privileges)), Identifier(database), Identifier(user)))
387+
cursor.execute(
388+
SQL("GRANT {} ON DATABASE {} TO {};").format(
389+
Identifier(", ".join(privileges)), Identifier(database), Identifier(user)
390+
)
391+
)
388392
except psycopg2.Error as e:
389-
logger.error(f"Faield to grant privileges to user: {e}")
393+
logger.error(f"Failed to grant privileges to user: {e}")
390394
raise PostgreSQLGrantDatabasePrivilegesToUserError() from e
391395

392396
def delete_user(self, user: str) -> None:

src/charm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from charms.data_platform_libs.v1.data_models import TypedCharmBase
3030
from charms.grafana_agent.v0.cos_agent import COSAgentProvider, charm_tracing_config
3131
from charms.operator_libs_linux.v2 import snap
32-
from charms.postgresql_k8s.v0.postgresql import (
32+
from charms.postgresql_k8s.v1.postgresql import (
3333
ACCESS_GROUP_IDENTITY,
3434
ACCESS_GROUPS,
3535
REQUIRED_PLUGINS,

src/relations/postgresql_provider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
DatabaseProvides,
1111
DatabaseRequestedEvent,
1212
)
13-
from charms.postgresql_k8s.v0.postgresql import (
13+
from charms.postgresql_k8s.v1.postgresql import (
1414
ACCESS_GROUP_RELATION,
1515
ACCESS_GROUPS,
1616
INVALID_EXTRA_USER_ROLE_BLOCKING_MESSAGE,

tests/unit/test_charm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import pytest
1414
import tomli
1515
from charms.operator_libs_linux.v2 import snap
16-
from charms.postgresql_k8s.v0.postgresql import (
16+
from charms.postgresql_k8s.v1.postgresql import (
1717
PostgreSQLCreateUserError,
1818
PostgreSQLEnableDisableExtensionError,
1919
)
@@ -922,7 +922,7 @@ def test_on_update_status_after_restore_operation(harness):
922922
) as _handle_processes_failures,
923923
patch("charm.PostgreSQLBackups.can_use_s3_repository") as _can_use_s3_repository,
924924
patch(
925-
"charms.postgresql_k8s.v0.postgresql.PostgreSQL.get_current_timeline"
925+
"charms.postgresql_k8s.v1.postgresql.PostgreSQL.get_current_timeline"
926926
) as _get_current_timeline,
927927
patch("charm.PostgresqlOperatorCharm.update_config") as _update_config,
928928
patch("charm.Patroni.member_started", new_callable=PropertyMock) as _member_started,

tests/unit/test_postgresql_provider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from unittest.mock import Mock, PropertyMock, patch
55

66
import pytest
7-
from charms.postgresql_k8s.v0.postgresql import (
7+
from charms.postgresql_k8s.v1.postgresql import (
88
ACCESS_GROUP_RELATION,
99
PostgreSQLCreateDatabaseError,
1010
PostgreSQLCreateUserError,

0 commit comments

Comments
 (0)