Skip to content

[MISC] Always check peer data for legacy secrets #466

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

Merged
merged 2 commits into from
Jun 6, 2024
Merged

[MISC] Always check peer data for legacy secrets #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8485fca
Always check peer data for legacy secrets
dragomirp May 2, 2024
bd72c3a
Merge branch 'main' into translate-all-fields
dragomirp Jun 5, 2024
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
9 changes: 2 additions & 7 deletions src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,7 @@ def get_secret(self, scope: Scopes, key: str) -> Optional[str]:

secret_key = self._translate_field_to_secret_key(key)
# Old translation in databag is to be taken
if key != secret_key and (
result := self.peer_relation_data(scope).fetch_my_relation_field(peers.id, key)
):
if result := self.peer_relation_data(scope).fetch_my_relation_field(peers.id, key):
return result

return self.peer_relation_data(scope).get_secret(peers.id, secret_key)
Expand All @@ -279,10 +277,7 @@ def set_secret(self, scope: Scopes, key: str, value: Optional[str]) -> Optional[
peers = self.model.get_relation(PEER)
secret_key = self._translate_field_to_secret_key(key)
# Old translation in databag is to be deleted
if key != secret_key and self.peer_relation_data(scope).fetch_my_relation_field(
peers.id, key
):
self.peer_relation_data(scope).delete_relation_data(peers.id, [key])
self.peer_relation_data(scope).delete_relation_data(peers.id, [key])
self.peer_relation_data(scope).set_secret(peers.id, secret_key, value)

def remove_secret(self, scope: Scopes, key: str) -> None:
Expand Down
1 change: 0 additions & 1 deletion tests/unit/test_charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ def test_on_postgresql_pebble_ready_no_connection(harness):

def test_on_get_password(harness):
# Create a mock event and set passwords in peer relation data.
harness.set_leader(True)
mock_event = MagicMock(params={})
rel_id = harness.model.get_relation(PEER).id
harness.update_relation_data(
Expand Down