expiration-mailer: Don't audit log "no usable contact address" (#7529)

pgporada · web-flow · commit 0eb87b83ad7c · 2024-06-06T18:30:59.000-04:00
Fixes #7528
diff --git a/cmd/expiration-mailer/main.go b/cmd/expiration-mailer/main.go
@@ -456,6 +456,9 @@ func (m *mailer) sendToOneRegID(ctx context.Context, conn bmail.Conn, regID int6
 		var badAddrErr *bmail.BadAddressSMTPError
 		if errors.Is(err, errNoValidEmail) || errors.As(err, &badAddrErr) {
 			m.updateLastNagTimestamps(ctx, parsedCerts)
+			// Some accounts have no email; some accounts have an invalid email.
+			// Treat those as non-error cases.
+			return nil
 		}
 
 		m.stats.errorCount.With(prometheus.Labels{"type": "SendNags"}).Inc()

Original file line number	Diff line number	Diff line change
`@@ -456,6 +456,9 @@ func (m *mailer) sendToOneRegID(ctx context.Context, conn bmail.Conn, regID int6`
`456`	`456`	`var badAddrErr *bmail.BadAddressSMTPError`
`457`	`457`	`if errors.Is(err, errNoValidEmail) \|\| errors.As(err, &badAddrErr) {`
`458`	`458`	`m.updateLastNagTimestamps(ctx, parsedCerts)`
	`459`	`+ // Some accounts have no email; some accounts have an invalid email.`
	`460`	`+ // Treat those as non-error cases.`
	`461`	`+ return nil`
`459`	`462`	`}`
`460`	`463`
`461`	`464`	`m.stats.errorCount.With(prometheus.Labels{"type": "SendNags"}).Inc()`