Skip to content

Adapt charm for data interfaces V1 #1129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: 16/edge
Choose a base branch
from
Draft

Adapt charm for data interfaces V1 #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,429 changes: 0 additions & 5,429 deletions lib/charms/data_platform_libs/v0/data_interfaces.py
View file
Open in desktop

This file was deleted.

2,796 changes: 2,796 additions & 0 deletions lib/charms/data_platform_libs/v1/data_interfaces.py
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 23 additions & 30 deletions src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@
main(WrongArchitectureWarningCharm, use_juju_for_storage=True)
raise

from charms.data_platform_libs.v0.data_interfaces import DataPeerData, DataPeerUnitData
from charms.data_platform_libs.v1.data_interfaces import (
OpsPeerRepository,
OpsPeerUnitRepository,
SecretGroup,
)
from charms.data_platform_libs.v1.data_models import TypedCharmBase
from charms.grafana_k8s.v0.grafana_dashboard import GrafanaDashboardProvider
from charms.loki_k8s.v1.loki_push_api import LogProxyConsumer
Expand Down Expand Up @@ -117,8 +121,6 @@
REPLICATION_USER,
REWIND_PASSWORD_KEY,
REWIND_USER,
SECRET_DELETED_LABEL,
SECRET_INTERNAL_LABEL,
SECRET_KEY_OVERRIDES,
SPI_MODULE,
SYSTEM_USERS,
Expand Down Expand Up @@ -207,17 +209,15 @@ def __init__(self, *args):
self.unit.status = BlockedStatus("Disabled")
sys.exit(0)

self.peer_relation_app = DataPeerData(
self.peer_relation_app = OpsPeerRepository(
self.model,
relation_name=PEER,
secret_field_name=SECRET_INTERNAL_LABEL,
deleted_label=SECRET_DELETED_LABEL,
self._peers,
self.app,
)
self.peer_relation_unit = DataPeerUnitData(
self.peer_relation_unit = OpsPeerUnitRepository(
self.model,
relation_name=PEER,
secret_field_name=SECRET_INTERNAL_LABEL,
deleted_label=SECRET_DELETED_LABEL,
self._peers,
self.unit,
)

self.postgresql_service = "postgresql"
Expand Down Expand Up @@ -356,7 +356,7 @@ def _scope_obj(self, scope: Scopes):
if scope == UNIT_SCOPE:
return self.unit

def peer_relation_data(self, scope: Scopes) -> DataPeerData:
def peer_relation_data(self, scope: Scopes) -> OpsPeerRepository:
"""Returns the peer relation data per scope."""
if scope == APP_SCOPE:
return self.peer_relation_app
Expand All @@ -374,37 +374,26 @@ def get_secret(self, scope: Scopes, key: str) -> str | None:
if scope not in get_args(Scopes):
raise RuntimeError("Unknown secret scope.")

if not (peers := self.model.get_relation(PEER)):
return None

secret_key = self._translate_field_to_secret_key(key)
return self.peer_relation_data(scope).get_secret(peers.id, secret_key)
return self.peer_relation_data(scope).get_secret_field(secret_key, SecretGroup("extra"))

def set_secret(self, scope: Scopes, key: str, value: str | None) -> str | None:
"""Set secret from the secret storage."""
if scope not in get_args(Scopes):
raise RuntimeError("Unknown secret scope.")

if not value:
return self.remove_secret(scope, key)

if not (peers := self.model.get_relation(PEER)):
return None

secret_key = self._translate_field_to_secret_key(key)
self.peer_relation_data(scope).set_secret(peers.id, secret_key, value)
self.peer_relation_data(scope).write_secret_field(
secret_key, value if value is not None else "", SecretGroup("extra")
)

def remove_secret(self, scope: Scopes, key: str) -> None:
"""Removing a secret."""
if scope not in get_args(Scopes):
raise RuntimeError("Unknown secret scope.")

if not (peers := self.model.get_relation(PEER)):
return None

secret_key = self._translate_field_to_secret_key(key)

self.peer_relation_data(scope).delete_relation_data(peers.id, [secret_key])
self.peer_relation_data(scope).delete_secret_field(secret_key, SecretGroup("extra"))

def get_secret_from_id(self, secret_id: str) -> dict[str, str]:
"""Resolve the given id of a Juju secret and return the content as a dict.
Expand Down Expand Up @@ -2414,10 +2403,13 @@ def relations_user_databases_map(self) -> dict:
for relation in self.model.relations[self.postgresql_client_relation.relation_name]:
user = custom_username_mapping.get(str(relation.id), f"relation_id_{relation.id}")
if user not in user_database_map and (
database := self.postgresql_client_relation.database_provides.fetch_relation_field(
database := self.postgresql_client_relation.get_other_app_relation_field(
relation.id, "database"
)
):
logger.error(
f"database: {database} for user: {user} not found in user_database_map, adding it"
)
user_database_map[user] = database
return user_database_map

Expand All @@ -2427,10 +2419,11 @@ def generate_user_hash(self) -> str:
user_db_pairs = {}
custom_username_mapping = self.postgresql_client_relation.get_username_mapping()
for relation in self.model.relations[self.postgresql_client_relation.relation_name]:
if database := self.postgresql_client_relation.database_provides.fetch_relation_field(
if database := self.postgresql_client_relation.get_other_app_relation_field(
relation.id, "database"
):
user = custom_username_mapping.get(str(relation.id), f"relation_id_{relation.id}")
logger.error(f"database: {database} for user: {user} added to user_db_pairs")
user_db_pairs[user] = database
return shake_128(str(user_db_pairs).encode()).hexdigest(16)

Expand Down
Loading
Loading