Update golangci-lint to v2.12.2 with canonical config

- Replace .golangci.yml with the canonical v2-schema config: linter settings move under linters.settings (the previous top-level linters-settings block was ignored by golangci-lint v2, so the configured thresholds were not applied) and the obsolete issues.exclude-use-default key is dropped. - Bump golangci-lint from the v2.10.1-era commit pin to @v2.12.2 in Dockerfile and script/bootstrap; refresh pin date comments. - Wrap long lines in attrsum.go to satisfy the now-effective lll limit of 88 columns (15 findings); move one nolint:gosec directive to its own line. - Record the change in TODO.md Completed Steps.
2026-08-07 17:11:06 +00:00
9 changed files with 19 additions and 187 deletions
@@ -1,63 +0,0 @@
-# .dockerignore does NOT use .gitignore semantics. Docker matches with
-# moby/patternmatcher: filepath.Match plus `**`, so `*` does not cross
-# `/` and an unprefixed pattern is anchored at the context root. Every
-# depth-independent pattern therefore needs `**/`, or `config/.env` and
-# `certs/server.key` still ship while this file reads as solved. Only
-# genuinely root-anchored entries go unprefixed. Never transplant these
-# into .gitignore, where `**/` is wrong.
-#
-# Matching is case-sensitive, so secrets use character ranges rather
-# than an ALL-CAPS twin, which would still miss `Server.Key`.
-#
-# Extend with this repo's own host-built artifacts, written anchored:
-# `/myapp`, never `**/myapp`, which also matches `cmd/myapp/` and
-# deletes the package directory from the context.
-
-# .git is sent without its config. Without a VERSION build argument the
-# stage that compiles runs `git describe --tags --always` on .git, which
-# does not need .git/config; that file can hold a credential, such as a
-# password in a remote URL or the token the CI checkout step stores there.
-.git/config
-
-# Agent scratch: one full checkout of the repo per in-flight agent.
-# Anchored because it occurs once where agents run at the repo root.
-# KNOWN GAP: a repo running agents in subdirectories still ships
-# `services/api/.claude/` and must add its own anchored entry.
-.claude
-
-# Environment files. `*.env` covers bare `.env` and the `prod.env`
-# convention. Re-include a committed template with a negation if the
-# build needs one: `!docs/example.env`.
-**/*.[eE][nN][vV]
-**/.[eE][nN][vV].*
-**/.[eE][nN][vV][rR][cC]
-
-# Private keys and the bundles carrying them. Public certificates
-# (*.crt, *.cer) are deliberately absent: they are legitimate inputs.
-**/*.[pP][eE][mM]
-**/*.[kK][eE][yY]
-**/*.[pP]12
-**/*.[pP][fF][xX]
-**/[iI][dD]_[rR][sS][aA]
-**/[iI][dD]_[dD][sS][aA]
-**/[iI][dD]_[eE][cC][dD][sS][aA]
-**/[iI][dD]_[eE][dD]25519
-
-# Dependencies: restored inside the image, never copied in.
-**/node_modules
-
-# OS metadata.
-**/.DS_Store
-**/Thumbs.db
-
-# Editor state: never a build input, and it churns COPY.
-**/*.swp
-**/*.swo
-**/*~
-**/*.bak
-**/.idea
-**/.vscode
-**/*.sublime-*
-
-# This repo's host-built binary (`make build`); the image builds its own.
-/attrsum
@@ -6,8 +6,4 @@ jobs:
        steps:
            # actions/checkout v4.2.2, 2026-02-28
            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-              # Full history and tags, so the build stamps the same
-              # `git describe` version as a full clone.
-              with:
-                  fetch-depth: 0
            - run: script/cibuild
@@ -10,20 +10,14 @@ run:

 linters:
  default: all
-  enable:
-    # Successor to the deprecated gomodguard. Named explicitly, rather than
-    # left to `default: all`, because it carries the module policy below.
-    - gomodguard_v2
  disable:
    # Genuinely incompatible with project patterns
    - exhaustruct      # Requires all struct fields
+    - depguard         # Dependency allow/block lists
    - godot            # Requires comments to end with periods
+    - wsl              # Deprecated, replaced by wsl_v5
    - wrapcheck        # Too verbose for internal packages
    - varnamelen       # Short names like db, id are idiomatic Go
-    # Deprecated: the warning is attached to the old name, so it is
-    # silenced by disabling that name, not by enabling the successor.
-    - wsl              # Deprecated, replaced by wsl_v5
-    - gomodguard       # Deprecated, replaced by gomodguard_v2
  settings:
    lll:
      line-length: 88
@@ -34,64 +28,6 @@ linters:
      max-complexity: 15
    dupl:
      threshold: 100
-    depguard:
-      # Test-support code must not be compiled into the shipped binary. A
-      # test-support package exists to hand a test privileges the program
-      # itself must never have, so a file that is not a test must not import
-      # one. Test files, and the files inside a package whose directory name
-      # ends in `test`, are where that code belongs, and are exempt.
-      #
-      # The deny list below is the one part of this file a repository is
-      # expected to extend, and the only part it may. depguard matches an
-      # import path against a list of prefixes, so it cannot be told "any path
-      # whose last segment ends in test"; a repository's own test-support
-      # packages have to be named here one at a time, by full import path,
-      # under a module path that differs from repository to repository. Add
-      # them; change nothing else.
-      rules:
-        test-support:
-          list-mode: lax
-          files:
-            - "$all"
-            - "!$test"
-            - "!**/*test/**"
-          deny:
-            - pkg: net/http/httptest
-              desc: >-
-                Test-support code belongs in test files and in packages whose
-                directory name ends in test, not in the shipped binary.
-    # Only decisions already recorded in the Go package defaults are
-    # listed here. Every entry matches the module path exactly.
-    gomodguard_v2:
-      blocked:
-        - module: github.com/rs/zerolog
-          recommendations:
-            - log/slog
-          reason: "Structured logging is stdlib log/slog."
-        # One entry per pre-fork module path, because the later releases
-        # are separate paths. A prefix match would be shorter but would
-        # also reach github.com/go-redis/redismock, the test double for
-        # the successor these entries recommend.
-        - module: github.com/go-redis/redis
-          recommendations:
-            - github.com/redis/go-redis/v9
-          reason: "Pre-fork module; use the maintained go-redis v9."
-        - module: github.com/go-redis/redis/v7
-          recommendations:
-            - github.com/redis/go-redis/v9
-          reason: "Pre-fork module; use the maintained go-redis v9."
-        - module: github.com/go-redis/redis/v8
-          recommendations:
-            - github.com/redis/go-redis/v9
-          reason: "Pre-fork module; use the maintained go-redis v9."
-        - module: github.com/sergi/go-diff
-          recommendations:
-            - github.com/aymanbagabas/go-udiff
-          reason: "No unified diff output; use go-udiff."
-        - module: github.com/hexops/gotextdiff
-          recommendations:
-            - github.com/aymanbagabas/go-udiff
-          reason: "Unmaintained fork; use go-udiff."

 issues:
  max-issues-per-linter: 0
@@ -4,8 +4,8 @@ FROM golang@sha256:f6751d823c26342f9506c03797d2527668d095b0a15f1862cddb4d927a7a4

 RUN apk add --no-cache git make gcc musl-dev binutils-gold

-# golangci-lint v2.12.2, 2026-10-05
-RUN go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@c0d3ddc9cf3faa61a4e378e879ece580256d76e5
+# golangci-lint v2.12.2, 2026-08-07
+RUN go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2
 # goimports v0.42.0
 RUN go install golang.org/x/tools/cmd/goimports@009367f5c17a8d4c45a961a3a509277190a9a6f0

@@ -29,21 +29,7 @@ RUN make check

 # Build the binary (still as the unprivileged user: it owns /src, so git VCS
 # stamping sees consistent ownership).
-#
-# The version stamped into the binary: the VERSION build argument when one
-# is given, otherwise `git describe --tags --always` of the .git the build
-# context carries: the tag on a tagged commit, tag-N-gHASH on a commit after
-# one, the short commit when no tag is reachable. A context that carries .git
-# and still yields no version fails the build. With neither, as from a source
-# tarball, the binary reports dev.
-ARG VERSION
-RUN version="${VERSION:-$(git describe --tags --always)}"; \
-    if [ -e .git ] && { [ -z "$version" ] || [ "$version" = dev ] || \
-        [ "$version" = unknown ]; }; then \
-        echo "version is '$version' although .git is present" >&2; \
-        exit 1; \
-    fi; \
-    make build VERSION="${version:-dev}"
+RUN make build

 # Runtime stage
 # alpine 3.21, 2026-02-28
@@ -2,11 +2,6 @@

 TESTDIR := $(HOME)/Documents/_SYSADMIN/cyberdyne

-# The version `make build` stamps into the binary: the git tag or short
-# commit, -dirty with uncommitted changes. `make build VERSION=x` stamps x,
-# which is how the Dockerfile passes its version in.
-VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
-
 # Standard targets are thin shims; the implementations live in script/
 # per the scripts-to-rule-them-all pattern.

@@ -40,7 +35,7 @@ hooks:
 	@script/install-precommit

 build: clean
-	@go build -ldflags "-X main.Version=$(VERSION)" .
+	@go build .

 clean:
 	@rm -f attrsum
@@ -26,16 +26,11 @@ $(HOME)/Documents/_SYSADMIN/cyberdyne path.

 # Completed Steps

-* 2026-10-05: golangci-lint settings take effect: canonical
-    `.golangci.yml` (v2 layout, settings under `linters.settings`),
-    golangci-lint pinned at v2.12.2 in `Dockerfile` and
-    `script/bootstrap`, and the code fixed for what the settings now
-    report (long lines in `attrsum.go` rewrapped)
-* 2026-10-02: `attrsum --version` reports the git tag or short commit,
-    stamped by `make build` and by a plain `docker build .` of a clone;
-    `.dockerignore` sends `.git` without `.git/config` and keeps a
-    host-built `attrsum` out; CI checks out full history so it stamps
-    the same version
+* 2026-08-07: updated golangci-lint to v2.12.2: canonical
+    `.golangci.yml` (settings moved under `linters.settings` so the
+    configured thresholds actually apply), version pins bumped in
+    `Dockerfile` and `script/bootstrap`, and long lines wrapped to
+    satisfy the now-effective `lll` limit of 88
 * 2026-02-02: correctness pass: track actual bytes read instead of
    stale file size, atomic failure tracking in ProcessCheck, detect
    file modification during checksum (TOCTOU), propagate countFiles
@@ -49,6 +44,8 @@ $(HOME)/Documents/_SYSADMIN/cyberdyne path.

 # Future Steps

+* Add Dockerfile and .dockerignore that run make check, images pinned
+    by sha256, plus a Makefile docker target
 * Add .gitea/workflows/check.yml
 * Restructure README.md into the standard sections: Description,
    Getting Started, Rationale, Design, TODO, License, Author (Getting
@@ -36,10 +36,6 @@ const (
 	progressThrottle = 250 * time.Millisecond
 )

-// Version is the git tag or short commit, set at link time with -X by
-// `make build`. A build that does not set it reports dev.
-var Version = "dev" //nolint:gochecknoglobals // set at link time with -X
-
 // Sentinel errors returned by the command implementations.
 var (
 	errNoPaths           = errors.New("no paths provided")
@@ -106,9 +102,8 @@ func main() {
 	opts := &options{}

 	rootCmd := &cobra.Command{
-		Use:     "attrsum",
-		Short:   "Compute and verify file checksums via xattrs",
-		Version: Version,
+		Use:   "attrsum",
+		Short: "Compute and verify file checksums via xattrs",
 	}
 	rootCmd.SilenceUsage = true
 	rootCmd.SilenceErrors = true
@@ -4,14 +4,14 @@
 # installed tools are skipped. Base tooling comes from nix, apt, brew,
 # or apk (detected in that order); assumes nothing is present.
 # golangci-lint and goimports are installed via `go install` at the same
-# pinned commits the Dockerfile uses (never "latest").
+# pinned refs the Dockerfile uses (never "latest").
 set -eu

 ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"

-# Pinned versions, 2026-10-05 (same pins as the Dockerfile)
+# Pinned versions, 2026-08-07 (same pins as the Dockerfile)
 # golangci-lint v2.12.2
-GOLANGCI_LINT_REF="github.com/golangci/golangci-lint/v2/cmd/golangci-lint@c0d3ddc9cf3faa61a4e378e879ece580256d76e5"
+GOLANGCI_LINT_REF="github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2"
 # goimports v0.42.0
 GOIMPORTS_REF="golang.org/x/tools/cmd/goimports@009367f5c17a8d4c45a961a3a509277190a9a6f0"

@@ -1,8 +1,6 @@
 #!/bin/sh
 # script/docker: build the Docker image tagged with the project name.
 # Identical in all repos; the tag comes from script/projectname.
-# --no-cache because the gate phases the final stage depends on are RUN
-# steps, and a cached one is a check that did not run.
 set -eu

 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
@@ -10,15 +8,7 @@ ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"

 main() {
    cd "$ROOT"
-    # Own line: a failing command substitution inside an argument does
-    # not trip `set -e`, so the inline form degrades silently to an
-    # empty constant. The VERSION build argument takes precedence over
-    # the version a build stage derives from the .git in the context.
-    version="$(git describe --tags --always --dirty 2>/dev/null || true)"
-    [ -n "$version" ] || version="unknown"
-    docker build --no-cache \
-        --build-arg VERSION="$version" \
-        -t "$("$SCRIPT_DIR/projectname")" .
+    docker build -t "$("$SCRIPT_DIR/projectname")" .
 }

 main "$@"