Skip to content

Commit 4248591

Browse files
badhezibadhezi
committed
fix error handling and revert changes to test files
1 parent 883c8eb commit 4248591

File tree

2 files changed

+60
-88
lines changed

2 files changed

+60
-88
lines changed

‎services/actions/notifier_helper.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,6 @@ func handleWorkflows(
318318

319319
if runName, err := parseRunName(run, dwf); err == nil {
320320
run.Title = runName
321-
} else {
322-
log.Error("evaluateExpressionsForRun: %v", err)
323-
continue
324321
}
325322

326323
need, err := ifNeedApproval(ctx, run, input.Repo, input.Doer)
@@ -532,8 +529,6 @@ func handleSchedules(
532529

533530
if runName, err := parseRunName(run.ToActionRun(), dwf); err == nil {
534531
run.Title = runName
535-
} else {
536-
log.Error("ParseRunName: %v", err)
537532
}
538533

539534
crons = append(crons, run)
@@ -591,7 +586,11 @@ func parseRunName(r *actions_model.ActionRun, w *actions_module.DetectedWorkflow
591586
return "", err
592587
}
593588

594-
title, _ := jobparser.ParseRunName(w.Content, jobparser.WithGitContext(ghCtx))
595-
log.Info("title: %s", title)
589+
title, err := jobparser.ParseRunName(w.Content, jobparser.WithGitContext(ghCtx))
590+
if err != nil {
591+
// stay silent, run-name was not provided.
592+
return "", err
593+
}
594+
596595
return title, nil
597596
}

‎tests/integration/actions_trigger_test.go‎

Lines changed: 54 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -414,47 +414,38 @@ jobs:
414414
err = repo_service.CreateNewBranchFromCommit(db.DefaultContext, user2, repo, gitRepo, branch.CommitID, "test-create-branch")
415415
assert.NoError(t, err)
416416
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
417-
Title: "add workflow",
418-
RepoID: repo.ID,
419-
Repo: repo,
420-
Event: "create",
421-
Ref: "refs/heads/test-create-branch",
422-
WorkflowID: "createdelete.yml",
423-
CommitSHA: branch.CommitID,
424-
TriggerUserID: user2.ID,
425-
TriggerUser: user2,
417+
Title: "add workflow",
418+
RepoID: repo.ID,
419+
Event: "create",
420+
Ref: "refs/heads/test-create-branch",
421+
WorkflowID: "createdelete.yml",
422+
CommitSHA: branch.CommitID,
426423
})
427424
assert.NotNil(t, run)
428425

429426
// create a tag
430427
err = release_service.CreateNewTag(db.DefaultContext, user2, repo, branch.CommitID, "test-create-tag", "test create tag event")
431428
assert.NoError(t, err)
432429
run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
433-
Title: "add workflow",
434-
RepoID: repo.ID,
435-
Repo: repo,
436-
Event: "create",
437-
Ref: "refs/tags/test-create-tag",
438-
WorkflowID: "createdelete.yml",
439-
CommitSHA: branch.CommitID,
440-
TriggerUserID: user2.ID,
441-
TriggerUser: user2,
430+
Title: "add workflow",
431+
RepoID: repo.ID,
432+
Event: "create",
433+
Ref: "refs/tags/test-create-tag",
434+
WorkflowID: "createdelete.yml",
435+
CommitSHA: branch.CommitID,
442436
})
443437
assert.NotNil(t, run)
444438

445439
// delete the branch
446440
err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch", nil)
447441
assert.NoError(t, err)
448442
run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
449-
Title: "add workflow",
450-
RepoID: repo.ID,
451-
Repo: repo,
452-
Event: "delete",
453-
Ref: "refs/heads/main",
454-
WorkflowID: "createdelete.yml",
455-
CommitSHA: branch.CommitID,
456-
TriggerUserID: user2.ID,
457-
TriggerUser: user2,
443+
Title: "add workflow",
444+
RepoID: repo.ID,
445+
Event: "delete",
446+
Ref: "refs/heads/main",
447+
WorkflowID: "createdelete.yml",
448+
CommitSHA: branch.CommitID,
458449
})
459450
assert.NotNil(t, run)
460451

@@ -464,15 +455,12 @@ jobs:
464455
err = release_service.DeleteReleaseByID(db.DefaultContext, repo, tag, user2, true)
465456
assert.NoError(t, err)
466457
run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
467-
Title: "add workflow",
468-
RepoID: repo.ID,
469-
Repo: repo,
470-
Event: "delete",
471-
Ref: "refs/heads/main",
472-
WorkflowID: "createdelete.yml",
473-
CommitSHA: branch.CommitID,
474-
TriggerUserID: user2.ID,
475-
TriggerUser: user2,
458+
Title: "add workflow",
459+
RepoID: repo.ID,
460+
Event: "delete",
461+
Ref: "refs/heads/main",
462+
WorkflowID: "createdelete.yml",
463+
CommitSHA: branch.CommitID,
476464
})
477465
assert.NotNil(t, run)
478466
})
@@ -774,15 +762,12 @@ jobs:
774762
_ = MakeRequest(t, req, http.StatusNoContent)
775763

776764
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
777-
Title: "add workflow",
778-
RepoID: repo.ID,
779-
Repo: repo,
780-
Event: "workflow_dispatch",
781-
Ref: "refs/heads/main",
782-
WorkflowID: "dispatch.yml",
783-
CommitSHA: branch.CommitID,
784-
TriggerUserID: user2.ID,
785-
TriggerUser: user2,
765+
Title: "add workflow",
766+
RepoID: repo.ID,
767+
Event: "workflow_dispatch",
768+
Ref: "refs/heads/main",
769+
WorkflowID: "dispatch.yml",
770+
CommitSHA: branch.CommitID,
786771
})
787772
assert.NotNil(t, run)
788773
})
@@ -859,15 +844,12 @@ jobs:
859844
_ = MakeRequest(t, req, http.StatusNoContent)
860845

861846
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
862-
Title: "add workflow",
863-
RepoID: repo.ID,
864-
Repo: repo,
865-
Event: "workflow_dispatch",
866-
Ref: "refs/heads/main",
867-
WorkflowID: "dispatch.yml",
868-
CommitSHA: branch.CommitID,
869-
TriggerUserID: user2.ID,
870-
TriggerUser: user2,
847+
Title: "add workflow",
848+
RepoID: repo.ID,
849+
Event: "workflow_dispatch",
850+
Ref: "refs/heads/main",
851+
WorkflowID: "dispatch.yml",
852+
CommitSHA: branch.CommitID,
871853
})
872854
assert.NotNil(t, run)
873855
dispatchPayload := &api.WorkflowDispatchPayload{}
@@ -957,15 +939,12 @@ jobs:
957939
_ = MakeRequest(t, req, http.StatusNoContent)
958940

959941
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
960-
Title: "add workflow",
961-
RepoID: repo.ID,
962-
Repo: repo,
963-
Event: "workflow_dispatch",
964-
Ref: "refs/heads/main",
965-
WorkflowID: "dispatch.yml",
966-
CommitSHA: branch.CommitID,
967-
TriggerUserID: user2.ID,
968-
TriggerUser: user2,
942+
Title: "add workflow",
943+
RepoID: repo.ID,
944+
Event: "workflow_dispatch",
945+
Ref: "refs/heads/main",
946+
WorkflowID: "dispatch.yml",
947+
CommitSHA: branch.CommitID,
969948
})
970949
assert.NotNil(t, run)
971950
})
@@ -1045,15 +1024,12 @@ jobs:
10451024
_ = MakeRequest(t, req, http.StatusNoContent)
10461025

10471026
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
1048-
Title: "add workflow",
1049-
RepoID: repo.ID,
1050-
Repo: repo,
1051-
Event: "workflow_dispatch",
1052-
Ref: "refs/heads/main",
1053-
WorkflowID: "dispatch.yml",
1054-
CommitSHA: branch.CommitID,
1055-
TriggerUserID: user2.ID,
1056-
TriggerUser: user2,
1027+
Title: "add workflow",
1028+
RepoID: repo.ID,
1029+
Event: "workflow_dispatch",
1030+
Ref: "refs/heads/main",
1031+
WorkflowID: "dispatch.yml",
1032+
CommitSHA: branch.CommitID,
10571033
})
10581034
assert.NotNil(t, run)
10591035
dispatchPayload := &api.WorkflowDispatchPayload{}
@@ -1376,15 +1352,12 @@ jobs:
13761352
_ = MakeRequest(t, req, http.StatusNoContent)
13771353

13781354
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
1379-
Title: "add workflow",
1380-
RepoID: repo.ID,
1381-
Repo: repo,
1382-
Event: "workflow_dispatch",
1383-
Ref: "refs/heads/main",
1384-
WorkflowID: "dispatch.yml",
1385-
CommitSHA: branch.CommitID,
1386-
TriggerUserID: user2.ID,
1387-
TriggerUser: user2,
1355+
Title: "add workflow",
1356+
RepoID: repo.ID,
1357+
Event: "workflow_dispatch",
1358+
Ref: "refs/heads/main",
1359+
WorkflowID: "dispatch.yml",
1360+
CommitSHA: branch.CommitID,
13881361
})
13891362
assert.NotNil(t, run)
13901363
dispatchPayload := &api.WorkflowDispatchPayload{}

0 commit comments

Comments
 (0)