syz-cluster: set report ID for outgoing emails

This allows the dashapi-based sender include them in the email address.

2 files changed, 4 insertions, 1 deletions

diff --git a/syz-cluster/email-reporter/handler.go b/syz-cluster/email-reporter/handler.go
index cecf39d57..7ea229483 100644
--- a/syz-cluster/email-reporter/handler.go
+++ b/syz-cluster/email-reporter/handler.go
@@ -74,6 +74,7 @@ func (h *Handler) report(ctx context.Context, rep *api.SessionReport) error {
 		To:      rep.Cc,
 		Body:    body,
 		Cc:      []string{h.emailConfig.ArchiveList},
+		BugID:   rep.ID,
 	}
 	if rep.Moderation {
 		toSend.To = []string{h.emailConfig.ModerationList}
diff --git a/syz-cluster/email-reporter/handler_test.go b/syz-cluster/email-reporter/handler_test.go
index fd9f54615..21ea14149 100644
--- a/syz-cluster/email-reporter/handler_test.go
+++ b/syz-cluster/email-reporter/handler_test.go
@@ -33,6 +33,7 @@ func TestModerationReportFlow(t *testing.T) {
 		To:      []string{testEmailConfig.ModerationList},
 		Cc:      []string{testEmailConfig.ArchiveList},
 		Subject: "[moderation/CI] Re: " + testSeries.Title,
+		BugID:   report.ID,
 		// Note that InReplyTo and Cc are nil.
 	}, receivedEmail)
 
@@ -48,7 +49,7 @@ func TestModerationReportFlow(t *testing.T) {
 	assert.NoError(t, err)
 
 	// The report must be sent upstream.
-	_, err = handler.PollAndReport(ctx)
+	report, err = handler.PollAndReport(ctx)
 	assert.NoError(t, err)
 
 	receivedEmail = emailServer.email()
@@ -59,6 +60,7 @@ func TestModerationReportFlow(t *testing.T) {
 		Cc:        []string{testEmailConfig.ArchiveList},
 		Subject:   "[name] Re: " + testSeries.Title,
 		InReplyTo: testSeries.ExtID,
+		BugID:     report.ID,
 	}, receivedEmail)
 }