From ec502d5bc1c5f1e1f499ba90784bb7cce564065c Mon Sep 17 00:00:00 2001 From: Dragomir Penev Date: Wed, 17 Jul 2024 15:28:58 +0300 Subject: [PATCH] Always check databag --- src/charm.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/charm.py b/src/charm.py index 351609aad4..b0422a6f0c 100755 --- a/src/charm.py +++ b/src/charm.py @@ -294,9 +294,7 @@ def get_secret(self, scope: Scopes, key: str) -> Optional[str]: return None 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) @@ -312,10 +310,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: