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
@@ -79,7 +79,11 @@ func startRProxy(t *testing.T, backend, appURL string) (string, *output) {
 		select {
 		case status := <-exited:
 			if status != 0 {
-				t.Errorf("rproxy's exit status %d, want 0; output:\n%s", status, out.text())
+				t.Errorf(
+					"rproxy's exit status %d, want 0; output:\n%s",
+					status,
+					out.text(),
+				)
 			}
 		case <-time.After(waitLimit):
 			t.Error("rproxy still running after being told to stop")
@@ -94,7 +98,10 @@ func startRProxy(t *testing.T, backend, appURL string) (string, *output) {
 // startWAF runs waf with the settings in env, and returns
 // its address and URL, what it writes, and what stops it, which checks that it
 // stopped in order.
-func startWAF(t *testing.T, env map[string]string) (string, *output, func()) {
+func startWAF(
+	t *testing.T,
+	env map[string]string,
+) (string, *output, func()) {
 	t.Helper()

 	ctx, stop := context.WithCancel(t.Context())
@@ -113,7 +120,11 @@ func startWAF(t *testing.T, env map[string]string) (string, *output, func()) {
 		select {
 		case status := <-exited:
 			if status != 0 {
-				t.Fatalf("waf's exit status %d, want 0; output:\n%s", status, out.text())
+				t.Fatalf(
+					"waf's exit status %d, want 0; output:\n%s",
+					status,
+					out.text(),
+				)
 			}
 		case <-time.After(waitLimit):
 			t.Fatal("waf still running after being told to stop")
@@ -341,7 +352,12 @@ func pipe(dst, src net.Conn) {
 // answersNormally reports whether a request to url from the client at from, as
 // X-Forwarded-For names it, gets the app's answer.
 func answersNormally(ctx context.Context, url, from string) bool {
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, http.NoBody)
+	req, err := http.NewRequestWithContext(
+		ctx,
+		http.MethodGet,
+		url,
+		http.NoBody,
+	)
 	if err != nil {
 		return false
 	}
@@ -359,7 +375,8 @@ func answersNormally(ctx context.Context, url, from string) bool {
 	body, err := io.ReadAll(res.Body)
 	_ = res.Body.Close()

-	return err == nil && res.StatusCode == http.StatusOK && string(body) == greeting
+	return err == nil && res.StatusCode == http.StatusOK &&
+		string(body) == greeting
 }

 // sendRaw sends request, as it is, to rproxy at site, and returns the status of
@@ -412,9 +429,16 @@ func TestAChunkedBodyStaysABodyAtWAF(t *testing.T) {
 		waf.ClientHeader + ": " + otherClient + "\r\n" +
 		"X-Request-ID: " + smuggledID + "\r\n\r\n"

-	status := sendRaw(t, site, "POST /upload HTTP/1.1\r\nHost: site.example\r\n"+
-		"X-Forwarded-For: "+placed+"\r\nTransfer-Encoding: chunked\r\n\r\n"+
-		strconv.FormatInt(int64(len(smuggled)), 16)+"\r\n"+smuggled+"\r\n0\r\n\r\n")
+	status := sendRaw(
+		t,
+		site,
+		"POST /upload HTTP/1.1\r\nHost: site.example\r\n"+
+			"X-Forwarded-For: "+placed+"\r\nTransfer-Encoding: chunked\r\n\r\n"+
+			strconv.FormatInt(
+				int64(len(smuggled)),
+				16,
+			)+"\r\n"+smuggled+"\r\n0\r\n\r\n",
+	)
 	if status != http.StatusOK {
 		t.Errorf("status %d, want the app's 200", status)
 	}
@@ -443,8 +467,12 @@ func TestATargetThatCannotGoToWAFIsRefusedForABannedClient(t *testing.T) {

 	wantStatus(t, site+bannedProbe, placed, http.StatusForbidden)

-	status := sendRaw(t, site, "GET x:admin HTTP/1.1\r\nHost: site.example\r\n"+
-		"X-Forwarded-For: "+placed+"\r\n\r\n")
+	status := sendRaw(
+		t,
+		site,
+		"GET x:admin HTTP/1.1\r\nHost: site.example\r\n"+
+			"X-Forwarded-For: "+placed+"\r\n\r\n",
+	)
 	if status != http.StatusBadRequest {
 		t.Errorf("status %d, want 400", status)
 	}
@@ -470,7 +498,8 @@ func TestAClientWithAZoneIsTheClientWithout(t *testing.T) {
 	wantStatus(t, site+"/", "2001:db8::1", http.StatusForbidden)

 	line := out.line(t, "path", bannedProbe)
-	if line["client_ip"] != "2001:db8::1" || line["default_disposition"] != nil {
+	if line["client_ip"] != "2001:db8::1" ||
+		line["default_disposition"] != nil {
 		t.Errorf("rproxy's line is %v", line)
 	}
 }
@@ -495,7 +524,10 @@ func TestAStatusWAFDoesNotTakeIsReportedAs599(t *testing.T) {

 	line := out.line(t, "path", "/")
 	if line["status"] != float64(status) {
-		t.Errorf("rproxy's line is %v, want the status the visitor got", line)
+		t.Errorf(
+			"rproxy's line is %v, want the status the visitor got",
+			line,
+		)
 	}

 	id, _ := line["request_id"].(string)
@@ -519,7 +551,8 @@ func startRProxyProcess(t *testing.T, env ...string) (string, func()) {
 	}

 	out := &output{}
-	cmd := exec.CommandContext(t.Context(), binary) //nolint:gosec // this test binary
+	//nolint:gosec // this test binary
+	cmd := exec.CommandContext(t.Context(), binary)
 	cmd.Stdout = out

 	cmd.Env = append(os.Environ(),
@@ -540,7 +573,11 @@ func startRProxyProcess(t *testing.T, env ...string) (string, func()) {
 		select {
 		case status := <-exited:
 			if status != 0 {
-				t.Errorf("exit status %d, want 0; output:\n%s", status, out.text())
+				t.Errorf(
+					"exit status %d, want 0; output:\n%s",
+					status,
+					out.text(),
+				)
 			}
 		case <-time.After(waitLimit):
 			t.Error("still running after being told to stop")
@@ -587,7 +624,11 @@ func TestRProxyAsksAWAFThatSpeaksHTTP2OverHTTP1(t *testing.T) {
 		"Connection":          "Connection: anything\r\n",
 		"a WebSocket upgrade": "Connection: Upgrade\r\nUpgrade: websocket\r\n",
 	} {
-		status := sendRaw(t, addr, "GET / HTTP/1.1\r\nHost: site.example\r\n"+headers+"\r\n")
+		status := sendRaw(
+			t,
+			addr,
+			"GET / HTTP/1.1\r\nHost: site.example\r\n"+headers+"\r\n",
+		)
 		if status != http.StatusForbidden {
 			t.Errorf("with %s: status %d, want waf's 403", name, status)
 		}
@@ -595,7 +636,11 @@ func TestRProxyAsksAWAFThatSpeaksHTTP2OverHTTP1(t *testing.T) {
 		select {
 		case protocol := <-protocols:
 			if protocol != "HTTP/1.1" {
-				t.Errorf("with %s: asked over %s, want HTTP/1.1", name, protocol)
+				t.Errorf(
+					"with %s: asked over %s, want HTTP/1.1",
+					name,
+					protocol,
+				)
 			}
 		case <-time.After(waitLimit):
 			t.Errorf("with %s: waf was not asked", name)
@@ -616,7 +661,11 @@ func TestRProxyProcessLinesNameTheHostAndComeAtInfo(t *testing.T) {

 	line := out.line(t, "msg", "starting")
 	if line["instance"] != hostname || line["level"] != "INFO" {
-		t.Errorf("rproxy's line is %v, want instance %s at INFO", line, hostname)
+		t.Errorf(
+			"rproxy's line is %v, want instance %s at INFO",
+			line,
+			hostname,
+		)
 	}
 }

@@ -681,7 +730,11 @@ func TestRProxyStoppingWaitsForAReportBeingSent(t *testing.T) {
 	select {
 	case status := <-exited:
 		if status != 0 {
-			t.Errorf("rproxy's exit status %d, want 0; output:\n%s", status, out.text())
+			t.Errorf(
+				"rproxy's exit status %d, want 0; output:\n%s",
+				status,
+				out.text(),
+			)
 		}
 	case <-time.After(waitLimit):
 		t.Error("rproxy still running, the report having been answered")
@@ -755,7 +808,11 @@ func TestRProxyStoppingCutsOffARequestAfterFiveSeconds(t *testing.T) {
 	}()

 	addr, _ := out.lineBeforeExit(t, "starting", exited)["address"].(string)
-	conn := sendAndKeepOpen(t, addr, "GET / HTTP/1.1\r\nHost: site.example\r\n\r\n")
+	conn := sendAndKeepOpen(
+		t,
+		addr,
+		"GET / HTTP/1.1\r\nHost: site.example\r\n\r\n",
+	)

 	select {
 	case <-asked:
@@ -779,7 +836,11 @@ func TestRProxyStoppingCutsOffARequestAfterFiveSeconds(t *testing.T) {
 	select {
 	case status := <-exited:
 		if status != 0 {
-			t.Errorf("rproxy's exit status %d, want 0; output:\n%s", status, out.text())
+			t.Errorf(
+				"rproxy's exit status %d, want 0; output:\n%s",
+				status,
+				out.text(),
+			)
 		}
 	case <-time.After(waitLimit):
 		t.Error("rproxy still running after the cut-off")
@@ -814,7 +875,11 @@ func TestRProxyInvalidSettingStopsTheStart(t *testing.T) {
 			message, _ := line["error"].(string)

 			if !strings.HasPrefix(message, tc.setting+": ") {
-				t.Errorf("start refused with %v, want it to name %s", line, tc.setting)
+				t.Errorf(
+					"start refused with %v, want it to name %s",
+					line,
+					tc.setting,
+				)
 			}
 		})
 	}
@@ -823,7 +888,11 @@ func TestRProxyInvalidSettingStopsTheStart(t *testing.T) {
 func TestRProxyAddressInUseStopsTheStart(t *testing.T) {
 	t.Parallel()

-	taken, err := (&net.ListenConfig{}).Listen(t.Context(), "tcp", localhost+":0")
+	taken, err := (&net.ListenConfig{}).Listen(
+		t.Context(),
+		"tcp",
+		localhost+":0",
+	)
 	if err != nil {
 		t.Fatalf("listen: %v", err)
 	}