Add the id attribute to BeaconCollectedEvent, which is minion ID.

Signed-off-by: Pedro Algarvio <[email protected]>

Author: s0undt3ch

changelog/68.improvement.rst

@@ -2,3 +2,4 @@ Several improvements to the project
 
 * When loading plugin configs, catch `KeyError` on unavailable plugins and list all available.
 * Pass the event tag and stamp explicitly when calling `saf.utils.eventbus._construct_event()`
+* Add the `id` attribute to `BeaconCollectedEvent`, which is minion ID.

pyproject.toml

@@ -81,6 +81,8 @@ ignore = [
   "PERF203", # `try`-`except` within a loop incurs performance overhead"
   "PERF401", # Use a list comprehension to create a transformed list
   "PERF402", # Use `list` or `list.copy` to create a copy of a list
+  "FIX002",  # Line contains TODO"
+  "TD003",   # Missing issue link on the line following this TODO"
 ]
 ignore-init-module-imports = true
 builtins = [

src/saf/collect/beacons.py

@@ -46,6 +46,7 @@ class BeaconCollectedEvent(CollectedEvent):
     """
 
     beacon: str
+    id: str  # noqa: A003
     tag: str
     stamp: datetime
     raw_data: Dict[str, Any]
@@ -84,8 +85,16 @@ async def collect(*, ctx: PipelineRunContext[BeaconsConfig]) -> AsyncIterator[Be
     tags = {f"salt/beacon/*/{beacon}/*" for beacon in config.beacons}
     log.info("The beacons collect plugin is configured to listen to tags: %s", tags)
     async for salt_event in eventbus.iter_events(opts=ctx.salt_config.copy(), tags=tags):
+        if "beacon_name" not in salt_event.raw_data:
+            # TODO @s0undt3ch: We're listening master side, and the payload is not the same... Fix it?
+            continue
+        daemon_id = salt_event.data.get("id")
+        if daemon_id is None:
+            tag_parts = salt_event.tag.split("/")
+            daemon_id = tag_parts[2]
         yield BeaconCollectedEvent(
             beacon=salt_event.raw_data["beacon_name"],
+            id=daemon_id,
             tag=salt_event.tag,
             stamp=salt_event.stamp,
             data=salt_event.data,