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
2026-11-11 15:14:58 +00:00
1 parent 63e58e326b
commit 7f8a59de04
@@ -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()