various PR feedback fixes

cmd/gardener/gardener.go

@@ -19,6 +19,7 @@ import (
 	"time"
 
 	"github.com/m-lab/go/prometheusx"
+	"github.com/m-lab/go/rtx"
 
 	"github.com/m-lab/etl-gardener/cloud"
 	job "github.com/m-lab/etl-gardener/job-service"
@@ -288,9 +289,7 @@ func main() {
 		// This is new new "manager" mode, in which Gardener provides /job and /update apis
 		// for parsers to get work and report progress.
 		svc, err := job.NewJobService(time.Date(2009, 2, 1, 0, 0, 0, 0, time.UTC))
-		if err != nil {
-			log.Fatal("Could not initialize job service")
-		}
+		rtx.Must(err, "Could not initialize job service")
 		http.HandleFunc("/job", svc.JobHandler)
 		healthy = true
 		log.Println("Running as manager service")

cmd/gardener/gardener_test.go

@@ -9,10 +9,13 @@ import (
 	"context"
 	_ "expvar"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"os"
 	"testing"
 	"time"
+
+	"github.com/m-lab/go/osx"
 )
 
 func TestLegacyModeSetup(t *testing.T) {
@@ -25,10 +28,8 @@ func TestLegacyModeSetup(t *testing.T) {
 		"START_DATE":      "20090220",
 	}
 	for k, v := range vars {
-		err := os.Setenv(k, v)
-		if err != nil {
-			t.Fatal(err)
-		}
+		cleanup := osx.MustSetenv(k, v)
+		defer cleanup()
 	}
 
 	LoadEnv()
@@ -46,10 +47,8 @@ func TestManagerMode(t *testing.T) {
 		"ARCHIVE_BUCKET": "archive-mlab-testing",
 	}
 	for k, v := range vars {
-		err := os.Setenv(k, v)
-		if err != nil {
-			t.Fatal(err)
-		}
+		cleanup := osx.MustSetenv(k, v)
+		defer cleanup()
 	}
 
 	go main()
@@ -64,3 +63,15 @@ func TestManagerMode(t *testing.T) {
 		t.Fatal(string(data))
 	}
 }
+
+func TestEnv(t *testing.T) {
+	vars := map[string]string{
+		"SERVICE_MODE":   "manager",
+		"PROJECT":        "foobar",
+		"ARCHIVE_BUCKET": "archive-mlab-testing",
+	}
+	for k := range vars {
+		v := os.Getenv(k)
+		log.Println(k, v)
+	}
+}

job-service/job-service.go

@@ -18,11 +18,13 @@ import (
 type Service struct {
 	lock sync.Mutex
 
-	startDate  time.Time      // The date to restart at.
-	date       time.Time      // The date currently being dispatched.
-	dateFilter *regexp.Regexp // filter to apply to dates.
-	jobTypes   []tracker.Job  // The job prefixes to be iterated through.
-	nextIndex  int            // index of TypeSource to dispatch next.
+	startDate time.Time // The date to restart at.
+	date      time.Time // The date currently being dispatched.
+	// Filter to apply to dates if we want to process a subset for sanity checking.
+	// For production, this will always be nil.
+	dateFilter *regexp.Regexp
+	jobTypes   []tracker.Job // The job prefixes to be iterated through.
+	nextIndex  int           // index of TypeSource to dispatch next.
 }
 
 func (svc *Service) advanceDate() {

job-service/job-service_test.go

@@ -13,12 +13,11 @@ import (
 	"github.com/m-lab/etl-gardener/tracker"
 )
 
-func now() time.Time {
-	return time.Date(2011, 2, 6, 1, 2, 3, 4, time.UTC)
-}
-
 func TestService_NextJob(t *testing.T) {
-	monkey.Patch(time.Now, now)
+	// This allows predictable behavior from time.Since in the advanceDate function.
+	monkey.Patch(time.Now, func() time.Time {
+		return time.Date(2011, 2, 6, 1, 2, 3, 4, time.UTC)
+	})
 	defer monkey.Unpatch(time.Now)
 
 	start := time.Date(2011, 2, 3, 5, 6, 7, 8, time.UTC)