Fix run-as issue persistance after trigger was removed

cortezaproject · Dec 15, 2021 · 87f08d8 · 87f08d8
1 parent ff00bb8
commit 87f08d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,
 	})