Format Go with gofmt, then golines -m 77 (closes #215)

script/fmt now runs golines -m 77 after gofmt, repeating golines until
it changes nothing, since one pass can leave a line the next splits.
script/fmt-check fails when either would change a file.
script/bootstrap installs golines v0.13.0 with go install, pinned to
its commit, and checks the installed version with go version -m.

The tree is reformatted. The longer lines this makes are fixed by
hand: nolint directives moved onto their own line above the statement,
one string split, and 20 functions over funlen's 80 lines shortened or
split, RunWAF and limitPercentages among them.

Model: opus-5-5

internal/lookup/file.go

@@ -236,7 +236,11 @@ func read(path string) (*maxminddb.Reader, error) {
 
 	reader, err := maxminddb.OpenBytes(data)
 	if err != nil {
-		return nil, fmt.Errorf("SWW_LOOKUP_DB_PATH %s is not a .mmdb file: %w", path, err)
+		return nil, fmt.Errorf(
+			"SWW_LOOKUP_DB_PATH %s is not a .mmdb file: %w",
+			path,
+			err,
+		)
 	}
 
 	return reader, nil

internal/lookup/file_internal_test.go

@@ -26,11 +26,21 @@ const (
 	testClient   = "203.0.113.9/32"
 )
 
-func TestFilePlacesClientsAndCountsAnAddressMissingFromItAsUnknown(t *testing.T) {
+func TestFilePlacesClientsAndCountsAnAddressMissingFromItAsUnknown(
+	t *testing.T,
+) {
 	t.Parallel()
 
-	germany := lookuptest.Network{ASN: "AS64496", ASName: "Example Net", Country: "DE"}
-	northKorea := lookuptest.Network{ASN: "AS64511", ASName: "Other Net", Country: "KP"}
+	germany := lookuptest.Network{
+		ASN:     "AS64496",
+		ASName:  "Example Net",
+		Country: "DE",
+	}
+	northKorea := lookuptest.Network{
+		ASN:     "AS64511",
+		ASName:  "Other Net",
+		Country: "KP",
+	}
 	path := filepath.Join(t.TempDir(), "ipinfo_lite.mmdb")
 	lookuptest.Write(t, path, map[string]lookuptest.Network{
 		testNetblock:    germany,
@@ -62,7 +72,13 @@ func TestFilePlacesClientsAndCountsAnAddressMissingFromItAsUnknown(t *testing.T)
 			Client: prefix, ASN: want.ASN, ASName: want.ASName, Country: want.Country,
 			Answered: now,
 		}) {
-			t.Errorf("%s has the answer %+v, want %+v, answered %s", client, got, want, now)
+			t.Errorf(
+				"%s has the answer %+v, want %+v, answered %s",
+				client,
+				got,
+				want,
+				now,
+			)
 		}
 	}
 }
@@ -122,7 +138,9 @@ func TestFileThatCannotBeReadIsAnError(t *testing.T) {
 // reading due by then is done. The test sends the changes itself, as the
 // watch of a directory cannot run in a bubble.
 
-func TestReplacementCopiedOverTheFileInTwoPartsIsReadOnlyWhole(t *testing.T) {
+func TestReplacementCopiedOverTheFileInTwoPartsIsReadOnlyWhole(
+	t *testing.T,
+) {
 	t.Parallel()
 
 	synctest.Test(t, func(t *testing.T) {
@@ -137,7 +155,8 @@ func TestReplacementCopiedOverTheFileInTwoPartsIsReadOnlyWhole(t *testing.T) {
 		other := filepath.Join(dir, "replacement.mmdb")
 		writeDatabase(t, other, "KP")
 
-		replacement, err := os.ReadFile(other) //nolint:gosec // a file the test wrote
+		//nolint:gosec // a file the test wrote
+		replacement, err := os.ReadFile(other)
 		if err != nil {
 			t.Fatalf("read %s: %v", other, err)
 		}
@@ -176,15 +195,20 @@ func TestReplacementCopiedOverTheFileInTwoPartsIsReadOnlyWhole(t *testing.T) {
 		wantCountry(t, f, "KP")
 
 		if !f.LastRead().Equal(time.Now()) || f.ReadFailures() != 0 {
-			t.Errorf("read at %s, with %d failures; want read now, with none",
-				f.LastRead(), f.ReadFailures())
+			t.Errorf(
+				"read at %s, with %d failures; want read now, with none",
+				f.LastRead(),
+				f.ReadFailures(),
+			)
 		}
 
 		wantAlerts(t, queue)
 	})
 }
 
-func TestReplacementThatCannotBeReadLeavesTheFileInUseWithOneAlert(t *testing.T) {
+func TestReplacementThatCannotBeReadLeavesTheFileInUseWithOneAlert(
+	t *testing.T,
+) {
 	t.Parallel()
 
 	synctest.Test(t, func(t *testing.T) {
@@ -206,8 +230,12 @@ func TestReplacementThatCannotBeReadLeavesTheFileInUseWithOneAlert(t *testing.T)
 		wantCountry(t, f, "DE")
 
 		if !f.LastRead().Equal(read) || f.ReadFailures() != 1 {
-			t.Errorf("read at %s, with %d failures; want read at %s, with one",
-				f.LastRead(), f.ReadFailures(), read)
+			t.Errorf(
+				"read at %s, with %d failures; want read at %s, with one",
+				f.LastRead(),
+				f.ReadFailures(),
+				read,
+			)
 		}
 
 		wantAlerts(t, queue, alerts.Alert{
@@ -289,7 +317,11 @@ func writeDatabase(t *testing.T, path, country string) {
 	t.Helper()
 
 	lookuptest.Write(t, path, map[string]lookuptest.Network{
-		testNetblock: {ASN: "AS64496", ASName: "Example Net", Country: country},
+		testNetblock: {
+			ASN:     "AS64496",
+			ASName:  "Example Net",
+			Country: country,
+		},
 	})
 }
 
@@ -349,7 +381,8 @@ func wantAlerts(t *testing.T, queue *alerts.Queue, want ...alerts.Alert) {
 	t.Helper()
 
 	waiting := queue.Snapshot().Waiting[alerts.DestinationWebhook]
-	if len(waiting) != len(want) || (len(want) > 0 && !reflect.DeepEqual(waiting, want)) {
+	if len(waiting) != len(want) ||
+		(len(want) > 0 && !reflect.DeepEqual(waiting, want)) {
 		t.Errorf("alerts waiting %+v, want %+v", waiting, want)
 	}
 

internal/lookup/lookup.go

@@ -211,7 +211,10 @@ func (g *GeoJS) LookUp(ctx context.Context, client netip.Prefix) Answer {
 
 // LookUpWithoutWaiting is LookUp for a request that does not need the answer,
 // whatever Wait says: it returns the zero Answer at once when none is kept.
-func (g *GeoJS) LookUpWithoutWaiting(ctx context.Context, client netip.Prefix) Answer {
+func (g *GeoJS) LookUpWithoutWaiting(
+	ctx context.Context,
+	client netip.Prefix,
+) Answer {
 	answer, _ := g.answerOrWait(ctx, client, false)
 
 	return answer
@@ -429,14 +432,21 @@ func (g *GeoJS) keep(
 	}
 
 	if err == nil && leftOut > 0 {
-		err = fmt.Errorf("%w %d of %d addresses", errLeftOut, leftOut, len(clients))
+		err = fmt.Errorf(
+			"%w %d of %d addresses",
+			errLeftOut,
+			leftOut,
+			len(clients),
+		)
 	}
 
 	if err != nil {
 		g.metrics.GeoJSFailures.Inc()
 
-		g.retryDelay = min(max(retryDelayFactor*g.retryDelay, firstRetryDelay),
-			maxRetryDelay)
+		g.retryDelay = min(
+			max(retryDelayFactor*g.retryDelay, firstRetryDelay),
+			maxRetryDelay,
+		)
 		g.retryAt = now.Add(g.retryDelay)
 		g.asking = false
 
@@ -482,7 +492,12 @@ func (g *GeoJS) request(
 	ctx, cancel := context.WithTimeout(ctx, g.timeout)
 	defer cancel()
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, g.url, http.NoBody)
+	req, err := http.NewRequestWithContext(
+		ctx,
+		http.MethodGet,
+		g.url,
+		http.NoBody,
+	)
 	if err != nil {
 		return nil, fmt.Errorf("make the request to GeoJS: %w", err)
 	}
@@ -514,7 +529,8 @@ func (g *GeoJS) request(
 		CountryCode string `json:"country_code"`
 	}
 
-	err = json.NewDecoder(io.LimitReader(res.Body, maxResponseBytes)).Decode(&answers)
+	err = json.NewDecoder(io.LimitReader(res.Body, maxResponseBytes)).
+		Decode(&answers)
 	if err != nil {
 		return nil, fmt.Errorf("read GeoJS's answer: %w", err)
 	}

internal/lookup/lookup_test.go

@@ -85,8 +85,13 @@ func TestLookUpWithoutWaitingAsksGeoJSAndGoesOnAtOnce(t *testing.T) {
 		began := time.Now()
 		answer := g.LookUpWithoutWaiting(t.Context(), client)
 
-		if waited := time.Since(began); waited != 0 || answer != (lookup.Answer{}) {
-			t.Errorf("got %+v after %s, want no answer at once", answer, waited)
+		if waited := time.Since(began); waited != 0 ||
+			answer != (lookup.Answer{}) {
+			t.Errorf(
+				"got %+v after %s, want no answer at once",
+				answer,
+				waited,
+			)
 		}
 
 		waitForRequests(t, geojs, 1)
@@ -100,7 +105,11 @@ func TestLookUpWithoutWaitingAsksGeoJSAndGoesOnAtOnce(t *testing.T) {
 		waitForCountry(t, g, clock, client, germany)
 
 		if got := g.LookUpWithoutWaiting(t.Context(), client).Country; got != germany {
-			t.Errorf("the kept answer gives the country %q, want %q", got, germany)
+			t.Errorf(
+				"the kept answer gives the country %q, want %q",
+				got,
+				germany,
+			)
 		}
 	})
 }
@@ -120,7 +129,9 @@ func TestNewClientWaitsAtMostOneSecondThenCountsAsNotFound(t *testing.T) {
 
 		var earlier sync.WaitGroup
 
-		earlier.Go(func() { g.LookUp(t.Context(), netip.MustParsePrefix("203.0.113.1/32")) })
+		earlier.Go(
+			func() { g.LookUp(t.Context(), netip.MustParsePrefix("203.0.113.1/32")) },
+		)
 		defer earlier.Wait()
 
 		waitForRequests(t, geojs, 1)
@@ -152,7 +163,9 @@ func TestNewClientWaitsAtMostOneSecondThenCountsAsNotFound(t *testing.T) {
 	})
 }
 
-func TestRequestWaitsAsLongAsTheTimeoutSaysAndGeoJSIsAbandonedAfterIt(t *testing.T) {
+func TestRequestWaitsAsLongAsTheTimeoutSaysAndGeoJSIsAbandonedAfterIt(
+	t *testing.T,
+) {
 	t.Parallel()
 
 	synctest.Test(t, func(t *testing.T) {
@@ -197,7 +210,11 @@ func TestRequestWaitsAsLongAsTheTimeoutSaysAndGeoJSIsAbandonedAfterIt(t *testing
 		synctest.Wait()
 
 		if waited != longerTimeout {
-			t.Errorf("waited %s for the answer, want %s", waited, longerTimeout)
+			t.Errorf(
+				"waited %s for the answer, want %s",
+				waited,
+				longerTimeout,
+			)
 		}
 
 		wantFailures(t, m, 1)
@@ -340,7 +357,11 @@ func TestWithoutWaitTheRequestGoesOnAtOnceAndTheAnswerIsGivenWhenItComes(
 
 		got := g.LookUp(t.Context(), client)
 		if took := time.Since(began); took != 0 || got != (lookup.Answer{}) {
-			t.Errorf("waited %s for %+v, want no wait and no answer", took, got)
+			t.Errorf(
+				"waited %s for %+v, want no wait and no answer",
+				took,
+				got,
+			)
 		}
 
 		waitForRequests(t, geojs, 1)
@@ -391,7 +412,10 @@ func TestFailureIsLoggedWithoutTheAddressesAskedAbout(t *testing.T) {
 		logged := log.String()
 		if !strings.Contains(logged, "asking GeoJS failed") ||
 			strings.Contains(logged, "203.0.113.9") {
-			t.Errorf("logged %q, want the failure without the address asked about", logged)
+			t.Errorf(
+				"logged %q, want the failure without the address asked about",
+				logged,
+			)
 		}
 	})
 }
@@ -430,7 +454,10 @@ func TestFailureRaisesASourceFailureAlertOncePerCooldown(t *testing.T) {
 		}
 
 		if queue.Suppressed() != 1 {
-			t.Errorf("%d alerts held back, want the repeat", queue.Suppressed())
+			t.Errorf(
+				"%d alerts held back, want the repeat",
+				queue.Suppressed(),
+			)
 		}
 	})
 }
@@ -454,11 +481,21 @@ func TestWaitingClientsAreAskedAboutInOneRequest(t *testing.T) {
 		clock.advance(time.Second)
 		wantCountry(t, g, netip.MustParsePrefix("203.0.113.3/32"), germany)
 		wantRequests(t, geojs, 2)
-		wantAsked(t, geojs, 1, "203.0.113.1", "203.0.113.2", "2001:db8:1:2::", "203.0.113.3")
+		wantAsked(
+			t,
+			geojs,
+			1,
+			"203.0.113.1",
+			"203.0.113.2",
+			"2001:db8:1:2::",
+			"203.0.113.3",
+		)
 	})
 }
 
-func TestKeptAnswersUnaffectedWhileGeoJSFailsAndAskedAgainWithBackoff(t *testing.T) {
+func TestKeptAnswersUnaffectedWhileGeoJSFailsAndAskedAgainWithBackoff(
+	t *testing.T,
+) {
 	t.Parallel()
 
 	synctest.Test(t, func(t *testing.T) {
@@ -503,7 +540,10 @@ func TestKeptAnswersUnaffectedWhileGeoJSFailsAndAskedAgainWithBackoff(t *testing
 
 		asked := waitForRequests(t, geojs, requests+1)
 		if len(asked[requests]) != 23 {
-			t.Errorf("GeoJS was asked about %d clients, want 23", len(asked[requests]))
+			t.Errorf(
+				"GeoJS was asked about %d clients, want 23",
+				len(asked[requests]),
+			)
 		}
 	})
 }
@@ -531,8 +571,11 @@ func TestAtMost200AddressesInOneRequest(t *testing.T) {
 
 		asked := waitForRequests(t, geojs, 3)
 		if len(asked[1]) != 200 || len(asked[2]) != 1 {
-			t.Errorf("GeoJS was asked about %d and then %d clients, want 200 and 1",
-				len(asked[1]), len(asked[2]))
+			t.Errorf(
+				"GeoJS was asked about %d and then %d clients, want 200 and 1",
+				len(asked[1]),
+				len(asked[2]),
+			)
 		}
 	})
 }
@@ -687,7 +730,11 @@ func (s *standIn) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 		switch {
 		case addr == unplaced:
-			item = map[string]any{"ip": addr, "asn": 64512, "organization_name": "Unknown"}
+			item = map[string]any{
+				"ip":                addr,
+				"asn":               64512,
+				"organization_name": "Unknown",
+			}
 		case addr == leftOut && answers == answeringWithoutLeftOut:
 			continue
 		case answers == answeringInLowerCase:
@@ -804,7 +851,12 @@ func newClients() func() netip.Prefix {
 }
 
 // wantCountry checks the country g gives client.
-func wantCountry(t *testing.T, g *lookup.GeoJS, client netip.Prefix, want string) {
+func wantCountry(
+	t *testing.T,
+	g *lookup.GeoJS,
+	client netip.Prefix,
+	want string,
+) {
 	t.Helper()
 
 	got := g.LookUp(t.Context(), client).Country
@@ -843,7 +895,11 @@ func wantAsked(t *testing.T, geojs *standIn, i int, want ...string) {
 
 // wantRequestsWithoutGeoJSAnswer checks how many requests m counts as having
 // gone without an answer from GeoJS.
-func wantRequestsWithoutGeoJSAnswer(t *testing.T, m *metrics.Metrics, want float64) {
+func wantRequestsWithoutGeoJSAnswer(
+	t *testing.T,
+	m *metrics.Metrics,
+	want float64,
+) {
 	t.Helper()
 
 	got := testutil.ToFloat64(m.RequestsWithoutGeoJSAnswer)
@@ -883,7 +939,11 @@ func waitForRequests(t *testing.T, geojs *standIn, count int) [][]string {
 // It then checks that client's next request does not wait but has it asked
 // about again in the background, after which g gives it the country want.
 func waitForCountry(
-	t *testing.T, g *lookup.GeoJS, clock *testClock, client netip.Prefix, want string,
+	t *testing.T,
+	g *lookup.GeoJS,
+	clock *testClock,
+	client netip.Prefix,
+	want string,
 ) {
 	t.Helper()
 

internal/lookup/lookuptest/lookuptest.go

@@ -45,7 +45,11 @@ func Write(tb testing.TB, path string, networks map[string]Network) {
 
 // WriteRecords writes a lookup database at path that holds each record in
 // records for its netblock, and nothing for any other address.
-func WriteRecords(tb testing.TB, path string, records map[string]mmdbtype.Map) {
+func WriteRecords(
+	tb testing.TB,
+	path string,
+	records map[string]mmdbtype.Map,
+) {
 	tb.Helper()
 
 	tree, err := mmdbwriter.New(mmdbwriter.Options{

internal/lookup/snapshot_test.go

@@ -59,7 +59,10 @@ func TestLoadedAnswersAreKeptFor7DaysFromWhenGeoJSGaveThem(t *testing.T) {
 	g.Load([]lookup.Answer{kept, stale})
 
 	if got := g.Snapshot(); !slices.Equal(got, []lookup.Answer{kept}) {
-		t.Errorf("kept %+v, want only the answer GeoJS gave less than 7 days ago", got)
+		t.Errorf(
+			"kept %+v, want only the answer GeoJS gave less than 7 days ago",
+			got,
+		)
 	}
 
 	wantCountry(t, g, kept.Client, "FR")