From a19d51b89055feb3a3458246aa3646ecb9eff09d Mon Sep 17 00:00:00 2001 From: "randomizedcoder dave.seddon.ca@gmail.com" Date: Fri, 13 Nov 2026 22:34:10 -0800 Subject: [PATCH] fix(lint): check the treatment agent's Close, nixfmt quality.nix #305 added the treatment tag to the golangci tiers, which linted cmd/xtcp2/treatments_embedded.go for the first time (errcheck on a.Close), and its quality.nix edit was not nixfmt-clean. Co-Authored-By: Claude Opus 5.5 --- cmd/xtcp2/treatments_embedded.go | 8 +++++++- nix/tests/tcp-controller/quality.nix | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/xtcp2/treatments_embedded.go b/cmd/xtcp2/treatments_embedded.go index 8e9b31901..50a63de9b 100644 --- a/cmd/xtcp2/treatments_embedded.go +++ b/cmd/xtcp2/treatments_embedded.go @@ -37,5 +37,11 @@ func startEmbeddedTreatmentAgent(ctx context.Context, path, location string) (*t var wg sync.WaitGroup wg.Add(1) go func() { defer wg.Done(); a.Run(ctx) }() - return &treatmentFeeder{stamp: a.Stamp, wake: a.Wake}, func() { wg.Wait(); a.Close() }, nil + stop := func() { + wg.Wait() + if err := a.Close(); err != nil { + log.Printf("treatment agent: close: %v", err) + } + } + return &treatmentFeeder{stamp: a.Stamp, wake: a.Wake}, stop, nil } diff --git a/nix/tests/tcp-controller/quality.nix b/nix/tests/tcp-controller/quality.nix index 946f5995f..67b339c6e 100644 --- a/nix/tests/tcp-controller/quality.nix +++ b/nix/tests/tcp-controller/quality.nix @@ -53,7 +53,9 @@ let # These fixtures must execute, never silently skip in the focused checks. grep -q -- '--- PASS: TestPostgresConcurrentReviewFencesReplicas' "$out/tests.log" grep -q -- '--- PASS: TestClickHouseAnalysisCounterDeltas' "$out/tests.log" - go test -tags treatment -ldflags=-checklinkname=0 ${if race then "-race -count=3" else "-count=1 -cover"} \ + go test -tags treatment -ldflags=-checklinkname=0 ${ + if race then "-race -count=3" else "-count=1 -cover" + } \ -timeout 5m -v -run '^TestTreatment' ./internal/goip/actuate > "$out/routes.log" 2>&1 \ || { cat "$out/routes.log"; exit 1; } ${if race then "" else coverageTable}