openstack/mistral
Code Issues Proposed changes

Merge "Remove extra description on cron trigger executions"

Browse Source
This commit is contained in:
Zuul 2022-10-04 10:49:17 +00:00 committed by Gerrit Code Review
commit 55745a750c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mistral/services/periodic.py
View File

@ -72,7 +72,6 @@ def process_cron_triggers_v2(self, ctx):
"triggered_by": {
"type": "cron_trigger",
"id": trigger.id,
"name": trigger.name,
}
}

17
mistral/services/triggers.py
View File

@ -240,6 +240,8 @@ def on_workflow_complete(wf_ex):
if not wf_ex.description:
return
# NOTE(amorin) we suppose here that the description field is JSON.
# But, this is not always true.
try:
description = json.loads(wf_ex.description)
except ValueError as e:
@ -249,14 +251,17 @@ def on_workflow_complete(wf_ex):
if not isinstance(description, dict):
return
# NOTE(amorin) description can be changed by the end user, maybe we should
# not trust that value...
triggered = description.get('triggered_by')
if not triggered:
return
if triggered['type'] == 'cron_trigger':
if not db_api.load_cron_trigger(triggered['name']):
security.delete_trust()
elif triggered['type'] == 'event_trigger':
if not db_api.load_event_trigger(triggered['id'], True):
security.delete_trust()
if 'type' in triggered and 'id' in triggered:
if triggered['type'] == 'cron_trigger':
if not db_api.load_cron_trigger(triggered['id']):
security.delete_trust()
elif triggered['type'] == 'event_trigger':
if not db_api.load_event_trigger(triggered['id'], True):
security.delete_trust()