Skip to content

Commit

Permalink
fix: Disallow stopping completed workflows (argoproj#10087)
Browse files Browse the repository at this point in the history
Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
  • Loading branch information
terrytangyuan committed Nov 22, 2022
1 parent ab09448 commit 766f9bd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
9 changes: 8 additions & 1 deletion workflow/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,14 @@ func patchShutdownStrategy(ctx context.Context, wfClient v1alpha1.WorkflowInterf
return errors.InternalWrapError(err)
}
err = waitutil.Backoff(retry.DefaultRetry, func() (bool, error) {
_, err := wfClient.Patch(ctx, name, types.MergePatchType, patch, metav1.PatchOptions{})
wf, err := wfClient.Get(ctx, name, metav1.GetOptions{})
if err != nil {
return !errorsutil.IsTransientErr(err), err
}
if wf.Status.Fulfilled() {
return true, fmt.Errorf("cannot shutdown a completed workflow")
}
_, err = wfClient.Patch(ctx, name, types.MergePatchType, patch, metav1.PatchOptions{})
if apierr.IsConflict(err) {
return false, nil
}
Expand Down
7 changes: 7 additions & 0 deletions workflow/util/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,13 @@ func TestStopWorkflowByNodeName(t *testing.T) {
wf, err = wfIf.Get(ctx, "suspend", metav1.GetOptions{})
assert.NoError(t, err)
assert.Equal(t, wfv1.NodeFailed, wf.Status.Nodes.FindByDisplayName("approve").Phase)

origWf.Status = wfv1.WorkflowStatus{Phase: wfv1.WorkflowSucceeded}
origWf.Name = "succeeded-wf"
_, err = wfIf.Create(ctx, origWf, metav1.CreateOptions{})
assert.NoError(t, err)
err = StopWorkflow(ctx, wfIf, hydratorfake.Noop, "succeeded-wf", "", "")
assert.EqualError(t, err, "cannot shutdown a completed workflow")
}

// Regression test for #6478
Expand Down

0 comments on commit 766f9bd

Please sign in to comment.