Skip to content

Jg/ignore failed scans #1811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JamesDoingStuff wants to merge 2 commits into
base: main
Choose a base branch
from
+21 −0
Open

Jg/ignore failed scans #1811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a27a5ac
feat(events): add filter for scan message exit_status
JamesDoingStuff Nov 9, 2026
527fb5a
chore(charts): point events at main on staging
JamesDoingStuff Nov 9, 2026
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
1 change: 1 addition & 0 deletions charts/apps/staging-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ argocd:

events:
enabled: true
targetRevision: HEAD
extraValueFiles:
- staging-values.yaml

Expand Down
6 changes: 6 additions & 0 deletions charts/events/crds/ctt-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ spec:
triggerOnMessageType:
type: string
pattern: "^(start|stop)$"
exitStatusWhitelist:
type: array
default: []
items:
type: string
pattern: "^(success|abort|fail)$"
retryBehaviour:
type: object
properties:
Expand Down
6 changes: 6 additions & 0 deletions charts/events/crds/trigger-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ spec:
triggerOnMessageType:
type: string
pattern: "^(start|stop)$"
exitStatusWhitelist:
type: array
default: []
items:
type: string
pattern: "^(success|abort|fail)$"
retryBehaviour:
type: object
properties:
Expand Down
8 changes: 8 additions & 0 deletions charts/events/hooks/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class RetryBehaviour(BaseModel):
class TriggerWorkflow(BaseModel):
template: str
triggerOnMessageType: Literal["start", "stop"] | None = None
exitStatusWhitelist: list[str]

@davehadley davehadley Nov 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would a better name be "triggerOnExitStatus"?

parameters: list[WorkflowParameter]
retryBehaviour: RetryBehaviour | None = None

Expand Down Expand Up @@ -123,6 +124,13 @@ def sync(self, parent: dict, related: dict) -> SyncResponse:
"value": [workflow.triggerOnMessageType],
})

if workflow.exitStatusWhitelist and source_type == "message-bus":

@davehadley davehadley Nov 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know that you are following the pre-existing example of the triggerOnMessageType setting. But this design couples the Trigger CR interface strongly to the format of the message being emitted by the beamline.

Did you consider exposing "dataFilters" more directly to give consumers of this API more flexibility?

@JamesDoingStuff JamesDoingStuff Nov 10, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hadn't really, but you're right, that might be easier at this point than having separate fields for each part of the message that users want to filter on. I'll switch it over and see if it still feels intuitive to use

dataFilters.append({
"path": "body.doc.exit_status",
"type": "string",
"value": workflow.exitStatusWhitelist
})

if namespace != "events":
dataFilters.append({
"path": "body.doc.instrument_session",
Expand Down
Loading