compat with ops 2.10

lib/charms/traefik_k8s/v1/ingress_per_unit.py

@@ -63,7 +63,7 @@ def _on_ingress_revoked(self, event: IngressPerUnitRevokedForUnitEvent):
 from typing import Any, Dict, Optional, Tuple, Union
 
 import yaml
-from ops.charm import CharmBase, RelationBrokenEvent, RelationEvent
+from ops.charm import CharmBase, RelationEvent
 from ops.framework import (
     EventSource,
     Object,
@@ -82,7 +82,7 @@ def _on_ingress_revoked(self, event: IngressPerUnitRevokedForUnitEvent):
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 17
+LIBPATCH = 18
 
 log = logging.getLogger(__name__)
 
@@ -734,9 +734,10 @@ def _handle_relation(self, event: RelationEvent):
         # we calculate the diff between the urls we were aware of
         # before and those we know now
         previous_urls = self._stored.current_urls or {}  # type: ignore
-        current_urls = (
-            {} if isinstance(event, RelationBrokenEvent) else self._urls_from_relation_data
-        )
+
+        # since ops 2.10, breaking relations won't show up in self.model.relations, so we're safe
+        # in assuming all relations that are there are alive and well.
+        current_urls = self._urls_from_relation_data
         self._stored.current_urls = current_urls  # type: ignore
 
         removed = previous_urls.keys() - current_urls.keys()  # type: ignore
@@ -750,7 +751,7 @@ def _handle_relation(self, event: RelationEvent):
                 )
 
             if this_unit_name in removed:
-                self.on.revoked_for_unit.emit(self.relation)  # type: ignore
+                self.on.revoked_for_unit.emit(event.relation)  # type: ignore
 
         if self.listen_to in {"all-units", "both"}:
             for unit_name in changed:
@@ -759,7 +760,7 @@ def _handle_relation(self, event: RelationEvent):
                 )
 
             for unit_name in removed:
-                self.on.revoked.emit(self.relation, unit_name)  # type: ignore
+                self.on.revoked.emit(event.relation, unit_name)  # type: ignore
 
         self._publish_auto_data()
 

tests/integration/testers/forward-auth/lib/charms/oathkeeper/v0/auth_proxy.py

@@ -360,7 +360,7 @@ def get_app_names(self) -> List[str]:
         if not self._charm.model.relations[self._relation_name]:
             return []
 
-        app_names = list()
+        app_names = []
         for relation in self._charm.model.relations[self._relation_name]:
             app_names.append(relation.app.name)