1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-01 17:38:33 +00:00

send mail on failed or recovered workflow run (#7509)

Send a Mail when an action run fails or a workflow recovers.

This PR depends on https://codeberg.org/forgejo/forgejo/pulls/7491

closes #3719

## Checklist

The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org).

### Tests

- I added test coverage for Go changes...
  - [x] in their respective `*_test.go` for unit tests.
  - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server.
- I added test coverage for JavaScript changes...
  - [ ] in `web_src/js/*.test.js` if it can be unit tested.
  - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).

### Documentation

- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [x] I did not document these changes and I do not expect someone else to do it.

### Release notes

- [ ] I do not want this change to show in the release notes.
- [x] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.

<!--start release-notes-assistant-->

## Release notes
<!--URL:https://codeberg.org/forgejo/forgejo-->
- Features
  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7509): <!--number 7509 --><!--line 0 --><!--description c2VuZCBtYWlsIG9uIGZhaWxlZCBvciByZWNvdmVyZWQgd29ya2Zsb3cgcnVu-->send mail on failed or recovered workflow run<!--description-->
<!--end release-notes-assistant-->

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7509
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: christopher-besch <mail@chris-besch.com>
Co-committed-by: christopher-besch <mail@chris-besch.com>
This commit is contained in:
christopher-besch 2025-04-29 06:58:05 +00:00 committed by Earl Warren
parent bc99bf5e8f
commit 386e7f8208
7 changed files with 298 additions and 10 deletions

View file

@ -21,5 +21,13 @@
"alert.asset_load_failed": "Failed to load asset files from {path}. Please make sure the asset files can be accessed.",
"alert.range_error": " must be a number between %[1]s and %[2]s.",
"install.invalid_lfs_path": "Unable to create the LFS root at the specified path: %[1]s",
"mail.actions.successful_run_after_failure_subject": "Workflow %[1]s recovered in repository %[2]s",
"mail.actions.not_successful_run_subject": "Workflow %[1]s failed in repository %[2]s",
"mail.actions.successful_run_after_failure": "Workflow %[1]s recovered in repository %[2]s",
"mail.actions.not_successful_run": "Workflow %[1]s failed in repository %[2]s",
"mail.actions.run_info_cur_status": "This Run's Status: %[1]s (just updated from %[2]s)",
"mail.actions.run_info_previous_status": "Previous Run's Status: %[1]s",
"mail.actions.run_info_ref": "Branch: %[1]s (%[2]s)",
"mail.actions.run_info_trigger": "Triggered because: %[1]s by: %[2]s",
"meta.last_line": "Thank you for translating Forgejo! This line isn't seen by the users but it serves other purposes in the translation management. You can place a fun fact in the translation instead of translating it."
}

View file

@ -0,0 +1,84 @@
// Copyright 2025 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: GPL-3.0-or-later
package mailer
import (
"bytes"
actions_model "forgejo.org/models/actions"
user_model "forgejo.org/models/user"
"forgejo.org/modules/base"
"forgejo.org/modules/setting"
"forgejo.org/modules/translation"
)
const (
tplActionNowDone base.TplName = "actions/now_done"
)
// requires !run.Status.IsSuccess() or !lastRun.Status.IsSuccess()
func MailActionRun(run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) error {
if setting.MailService == nil {
// No mail service configured
return nil
}
if run.TriggerUser.Email != "" && run.TriggerUser.EmailNotificationsPreference != user_model.EmailNotificationsDisabled {
if err := sendMailActionRun(run.TriggerUser, run, priorStatus, lastRun); err != nil {
return err
}
}
if run.Repo.Owner.Email != "" && run.Repo.Owner.Email != run.TriggerUser.Email && run.Repo.Owner.EmailNotificationsPreference != user_model.EmailNotificationsDisabled {
if err := sendMailActionRun(run.Repo.Owner, run, priorStatus, lastRun); err != nil {
return err
}
}
return nil
}
func sendMailActionRun(to *user_model.User, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) error {
var (
locale = translation.NewLocale(to.Language)
content bytes.Buffer
)
var subject string
if run.Status.IsSuccess() {
subject = locale.TrString("mail.actions.successful_run_after_failure_subject", run.Title, run.Repo.FullName())
} else {
subject = locale.TrString("mail.actions.not_successful_run", run.Title, run.Repo.FullName())
}
commitSHA := run.CommitSHA
if len(commitSHA) > 7 {
commitSHA = commitSHA[:7]
}
branch := run.PrettyRef()
data := map[string]any{
"locale": locale,
"Link": run.HTMLURL(),
"Subject": subject,
"Language": locale.Language(),
"RepoFullName": run.Repo.FullName(),
"Run": run,
"TriggerUserLink": run.TriggerUser.HTMLURL(),
"LastRun": lastRun,
"PriorStatus": priorStatus,
"CommitSHA": commitSHA,
"Branch": branch,
"IsSuccess": run.Status.IsSuccess(),
}
if err := bodyTemplates.ExecuteTemplate(&content, string(tplActionNowDone), data); err != nil {
return err
}
msg := NewMessage(to.EmailTo(), subject, content.String())
msg.Info = subject
SendAsync(msg)
return nil
}

View file

@ -0,0 +1,146 @@
// Copyright 2025 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: GPL-3.0-or-later
package mailer
import (
"testing"
actions_model "forgejo.org/models/actions"
"forgejo.org/models/db"
repo_model "forgejo.org/models/repo"
user_model "forgejo.org/models/user"
"forgejo.org/modules/setting"
notify_service "forgejo.org/services/notify"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func getActionsNowDoneTestUsers(t *testing.T) []*user_model.User {
t.Helper()
newTriggerUser := new(user_model.User)
newTriggerUser.Name = "new_trigger_user"
newTriggerUser.Language = "en_US"
newTriggerUser.IsAdmin = false
newTriggerUser.Email = "new_trigger_user@example.com"
newTriggerUser.LastLoginUnix = 1693648327
newTriggerUser.CreatedUnix = 1693648027
newTriggerUser.EmailNotificationsPreference = user_model.EmailNotificationsEnabled
require.NoError(t, user_model.CreateUser(db.DefaultContext, newTriggerUser))
newOwner := new(user_model.User)
newOwner.Name = "new_owner"
newOwner.Language = "en_US"
newOwner.IsAdmin = false
newOwner.Email = "new_owner@example.com"
newOwner.LastLoginUnix = 1693648329
newOwner.CreatedUnix = 1693648029
newOwner.EmailNotificationsPreference = user_model.EmailNotificationsEnabled
require.NoError(t, user_model.CreateUser(db.DefaultContext, newOwner))
return []*user_model.User{newTriggerUser, newOwner}
}
func assertTranslatedLocaleMailActionsNowDone(t *testing.T, msgBody string) {
AssertTranslatedLocale(t, msgBody, "mail.actions.successful_run_after_failure", "mail.actions.not_successful_run", "mail.actions.run_info_cur_status", "mail.actions.run_info_ref", "mail.actions.run_info_previous_status", "mail.actions.run_info_trigger", "mail.view_it_on")
}
func TestActionRunNowDoneNotificationMail(t *testing.T) {
ctx := t.Context()
users := getActionsNowDoneTestUsers(t)
defer CleanUpUsers(ctx, users)
triggerUser := users[0]
ownerUser := users[1]
repo := repo_model.Repository{
Name: "some repo",
Description: "rockets are cool",
Owner: ownerUser,
OwnerID: ownerUser.ID,
}
// Do some funky stuff with the action run's ids:
// The run with the larger ID finished first.
// This is odd but something that must work.
run1 := &actions_model.ActionRun{ID: 2, Repo: &repo, RepoID: repo.ID, Title: "some workflow", TriggerUser: triggerUser, TriggerUserID: triggerUser.ID, Status: actions_model.StatusFailure, Stopped: 1745821796, TriggerEvent: "workflow_dispatch"}
run2 := &actions_model.ActionRun{ID: 1, Repo: &repo, RepoID: repo.ID, Title: "some workflow", TriggerUser: triggerUser, TriggerUserID: triggerUser.ID, Status: actions_model.StatusSuccess, Stopped: 1745822796, TriggerEvent: "push"}
notify_service.RegisterNotifier(NewNotifier())
t.Run("DontSendNotificationEmailOnFirstActionSuccess", func(t *testing.T) {
defer MockMailSettings(func(msgs ...*Message) {
assert.Fail(t, "no mail should be sent")
})()
notify_service.ActionRunNowDone(ctx, run2, actions_model.StatusRunning, nil)
})
t.Run("SendNotificationEmailOnActionRunFailed", func(t *testing.T) {
mailSentToOwner := false
mailSentToTriggerUser := false
defer MockMailSettings(func(msgs ...*Message) {
assert.LessOrEqual(t, len(msgs), 2)
for _, msg := range msgs {
switch msg.To {
case triggerUser.EmailTo():
assert.False(t, mailSentToTriggerUser, "sent mail twice")
mailSentToTriggerUser = true
case ownerUser.EmailTo():
assert.False(t, mailSentToOwner, "sent mail twice")
mailSentToOwner = true
default:
assert.Fail(t, "sent mail to unknown sender", msg.To)
}
assert.Contains(t, msg.Body, triggerUser.HTMLURL())
assert.Contains(t, msg.Body, triggerUser.Name)
// what happened
assert.Contains(t, msg.Body, "failed")
// new status of run
assert.Contains(t, msg.Body, "failure")
// prior status of this run
assert.Contains(t, msg.Body, "waiting")
assertTranslatedLocaleMailActionsNowDone(t, msg.Body)
}
})()
notify_service.ActionRunNowDone(ctx, run1, actions_model.StatusWaiting, nil)
assert.True(t, mailSentToOwner)
assert.True(t, mailSentToTriggerUser)
})
t.Run("SendNotificationEmailOnActionRunRecovered", func(t *testing.T) {
mailSentToOwner := false
mailSentToTriggerUser := false
defer MockMailSettings(func(msgs ...*Message) {
assert.LessOrEqual(t, len(msgs), 2)
for _, msg := range msgs {
switch msg.To {
case triggerUser.EmailTo():
assert.False(t, mailSentToTriggerUser, "sent mail twice")
mailSentToTriggerUser = true
case ownerUser.EmailTo():
assert.False(t, mailSentToOwner, "sent mail twice")
mailSentToOwner = true
default:
assert.Fail(t, "sent mail to unknown sender", msg.To)
}
assert.Contains(t, msg.Body, triggerUser.HTMLURL())
assert.Contains(t, msg.Body, triggerUser.Name)
// what happened
assert.Contains(t, msg.Body, "recovered")
// old status of run
assert.Contains(t, msg.Body, "failure")
// new status of run
assert.Contains(t, msg.Body, "success")
// prior status of this run
assert.Contains(t, msg.Body, "running")
assertTranslatedLocaleMailActionsNowDone(t, msg.Body)
}
})()
assert.NotNil(t, setting.MailService)
notify_service.ActionRunNowDone(ctx, run2, actions_model.StatusRunning, run1)
assert.True(t, mailSentToOwner)
assert.True(t, mailSentToTriggerUser)
})
}

View file

@ -4,7 +4,6 @@
package mailer
import (
"context"
"strconv"
"testing"
@ -17,7 +16,7 @@ import (
"github.com/stretchr/testify/require"
)
func getTestUsers(t *testing.T) []*user_model.User {
func getAdminNewUserTestUsers(t *testing.T) []*user_model.User {
t.Helper()
admin := new(user_model.User)
admin.Name = "testadmin"
@ -38,16 +37,10 @@ func getTestUsers(t *testing.T) []*user_model.User {
return []*user_model.User{admin, newUser}
}
func cleanUpUsers(ctx context.Context, users []*user_model.User) {
for _, u := range users {
db.DeleteByID[user_model.User](ctx, u.ID)
}
}
func TestAdminNotificationMail_test(t *testing.T) {
ctx := t.Context()
users := getTestUsers(t)
users := getAdminNewUserTestUsers(t)
t.Run("SendNotificationEmailOnNewUser_true", func(t *testing.T) {
defer test.MockVariableValue(&setting.Admin.SendNotificationEmailOnNewUser, true)()
@ -75,5 +68,5 @@ func TestAdminNotificationMail_test(t *testing.T) {
MailNewUser(ctx, users[1])
})
cleanUpUsers(ctx, users)
CleanUpUsers(ctx, users)
}

View file

@ -7,7 +7,9 @@ import (
"context"
"testing"
"forgejo.org/models/db"
"forgejo.org/models/unittest"
user_model "forgejo.org/models/user"
"forgejo.org/modules/setting"
"forgejo.org/modules/templates"
"forgejo.org/modules/test"
@ -46,3 +48,9 @@ func MockMailSettings(send func(msgs ...*Message)) func() {
}
}
}
func CleanUpUsers(ctx context.Context, users []*user_model.User) {
for _, u := range users {
db.DeleteByID[user_model.User](ctx, u.ID)
}
}

View file

@ -7,6 +7,7 @@ import (
"context"
"fmt"
actions_model "forgejo.org/models/actions"
activities_model "forgejo.org/models/activities"
issues_model "forgejo.org/models/issues"
repo_model "forgejo.org/models/repo"
@ -208,3 +209,13 @@ func (m *mailNotifier) RepoPendingTransfer(ctx context.Context, doer, newOwner *
func (m *mailNotifier) NewUserSignUp(ctx context.Context, newUser *user_model.User) {
MailNewUser(ctx, newUser)
}
func (m *mailNotifier) ActionRunNowDone(ctx context.Context, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) {
// Only send a mail on a successful run when the workflow recovered (i.e., the run before failed).
if run.Status.IsSuccess() && (lastRun == nil || lastRun.Status.IsSuccess()) {
return
}
if err := MailActionRun(run, priorStatus, lastRun); err != nil {
log.Error("MailActionRunNowDone: %v", err)
}
}

View file

@ -0,0 +1,38 @@
<!DOCTYPE html>
<html>
<head>
<style>
.footer { font-size:small; color:#666;}
</style>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
{{$repo_link := HTMLFormat "<a href='%s'>%s</a>" .Run.Repo.HTMLURL .RepoFullName}}
{{$action_run_link := HTMLFormat "<a href='%s'>%s</a>" .Link .Run.Title}}
{{$trigger_user_link := HTMLFormat "<a href='%s'>@%s</a>" .Run.TriggerUser.HTMLURL .Run.TriggerUser.Name}}
<body>
<p>
{{if .IsSuccess}}
{{.locale.Tr "mail.actions.successful_run_after_failure" $action_run_link $repo_link}}
{{else}}
{{.locale.Tr "mail.actions.not_successful_run" $action_run_link $repo_link}}
{{end}}
<br />
{{.locale.Tr "mail.actions.run_info_cur_status" .Run.Status .PriorStatus}}<br />
{{.locale.Tr "mail.actions.run_info_ref" .Branch .CommitSHA}}<br />
{{if .LastRun}}
{{.locale.Tr "mail.actions.run_info_previous_status" .LastRun.Status}}<br />
{{end}}
{{.locale.Tr "mail.actions.run_info_trigger" .Run.TriggerEvent $trigger_user_link}}
</p>
<div class="footer">
<p>
---
<br>
<a href="{{.Link}}">{{.locale.Tr "mail.view_it_on" AppName}}</a>.
</p>
</div>
</body>
</html>