Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions charts/events/generic-servers/prepare_and_submit.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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",
Expand Down Expand Up @@ -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,
)
Expand Down
17 changes: 15 additions & 2 deletions charts/events/hooks/sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Loading