From 39981dd5e76383566d2345f93407e922d48393c6 Mon Sep 17 00:00:00 2001 From: James Gilbert Date: Fri, 13 Nov 2026 13:35:21 +0000 Subject: [PATCH] feat(events): add creator labels to triggered workflows --- .../generic-servers/prepare_and_submit.py | 10 ++++++++-- charts/events/hooks/sync.py | 17 +++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/charts/events/generic-servers/prepare_and_submit.py b/charts/events/generic-servers/prepare_and_submit.py index 9c01b0b94..57276653c 100644 --- a/charts/events/generic-servers/prepare_and_submit.py +++ b/charts/events/generic-servers/prepare_and_submit.py @@ -51,7 +51,7 @@ def _prepare(namespace, token): return error.code -def _submit(namespace, template, event_id, posixuid, parameters, token): +def _submit(namespace, template, event_id, posixuid, sub, creator, parameters, token): """Submit the Workflow via the Kubernetes API, returning the status code.""" context = ( ssl.create_default_context(cafile=KUBE_CA_FILE) @@ -63,7 +63,11 @@ def _submit(namespace, template, event_id, posixuid, parameters, token): "kind": "Workflow", "metadata": { "generateName": f"{template}-event-", - "labels": {"workflows.diamond.ac.uk/triggeruid": posixuid or ""}, + "labels": { + "workflows.diamond.ac.uk/triggeruid": posixuid or "", + "workflows.diamond.ac.uk/creator": sub, + "workflows.diamond.ac.uk/creator-name": creator, + }, }, "spec": { "serviceAccountName": "argo-workflow", @@ -140,6 +144,8 @@ def _handle(self, payload): str(payload.get("template") or ""), str(payload.get("eventId") or ""), str(payload.get("posixuid") or ""), + str(payload.get("sub") or ""), + str(payload.get("creator") or "Unknown"), payload.get("parameters") or [], token, ) diff --git a/charts/events/hooks/sync.py b/charts/events/hooks/sync.py index f5695165e..fdfb58efd 100644 --- a/charts/events/hooks/sync.py +++ b/charts/events/hooks/sync.py @@ -111,8 +111,16 @@ def sync(self, parent: dict, related: dict) -> SyncResponse: continue name: str | None = trigger.metadata.name namespace: str | None = trigger.metadata.namespace - source_type: str | None = trigger.metadata.labels.get("workflows.diamond.ac.uk/source") - uid: str | None = trigger.metadata.labels.get("workflows.diamond.ac.uk/posixuid") + + labels = trigger.metadata.labels + source_type: str | None = labels.get("workflows.diamond.ac.uk/source") + uid: str | None = labels.get("workflows.diamond.ac.uk/posixuid") + sub: str | None = labels.get("workflows.diamond.ac.uk/creator") + creatorName: str = ( + labels.get("workflows.diamond.ac.uk/creator-preferred-username") + or labels.get("workflows.diamond.ac.uk/creator-fedid") + or "Unknown" + ) workflow = trigger.spec.workflow template = workflow.template eventName = trigger.spec.eventName @@ -235,6 +243,11 @@ def sync(self, parent: dict, related: dict) -> SyncResponse: ) payload.append({"src": src, "dest": f"parameters.{index}.value"}) + if sub: + payload.append({"src": {"dependencyName": name, "value": sub}, "dest": "sub"}) + + payload.append({"src": {"dependencyName": name, "value": creatorName}, "dest": "creator"}) + triggerTemplate = { "template": { "name": name,