PR feedback

lib/charms/mongodb/v0/config_server_interface.py

@@ -14,7 +14,7 @@
 )
 from charms.mongodb.v1.helpers import add_args_to_env, get_mongos_args
 from charms.mongodb.v1.mongos import MongosConnection
-from ops.charm import CharmBase, EventBase
+from ops.charm import CharmBase, EventBase, RelationBrokenEvent
 from ops.framework import Object
 from ops.model import ActiveStatus, MaintenanceStatus, WaitingStatus
 
@@ -233,10 +233,9 @@ def _on_relation_changed(self, event) -> None:
 
         self.charm.unit.status = ActiveStatus()
 
-    def _on_relation_broken(self, event) -> None:
+    def _on_relation_broken(self, event: RelationBrokenEvent) -> None:
         # Only relation_deparated events can check if scaling down
-        departed_relation_id = event.relation.id
-        if not self.charm.has_departed_run(departed_relation_id):
+        if not self.charm.has_departed_run(event.relation.id):
             logger.info(
                 "Deferring, must wait for relation departed hook to decide if relation should be removed."
             )

lib/charms/mongodb/v1/shards_interface.py

@@ -147,8 +147,7 @@ def pass_hook_checks(self, event: EventBase) -> bool:
             return False
 
         if isinstance(event, RelationBrokenEvent):
-            departed_relation_id = event.relation.id
-            if not self.charm.has_departed_run(departed_relation_id):
+            if not self.charm.has_departed_run(event.relation.id):
                 logger.info(
                     "Deferring, must wait for relation departed hook to decide if relation should be removed."
                 )

src/charm.py

@@ -1323,7 +1323,7 @@ def set_scaling_down(self, event: RelationDepartedEvent) -> bool:
         self.unit_peer_data[rel_departed_key] = json.dumps(scaling_down)
         return scaling_down
 
-    def proceed_on_broken_event(self, event) -> int:
+    def proceed_on_broken_event(self, event) -> None:
         """Returns relation_id if relation broken event occurred due to a removed relation."""
         departed_relation_id = None