Skip to content

Commit 8e6052e

Browse files
committed
dashboard/app: fix bugs in handleCoverageReports
1. Set coverage db. 2. Use appUrl instead of r[.URL].Host.
1 parent 2bfec9c commit 8e6052e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

dashboard/app/reporting_email.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ func (cfg *EmailConfig) Validate() error {
110110
// Assuming it is called June 15, the monthly report will cover April-May diff.
111111
func handleCoverageReports(w http.ResponseWriter, r *http.Request) {
112112
ctx := r.Context()
113-
curHostPort := r.URL.Host
113+
if coverageDBClient != nil { // initialized in prod deployment, nil in tests
114+
ctx = SetCoverageDBClient(r.Context(), coverageDBClient)
115+
}
114116
targetDate := civil.DateOf(timeNow(ctx)).AddMonths(-1)
115117
periods, err := coveragedb.GenNPeriodsTill(2, targetDate, "month")
116118
if err != nil {
@@ -133,7 +135,7 @@ func handleCoverageReports(w http.ResponseWriter, r *http.Request) {
133135
wg.Add(1)
134136
go func() {
135137
defer wg.Done()
136-
if err := sendNsCoverageReport(ctx, nsName, emailTo, curHostPort, periods, minDrop); err != nil {
138+
if err := sendNsCoverageReport(ctx, nsName, emailTo, periods, minDrop); err != nil {
137139
msg := fmt.Sprintf("error generating coverage report for ns '%s': %s", nsName, err.Error())
138140
log.Errorf(ctx, "%s", msg)
139141
return
@@ -143,7 +145,7 @@ func handleCoverageReports(w http.ResponseWriter, r *http.Request) {
143145
wg.Wait()
144146
}
145147

146-
func sendNsCoverageReport(ctx context.Context, ns, email, domain string,
148+
func sendNsCoverageReport(ctx context.Context, ns, email string,
147149
period []coveragedb.TimePeriod, minDrop int) error {
148150
var days int
149151
for _, p := range period {
@@ -169,7 +171,7 @@ func sendNsCoverageReport(ctx context.Context, ns, email, domain string,
169171
PeriodFromDays: period[0].Days,
170172
PeriodTo: periodTo,
171173
PeriodToDays: period[1].Days,
172-
Link: fmt.Sprintf("https://%s%s", domain,
174+
Link: fmt.Sprintf("%s%s", appURL(ctx),
173175
coveragePageLink(ns, period[1].Type, period[1].DateTo.String(), minDrop, 2, true)),
174176
Table: table,
175177
}

dashboard/app/reporting_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,7 @@ func TestCoverageRegression(t *testing.T) {
14071407
msg := <-c.emailSink
14081408
assert.Equal(t, []string{"test@test.test"}, msg.To)
14091409
assert.Equal(t, "coverage-tests coverage regression (November 1999)->(December 1999)", msg.Subject)
1410-
wantLink := "https:///coverage-tests/coverage?" +
1410+
wantLink := "https://testapp.appspot.com/coverage-tests/coverage?" +
14111411
"dateto=1999-12-31&min-cover-lines-drop=1&order-by-cover-lines-drop=1&period=month&period_count=2"
14121412
assert.Equal(t, `Regressions happened in 'coverage-tests' from November 1999 (30 days) to December 1999 (31 days).
14131413
Web version: `+wantLink+`

0 commit comments

Comments
 (0)