@@ -453,7 +453,7 @@ def _on_subject_requested(self, event: SubjectRequestedEvent):
453453
454454# Increment this PATCH version before using `charmcraft publish-lib` or reset
455455# to 0 if you are raising the major API version
456- LIBPATCH = 56
456+ LIBPATCH = 58
457457
458458PYDEPS = ["ops>=2.0.0" ]
459459
@@ -842,6 +842,11 @@ def _legacy_compat_find_secret_by_old_label(self) -> None:
842842 self ._secret_meta = self ._model .get_secret (label = label )
843843 except SecretNotFoundError :
844844 pass
845+ except ModelError as e :
846+ # Permission denied can be raised if the secret exists but is not yet granted to us.
847+ if "permission denied" in str (e ):
848+ return
849+ raise
845850 else :
846851 if label != self .label :
847852 self .current_label = label
@@ -876,6 +881,8 @@ def _legacy_migration_to_new_label_if_needed(self) -> None:
876881 except ModelError as err :
877882 if MODEL_ERRORS ["not_leader" ] not in str (err ):
878883 raise
884+ if "permission denied" not in str (err ):
885+ raise
879886 self .current_label = None
880887
881888 ##########################################################################
@@ -4268,6 +4275,14 @@ def _on_secret_changed_event(self, event: SecretChangedEvent):
42684275 if relation .app == self .charm .app :
42694276 logging .info ("Secret changed event ignored for Secret Owner" )
42704277
4278+ if relation .name != self .relation_data .relation_name :
4279+ logger .debug (
4280+ "Ignoring secret-changed from endpoint %s (expected %s)" ,
4281+ relation .name ,
4282+ self .relation_data .relation_name ,
4283+ )
4284+ return
4285+
42714286 remote_unit = None
42724287 for unit in relation .units :
42734288 if unit .app != self .charm .app :
@@ -5294,6 +5309,14 @@ def _on_secret_changed_event(self, event: SecretChangedEvent):
52945309 )
52955310 return
52965311
5312+ if relation .name != self .relation_data .relation_name :
5313+ logger .debug (
5314+ "Ignoring secret-changed from endpoint %s (expected %s)" ,
5315+ relation .name ,
5316+ self .relation_data .relation_name ,
5317+ )
5318+ return
5319+
52975320 if relation .app == self .charm .app :
52985321 logging .info ("Secret changed event ignored for Secret Owner" )
52995322
@@ -5556,6 +5579,14 @@ def _on_secret_changed_event(self, event: SecretChangedEvent):
55565579 )
55575580 return
55585581
5582+ if relation .name != self .relation_data .relation_name :
5583+ logger .debug (
5584+ "Ignoring secret-changed from endpoint %s (expected %s)" ,
5585+ relation .name ,
5586+ self .relation_data .relation_name ,
5587+ )
5588+ return
5589+
55595590 if relation .app == self .charm .app :
55605591 logging .info ("Secret changed event ignored for Secret Owner" )
55615592
@@ -5701,6 +5732,14 @@ def _on_secret_changed_event(self, event: SecretChangedEvent):
57015732 if relation .app == self .charm .app :
57025733 logging .info ("Secret changed event ignored for Secret Owner" )
57035734
5735+ if relation .name != self .relation_data .relation_name :
5736+ logger .debug (
5737+ "Ignoring secret-changed from endpoint %s (expected %s)" ,
5738+ relation .name ,
5739+ self .relation_data .relation_name ,
5740+ )
5741+ return
5742+
57045743 remote_unit = None
57055744 for unit in relation .units :
57065745 if unit .app != self .charm .app :
0 commit comments