Use context.TODO in more places

Author: jsha

cmd/contact-auditor/main.go

@@ -99,9 +99,9 @@ func (c contactAuditor) writeResults(result string) {
 // run retrieves a cursor from `beginAuditQuery` and then audits the
 // `contact` column of all returned rows for abnormalities or policy
 // violations.
-func (c contactAuditor) run(resChan chan *result) error {
+func (c contactAuditor) run(ctx context.Context, resChan chan *result) error {
 	c.logger.Infof("Beginning database query")
-	rows, err := c.beginAuditQuery(context.Background())
+	rows, err := c.beginAuditQuery(ctx)
 	if err != nil {
 		return err
 	}
@@ -194,7 +194,7 @@ func main() {
 
 	logger.Info("Running contact-auditor")
 
-	err = auditor.run(nil)
+	err = auditor.run(context.TODO(), nil)
 	cmd.FailOnError(err, "Audit was interrupted, results may be incomplete")
 
 	logger.Info("Audit finished successfully")

cmd/contact-auditor/main_test.go

@@ -41,7 +41,7 @@ func TestContactAuditor(t *testing.T) {
 	testCtx.addRegistrations(t)
 
 	resChan := make(chan *result, 10)
-	err := testCtx.c.run(resChan)
+	err := testCtx.c.run(context.Background(), resChan)
 	test.AssertNotError(t, err, "received error")
 
 	// We should get back A, B, C, and D

cmd/id-exporter/main.go

@@ -283,15 +283,15 @@ func main() {
 		hostnames, err := unmarshalHostnames(*hostnamesFile)
 		cmd.FailOnError(err, "Problem unmarshalling hostnames")
 
-		results, err = exporter.findIDsForHostnames(context.Background(), hostnames)
+		results, err = exporter.findIDsForHostnames(context.TODO(), hostnames)
 		cmd.FailOnError(err, "Could not find IDs for hostnames")
 
 	} else if *withExampleHostnames {
-		results, err = exporter.findIDsWithExampleHostnames(context.Background())
+		results, err = exporter.findIDsWithExampleHostnames(context.TODO())
 		cmd.FailOnError(err, "Could not find IDs with hostnames")
 
 	} else {
-		results, err = exporter.findIDs(context.Background())
+		results, err = exporter.findIDs(context.TODO())
 		cmd.FailOnError(err, "Could not find IDs")
 	}
 

cmd/notify-mailer/main.go

@@ -120,7 +120,7 @@ func (m *mailer) makeMessageBody(recipients []recipient) (string, error) {
 	return messageBody.String(), nil
 }
 
-func (m *mailer) run() error {
+func (m *mailer) run(ctx context.Context) error {
 	err := m.ok()
 	if err != nil {
 		return err
@@ -129,7 +129,7 @@ func (m *mailer) run() error {
 	totalRecipients := len(m.recipients)
 	m.log.Infof("Resolving addresses for (%d) recipients", totalRecipients)
 
-	addressToRecipient, err := m.resolveAddresses(context.Background())
+	addressToRecipient, err := m.resolveAddresses(ctx)
 	if err != nil {
 		return err
 	}
@@ -607,7 +607,7 @@ func main() {
 		parallelSends: *parallelSends,
 	}
 
-	err = m.run()
+	err = m.run(context.TODO())
 	cmd.FailOnError(err, "Couldn't complete")
 
 	log.Info("Completed successfully")

cmd/notify-mailer/main_test.go

@@ -295,7 +295,7 @@ func TestSleepInterval(t *testing.T) {
 	// Call run() - this should sleep `sleepLen` per destination address
 	// After it returns, we expect (sleepLen * number of destinations) seconds has
 	// elapsed
-	err := m.run()
+	err := m.run(context.Background())
 	test.AssertNotError(t, err, "error calling mailer run()")
 	expectedEnd := clock.NewFake()
 	expectedEnd.Add(time.Second * time.Duration(sleepLen*len(recipients)))
@@ -315,7 +315,7 @@ func TestSleepInterval(t *testing.T) {
 
 	// Call run() - this should blast through all destinations without sleep
 	// After it returns, we expect no clock time to have elapsed on the fake clock
-	err = m.run()
+	err = m.run(context.Background())
 	test.AssertNotError(t, err, "error calling mailer run()")
 	expectedEnd = clock.NewFake()
 	test.AssertEquals(t, m.clk.Now(), expectedEnd.Now())
@@ -346,7 +346,7 @@ func TestMailIntervals(t *testing.T) {
 
 	// Run the mailer. It should produce an error about the interval start
 	mc.Clear()
-	err := m.run()
+	err := m.run(context.Background())
 	test.AssertError(t, err, "expected error")
 	test.AssertEquals(t, len(mc.Messages), 0)
 
@@ -365,7 +365,7 @@ func TestMailIntervals(t *testing.T) {
 
 	// Run the mailer. It should produce an error about the sleep interval
 	mc.Clear()
-	err = m.run()
+	err = m.run(context.Background())
 	test.AssertEquals(t, len(mc.Messages), 0)
 	test.AssertEquals(t, err.Error(), "sleep interval (-10) is < 0")
 
@@ -387,7 +387,7 @@ func TestMailIntervals(t *testing.T) {
 	// [email protected] (beginning of the range),
 	// and one to [email protected].
 	mc.Clear()
-	err = m.run()
+	err = m.run(context.Background())
 	test.AssertNotError(t, err, "run() produced an error")
 	test.AssertEquals(t, len(mc.Messages), 2)
 	test.AssertEquals(t, mocks.MailerMessage{
@@ -418,7 +418,7 @@ func TestMailIntervals(t *testing.T) {
 	// Run the mailer. Two messages should have been produced, one to
 	// [email protected] (ID 1), one to [email protected] (ID 2)
 	mc.Clear()
-	err = m.run()
+	err = m.run(context.Background())
 	test.AssertNotError(t, err, "run() produced an error")
 	test.AssertEquals(t, len(mc.Messages), 2)
 	test.AssertEquals(t, mocks.MailerMessage{
@@ -457,7 +457,7 @@ func TestParallelism(t *testing.T) {
 	}
 
 	mc.Clear()
-	err := m.run()
+	err := m.run(context.Background())
 	test.AssertNotError(t, err, "run() produced an error")
 
 	// The fake clock should have advanced 9 seconds, one for each parallel
@@ -500,7 +500,7 @@ func TestMessageContentStatic(t *testing.T) {
 
 	// Run the mailer, one message should have been created with the content
 	// expected
-	err := m.run()
+	err := m.run(context.Background())
 	test.AssertNotError(t, err, "error calling mailer run()")
 	test.AssertEquals(t, len(mc.Messages), 1)
 	test.AssertEquals(t, mocks.MailerMessage{