Merge pull request #104 from canonical/remove-inject

removed rotten inject code

Author: PietroPasotti

pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "ops-scenario"
 
-version = "6.0.2"
+version = "6.0.3"
 
 authors = [
     { name = "Pietro Pasotti", email = "[email protected]" }

scenario/__init__.py

@@ -10,7 +10,6 @@
     DeferredEvent,
     Event,
     ExecOutput,
-    InjectRelation,
     Model,
     Mount,
     Network,
@@ -51,5 +50,4 @@
     "State",
     "DeferredEvent",
     "Event",
-    "InjectRelation",
 ]

scenario/sequences.py

@@ -12,9 +12,7 @@
     BREAK_ALL_RELATIONS,
     CREATE_ALL_RELATIONS,
     DETACH_ALL_STORAGES,
-    META_EVENTS,
     Event,
-    InjectRelation,
     State,
 )
 
@@ -32,20 +30,18 @@ def decompose_meta_event(meta_event: Event, state: State):
         logger.warning(f"meta-event {meta_event.name} not supported yet")
         return
 
-    if meta_event.name in [CREATE_ALL_RELATIONS, BREAK_ALL_RELATIONS]:
+    is_rel_created_meta_event = meta_event.name == CREATE_ALL_RELATIONS
+    is_rel_broken_meta_event = meta_event.name == BREAK_ALL_RELATIONS
+    if is_rel_broken_meta_event:
         for relation in state.relations:
-            event = Event(
-                relation.endpoint + META_EVENTS[meta_event.name],
-                args=(
-                    # right now, the Relation object hasn't been created by ops yet, so we
-                    # can't pass it down.
-                    # this will be replaced by a Relation instance before the event is fired.
-                    InjectRelation(relation.endpoint, relation.relation_id),
-                ),
-            )
+            event = relation.broken_event
+            logger.debug(f"decomposed meta {meta_event.name}: {event}")
+            yield event, state.copy()
+    elif is_rel_created_meta_event:
+        for relation in state.relations:
+            event = relation.created_event
             logger.debug(f"decomposed meta {meta_event.name}: {event}")
             yield event, state.copy()
-
     else:
         raise RuntimeError(f"unknown meta-event {meta_event.name}")
 

scenario/state.py

@@ -1465,31 +1465,3 @@ def deferred(
     if isinstance(event, str):
         event = Event(event, relation=relation, container=container)
     return event.deferred(handler=handler, event_id=event_id)
-
-
-@dataclasses.dataclass(frozen=True)
-class Inject(_DCBase):
-    """Base class for injectors: special placeholders used to tell harness_ctx
-    to inject instances that can't be retrieved in advance in event args or kwargs.
-    """
-
-
-@dataclasses.dataclass(frozen=True)
-class InjectRelation(Inject):
-    relation_name: str
-    relation_id: Optional[int] = None
-
-
-def _derive_args(event_name: str):
-    args = []
-    for term in RELATION_EVENTS_SUFFIX:
-        # fixme: we can't disambiguate between relation id-s.
-        if event_name.endswith(term):
-            args.append(InjectRelation(relation_name=event_name[: -len(term)]))
-
-    return tuple(args)
-
-
-# todo: consider
-#  def get_containers_from_metadata(CharmType, can_connect: bool = False) -> List[Container]:
-#     pass