Describe code in its own terms, not by an earlier build's data (closes #522)

Several comments justified code by what an earlier build would have
left in a database or on disk. Each now says what the code does:
reserveSQLiteFile sets the mode on every open whoever created the
file, and expired treats a session lacking a deadline's timestamp as
expired. The comments on retention, resubmitted events, archive
pruning, target headers, the redactor and the delivery result view
drop their mentions of older rows. parseMaxRetries loses its
paragraph on targets saved before the ceiling existed, and neither
BeforeSave nor retentionCutoff cites a migration. Comments only.

Model: opus-5-5

Dockerfile

@@ -214,22 +214,16 @@ RUN version="$(make version VERSION="$VERSION")"; \
 # (Alpine.js, extracted from its tarball in 3p/) first.
 RUN make build VERSION="$VERSION"
 
-# Rebuild with static linking for the Alpine runtime. The cgo binary the
+# Rebuild with static linking for Alpine runtime.
-# step above builds is dynamically linked against glibc, which Alpine
+# make build already verified compilation.
-# (musl) does not have.
+# The CGO binary from `make build` is dynamically linked against glibc,
+# which doesn't exist on Alpine (musl). Rebuild with static linking so
+# the binary runs on Alpine without glibc.
 #
-# A statically linked glibc still loads shared libraries at run time for
+# The static flags go in through GO_LDFLAGS rather than a -ldflags of
-# getaddrinfo and dlopen, and Alpine has none to load, so the build tags
+# their own: the build target composes them with the -X that stamps the
-# keep both out of the binary: netgo and osusergo select Go's own DNS
+# version, so this relink cannot silently drop the stamp.
-# resolver and user lookup instead of glibc's, and
+RUN CGO_ENABLED=1 make build VERSION="$VERSION" GO_LDFLAGS='-extldflags "-static"'
-# sqlite_omit_load_extension leaves out SQLite extension loading, which
-# webhooker never uses.
-#
-# The static flags and tags go in through GO_LDFLAGS and GO_TAGS rather
-# than a -ldflags of their own: the build target composes them with the
-# -X that stamps the version, so this relink cannot silently drop the
-# stamp.
-RUN CGO_ENABLED=1 make build VERSION="$VERSION" GO_TAGS=netgo,osusergo,sqlite_omit_load_extension GO_LDFLAGS='-extldflags "-static"'
 
 # Runtime stage
 # alpine:3.21, 2026-03-17

Makefile

@@ -16,16 +16,14 @@ VERSION ?= $(shell script/version)
 # exists to correct.
 override VERSION := $(or $(strip $(VERSION)),$(shell script/version))
 
-# Extra linker flags and build tags for the build target. The static
+# Extra linker flags for the build target. The static relink in the
-# relink in the Dockerfile passes -extldflags and its build tags through
+# Dockerfile adds -extldflags here rather than passing its own -ldflags,
-# these rather than a -ldflags of its own, so composing flags cannot drop
+# so composing flags cannot drop the version stamp.
-# the version stamp.
 #
 # The build target itself always passes -trimpath and -s -w, as the Go
 # Dockerfile in REPO_POLICIES.md does: no build paths, symbol table or
 # debug information in the binary.
 GO_LDFLAGS ?=
-GO_TAGS ?=
 
 bootstrap:
 	@script/bootstrap
@@ -55,7 +53,7 @@ check:
 	@script/check
 
 build: assets
-	go build -trimpath -tags '$(GO_TAGS)' -ldflags '$(strip -s -w -X main.version=$(VERSION) $(GO_LDFLAGS))' -o bin/webhooker ./cmd/webhooker
+	go build -trimpath -ldflags '$(strip -s -w -X main.version=$(VERSION) $(GO_LDFLAGS))' -o bin/webhooker ./cmd/webhooker
 
 run: build
 	./bin/webhooker

README.md

@@ -3419,14 +3419,12 @@ fixed independently of the compiler's:
    phases and the `css-check` and `markdown-check` stages passing (it copies a
    file from each), runs `make build` (which extracts Alpine.js from `3p/`
    first), and then rebuilds the binary with `CGO_ENABLED=1` and static linking
-   so it runs on musl, with the build tags `netgo`, `osusergo` and
+   so it runs on musl. Both builds go through `make build`, the relink adding
-   `sqlite_omit_load_extension` so it needs none of glibc's shared libraries at
+   its `-extldflags` via `GO_LDFLAGS`, so neither can drop the `-X` that stamps
-   run time. Both builds go through `make build`, the relink adding its
+   the version. The version is the `VERSION` build arg if one is given,
-   `-extldflags` via `GO_LDFLAGS` and its tags via `GO_TAGS`, so neither can
+   otherwise derived from the `.git` in the context, and the stage fails if a
-   drop the `-X` that stamps the version. The version is the `VERSION` build arg
+   context with `.git` would stamp an empty version, `dev` or `unknown` (see
-   if one is given, otherwise derived from the `.git` in the context, and the
+   [Version stamping](#version-stamping)).
-   stage fails if a context with `.git` would stamp an empty version, `dev` or
-   `unknown` (see [Version stamping](#version-stamping)).
 7. **Runtime stage** (`alpine:3.21`) — copies the static binary and
    `deploy/docker-entrypoint.sh`, creates the `/var/lib/webhooker` directory for
    all SQLite databases, exposes port 8080, and includes a health check against

internal/database/sqlite_open.go

@@ -241,19 +241,7 @@ func SQLiteDSN(path, mode string) string {
 	)
 	q.Add("_pragma", "journal_mode(WAL)")
 
-	// SQLite reads a file: URI's path only up to the first ? or #, and
+	return "file:" + path + "?" + q.Encode()
-	// decodes %XX escapes in it, so url.URL escapes the path. OmitHost
-	// keeps a relative path as "file:data/x.db"; written
-	// "file://data/x.db", SQLite would reject "data" as the URI's
-	// authority.
-	dsn := url.URL{
-		Scheme:   "file",
-		Path:     path,
-		OmitHost: true,
-		RawQuery: q.Encode(),
-	}
-
-	return dsn.String()
 }
 
 // OpenSQLite opens the SQLite file at path with the service's

internal/database/sqlite_open_test.go

@@ -2,8 +2,6 @@ package database_test
 
 import (
 	"context"
-	"database/sql"
-	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -114,79 +112,6 @@ func TestMainDBAppliesPragmasOnALiveHandle(t *testing.T) {
 	assert.Equal(t, "10000", busy)
 }
 
-// TestOpenSQLiteOpensThePathAskedFor uses a data directory whose name
-// holds ?, # and %. SQLite reads a file: URI's path only up to a ? or
-// #, and decodes %41 to A, so an unescaped path sent every database in
-// that directory to one file outside it.
-func TestOpenSQLiteOpensThePathAskedFor(t *testing.T) {
-	t.Parallel()
-
-	dir := filepath.Join(t.TempDir(), "hooks#1?x%41")
-	require.NoError(t, os.Mkdir(dir, 0o700))
-
-	for _, name := range []string{
-		database.MainDBFileName,
-		"events-" + uuid.New().String() + ".db",
-	} {
-		path := filepath.Join(dir, name)
-
-		sqlDB, err := database.OpenSQLite(
-			path, database.SQLiteModeCreate,
-		)
-		require.NoError(t, err)
-
-		t.Cleanup(func() { assert.NoError(t, sqlDB.Close()) })
-
-		assertOpenedFile(t, sqlDB, path)
-	}
-}
-
-// TestOpenSQLiteOpensARelativePath opens a database at a path relative
-// to the working directory, which is what a relative DATA_DIR such as
-// the README's DATA_DIR=../webhooker-data gives OpenSQLite.
-//
-//nolint:paralleltest // t.Chdir moves the whole process.
-func TestOpenSQLiteOpensARelativePath(t *testing.T) {
-	t.Chdir(t.TempDir())
-	require.NoError(t, os.Mkdir("data", 0o700))
-
-	path := filepath.Join("data", database.MainDBFileName)
-
-	sqlDB, err := database.OpenSQLite(path, database.SQLiteModeCreate)
-	require.NoError(t, err)
-
-	defer func() { require.NoError(t, sqlDB.Close()) }()
-
-	assertOpenedFile(t, sqlDB, path)
-}
-
-// assertOpenedFile checks that sqlDB is the SQLite file at path.
-// database_list names the file SQLite actually opened, as an absolute
-// path with symlinks resolved, so the files are compared, not the names.
-func assertOpenedFile(t *testing.T, sqlDB *sql.DB, path string) {
-	t.Helper()
-
-	var (
-		seq          int
-		schema, file string
-	)
-
-	require.NoError(t, sqlDB.
-		QueryRowContext(t.Context(), "pragma database_list").
-		Scan(&seq, &schema, &file))
-
-	asked, err := os.Stat(path)
-	require.NoError(t, err)
-
-	opened, err := os.Stat(file)
-	require.NoError(t, err)
-
-	assert.True(
-		t, os.SameFile(asked, opened),
-		"asked for %s, SQLite opened %s", path, file,
-	)
-}
-
 // TestConcurrentReaderDoesNotBlockWrites is the unit-scale form of the
 // reproduction in
 // https://git.eeqj.de/sneak/webhooker/issues/256: an operator's

internal/handlers/delivery_attempts_test.go

@@ -42,6 +42,9 @@ func TestDeliveryAttempts_ReadInTheTargetTypesOwnTerms(t *testing.T) {
 		{database.TargetTypeLog, true, 0, "", "written to the log", ""},
 	}
 
+	// Named for type and outcome, so that no two cases share a name:
+	// Go adds "#01" to a repeated one, and a "#" in the temporary
+	// directory's path cuts the path SQLiteDSN gives SQLite short.
 	for _, tc := range cases {
 		t.Run(string(tc.targetType)+" "+tc.outcome, func(t *testing.T) {
 			t.Parallel()

internal/versionscript/version_script_test.go

@@ -156,8 +156,7 @@ func TestVersion_IsStableAcrossInvocations(t *testing.T) {
 // The build target is the only place composing linker flags. If a
 // future edit drops either half, the binary silently reports "dev"
 // again (the defect this package exists for) or fails to link on
-// Alpine. If it stops passing GO_TAGS, the image's static binary links
+// Alpine.
-// glibc's getaddrinfo and dlopen again.
 func TestMakefile_BuildComposesVersionAndExtraFlags(t *testing.T) {
 	t.Parallel()
 
@@ -165,7 +164,6 @@ func TestMakefile_BuildComposesVersionAndExtraFlags(t *testing.T) {
 
 	require.Contains(t, makefile, "-X main.version=$(VERSION)")
 	require.Contains(t, makefile, "$(GO_LDFLAGS)")
-	require.Contains(t, makefile, "-tags '$(GO_TAGS)'")
 	require.Contains(t, makefile, "VERSION ?= $(shell script/version)")
 }
 
@@ -235,9 +233,7 @@ func TestDockerfile_BuildsThroughTheMakeTarget(t *testing.T) {
 		"a raw go build bypasses the Makefile's -X flag")
 	require.Contains(t, dockerfile, "ARG VERSION")
 	require.Contains(t, dockerfile,
-		`make build VERSION="$VERSION"`+
+		`make build VERSION="$VERSION" GO_LDFLAGS='-extldflags "-static"'`)
-			` GO_TAGS=netgo,osusergo,sqlite_omit_load_extension`+
-			` GO_LDFLAGS='-extldflags "-static"'`)
 }
 
 func read(t *testing.T, path string) string {