From 87f08d8bfbe4677a166098ccb03b0c31d53fcb23 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Wed, 15 Dec 2021 06:32:35 +0100 Subject: [PATCH] Fix run-as issue persistance after trigger was removed --- automation/service/trigger.go | 2 +- automation/service/workflow.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/service/trigger.go b/automation/service/trigger.go index 3cb8e5c83..7c252bf6e 100644 --- a/automation/service/trigger.go +++ b/automation/service/trigger.go @@ -699,7 +699,7 @@ func validateWorkflowTriggers(wf *types.Workflow, tt ...*types.Trigger) (wis typ ) for i, t := range tt { - if !t.Enabled { + if !t.Enabled || t.DeletedAt != nil { continue } diff --git a/automation/service/workflow.go b/automation/service/workflow.go index 1925b36ef..e05837578 100644 --- a/automation/service/workflow.go +++ b/automation/service/workflow.go @@ -661,7 +661,7 @@ func (svc *workflow) validateWorkflow(ctx context.Context, wf *types.Workflow) ( tt, _, err := store.SearchAutomationTriggers(ctx, svc.store, types.TriggerFilter{ WorkflowID: types.WorkflowSet{wf}.IDs(), - Deleted: filter.StateInclusive, + Deleted: filter.StateExcluded, Disabled: filter.StateExcluded, })