install-deps Makefile target; docs refresh; golangci-lint v2 clean
Makefile:
- New install-deps umbrella target split into three sub-targets:
install-deps-apt — Debian/Trixie-packaged build deps
(nodejs, npm, protobuf-compiler, git, make,
dpkg-dev, ca-certificates, curl, tar). Uses
sudo when not already root.
install-deps-go — ensures a Go toolchain >= GO_VERSION (go.mod
floor, default 1.25.0). Short-circuits when
the system Go is already recent enough;
otherwise downloads the upstream tarball
from go.dev/dl/ into /usr/local/go. Trixie
only ships 1.24 so this step is load-bearing.
install-deps-go-tools — go install protoc-gen-go, protoc-gen-go-grpc,
and golangci-lint/v2/cmd/golangci-lint. Then
asserts the installed golangci-lint version
parses as >= GOLANGCI_LINT_VERSION (default
1.64.0, the floor that supports Go 1.25
syntax) to catch stale binaries in $GOPATH
/bin before they silently run against Go
1.25 code.
- Parser bug fixed: golangci-lint v1.x prints "has version v1.64.8" but
v2.x dropped the 'v' prefix and prints "has version 2.11.4". The
original sed regex required the 'v' and returned an empty match on
v2.x, making the assertion explode with "could not parse version
output". Fixed by switching to extended regex (sed -En) with 'v?' so
both forms parse cleanly.
- GO_VERSION and GOLANGCI_LINT_VERSION exposed as Makefile variables
so operators can override on the command line, e.g.
make install-deps GO_VERSION=1.25.5 GOLANGCI_LINT_VERSION=2.0.0
- .PHONY extended with the four new target names.
Docs:
- README.md: capability note rewritten to cover CAP_NET_RAW (ICMP) and
the new CAP_SYS_ADMIN requirement when healthchecker.netns is set,
plus a paragraph explaining that the Debian systemd unit grants both
automatically. Docker example gained a second variant that shows the
additional --cap-add SYS_ADMIN and /var/run/netns bind mount for
netns-scoped deployments. Also notes that maglevd-frontend ignores
SIGHUP so controlling-terminal disconnects don't kill it.
- docs/user-guide.md: Capabilities section rewritten as a bulleted
list covering both caps, with the EPERM error string and three
different ways to grant them (systemd unit, setcap, systemd-run);
'show vpp lb counters' command description updated to explain that
per-backend packet counts are no longer shown (LB plugin's
forwarding node bypasses ip{4,6}_lookup_inline, so /net/route/to at
the backend's FIB entry never ticks for LB-forwarded traffic); new
~75-line "What the SPA shows" subsection covering the scope
selector + maglev_scope cookie, the per-maglevd frontend cards, the
health-cascade icon table (ok / bug-buckets / primary-drained /
degraded / unknown), the lb buckets column semantics, the
maglev_zippy_open cookie, the admin-mode lifecycle dialogs with
their plain-English consequence text, and the debug panel.
- docs/config-guide.md: healthchecker.netns field gains a capability-
requirement note spelling out setns(CLONE_NEWNET), the EPERM
symptom string, and the /var/run/netns/ readability requirement.
- docs/healthchecks.md: new "Jitter" subsection explaining the +/-10%
scaling on every computed interval, and a "Probe timing while a
probe is in flight" subsection that explains why fast-interval alone
doesn't give fast fault detection against hanging backends (the
probe loop is synchronous, so each iteration is timeout +
fast-interval; the advice is to lower timeout, not fast-interval).
- docs/maglevd.8: description paragraph corrected (dropped the
per-backend stats claim and added a short note pointing at the LB
plugin forwarding-path bypass); new CAPABILITIES section between
SIGNALS and FILES covering both CAP_NET_RAW and CAP_SYS_ADMIN with
the drop-in-override hint.
- docs/maglevd-frontend.8: new SIGNALS section documenting the
explicit SIGHUP ignore (so a controlling-terminal disconnect doesn't
kill the daemon); description extended with paragraphs on the two
persistence cookies (maglev_scope, maglev_zippy_open) and on the
health-cascade icon + lb buckets column.
- docs/maglevc.1: left untouched — intentionally minimal and delegates
to docs/user-guide.md.
Lint (26 issues across 12 files, all errcheck / ineffassign / S1021):
- cmd/frontend/handlers.go: _, _ = fmt.Fprintf(...) for the SSE retry
hint and resync control-event writes.
- cmd/maglevc/commands.go: bulk-prefix every fmt.Fprintf(w, ...) with
_, _ =; also merged 'var watchEventsOptSlot *Node; ... = &Node{...}'
into a single := declaration (staticcheck S1021) — the self-
referencing pattern still works because the Children back-ref is
assigned on the next statement, not inside the struct literal.
- cmd/maglevc/complete.go: _, _ = fmt.Fprintf(ql.rl.Stderr(), ...)
for the banner and help writes; removed the ineffectual
'partial = ""' assignment (nothing downstream reads partial after
that branch, so setting it was dead code flagged by ineffassign).
- cmd/maglevc/shell.go: defer func() { _ = rl.Close() }() for the
readline instance; _, _ = fmt.Fprintf(rl.Stderr(), ...) for error
display in the REPL loop.
- cmd/maglevc/main.go: defer func() { _ = conn.Close() }() for the
gRPC client connection.
- internal/grpcapi/server_test.go: _ = conn.Close() in the test
teardown closure.
- internal/prober/http.go: _ = c.Close() in the TLS-handshake-failed
path; defer func() { _ = conn.Close() }() and defer func() { _ =
resp.Body.Close() }() for the two deferred cleanups.
- internal/prober/http_test.go: defer func() { _ = resp.Body.Close()
}() plus three _, _ = fmt.Fprint(w, ...) in the httptest.Server
handlers and _, _ = fmt.Sscanf(...) when parsing the test listener's
port.
- internal/prober/icmp.go: defer func() { _ = pc.Close() }() for the
ICMP packet conn.
- internal/prober/netns.go: defer func() { _ = origNs.Close() }(),
defer func() { _ = netns.Set(origNs) }(), defer func() { _ =
targetNs.Close() }() — also dropped a stray //nolint:errcheck that
was no longer needed once the closure wrapping handled the discard.
- internal/prober/tcp.go: _ = conn.Close() in the L4-only path,
_ = tlsConn.Close() in the failed and succeeded handshake branches,
_ = tlsConn.SetDeadline(...) (also dropped a //nolint:errcheck
previously covering it).
Iterative 'make lint' runs were needed because golangci-lint v2.x
caps same-linter reports per pass, so the first pass reported 21,
then 4, then 3, then 1, then 0. Final pass: 0 issues. make test is
green across every package, and make build produces all three
binaries cleanly.
This commit is contained in:
131
Makefile
131
Makefile
@@ -35,7 +35,26 @@ TEST ?= tests/
|
||||
|
||||
VPP_API_DIR ?= $(HOME)/src/vpp/build-root/install-vpp_debug-native/vpp/share/vpp/api
|
||||
|
||||
.PHONY: all build build-amd64 build-arm64 test proto vpp-binapi lint fixstyle fixstyle-web pkg-deb robot-test clean maglevd-frontend-web
|
||||
# GO_VERSION is what install-deps-go downloads from go.dev when the
|
||||
# system Go is missing or older than this. Debian Trixie only ships
|
||||
# golang-go 1.24 (main), and go.mod requires 1.25+, so the `apt install
|
||||
# golang-go` path isn't sufficient — we fall back to the upstream
|
||||
# tarball in /usr/local/go. Override on the command line to pull a
|
||||
# specific patch release: make install-deps GO_VERSION=1.25.5
|
||||
GO_VERSION ?= 1.25.0
|
||||
|
||||
# GOLANGCI_LINT_VERSION is the minimum golangci-lint version that
|
||||
# install-deps-go-tools accepts. Raised to 1.64.0 because earlier
|
||||
# releases don't understand Go 1.25 syntax (1.64 is the last v1 line
|
||||
# and shipped Go 1.25 support; any v2.x release satisfies the floor
|
||||
# trivially via version sort). install-deps-go-tools always `go
|
||||
# install`s @latest, then asserts the resulting binary reports a
|
||||
# version >= this floor as a sanity check. Override on the command
|
||||
# line if you want to force a specific minimum, e.g.
|
||||
# make install-deps GOLANGCI_LINT_VERSION=2.0.0
|
||||
GOLANGCI_LINT_VERSION ?= 1.64.0
|
||||
|
||||
.PHONY: all build build-amd64 build-arm64 test proto vpp-binapi lint fixstyle fixstyle-web pkg-deb robot-test clean maglevd-frontend-web install-deps install-deps-apt install-deps-go install-deps-go-tools
|
||||
|
||||
all: build
|
||||
|
||||
@@ -110,6 +129,116 @@ fixstyle-web:
|
||||
lint:
|
||||
golangci-lint run ./...
|
||||
|
||||
# install-deps is an opt-in "set up a fresh developer box" target. Tested
|
||||
# on Debian Trixie; the apt half should also work on Bookworm and recent
|
||||
# Ubuntu LTS. Splits into three sub-targets so they can be run individually:
|
||||
#
|
||||
# install-deps-apt — Debian-packaged build-time deps (nodejs, npm,
|
||||
# protoc, git, make, dpkg-dev, curl).
|
||||
# install-deps-go — ensure a Go toolchain >= $(GO_VERSION) is on
|
||||
# the system. Downloads the upstream tarball
|
||||
# into /usr/local/go when the system Go is
|
||||
# missing or older than the go.mod floor.
|
||||
# install-deps-go-tools — `go install` the helpers this repo needs
|
||||
# (protoc-gen-go, protoc-gen-go-grpc, golangci-
|
||||
# lint) and assert golangci-lint is new enough
|
||||
# to understand Go 1.25 syntax.
|
||||
#
|
||||
# Each sub-target is idempotent and safe to re-run.
|
||||
install-deps: install-deps-apt install-deps-go install-deps-go-tools
|
||||
@echo ""
|
||||
@echo "==> All build dependencies installed."
|
||||
@echo " Make sure these are on PATH:"
|
||||
@echo " /usr/local/go/bin (Go toolchain)"
|
||||
@echo " \$$(go env GOPATH)/bin (protoc-gen-go, golangci-lint, ...)"
|
||||
|
||||
install-deps-apt:
|
||||
@set -eu; \
|
||||
if [ "$$(id -u)" = 0 ]; then SUDO=""; else SUDO="sudo"; fi; \
|
||||
echo "==> Installing apt packages (nodejs, npm, protoc, git, make, dpkg-dev)"; \
|
||||
$$SUDO apt-get update; \
|
||||
$$SUDO apt-get install -y --no-install-recommends \
|
||||
nodejs npm protobuf-compiler git make dpkg-dev \
|
||||
ca-certificates curl tar
|
||||
|
||||
# install-deps-go short-circuits when go env GOVERSION already reports a
|
||||
# version >= GO_VERSION. Otherwise it downloads the official upstream
|
||||
# tarball (https://go.dev/dl/) and extracts it to /usr/local/go, matching
|
||||
# the layout that go.dev recommends and that most Debian setups use for
|
||||
# "Go newer than apt provides".
|
||||
install-deps-go:
|
||||
@set -eu; \
|
||||
if [ "$$(id -u)" = 0 ]; then SUDO=""; else SUDO="sudo"; fi; \
|
||||
echo "==> Checking Go toolchain (required: $(GO_VERSION)+)"; \
|
||||
if command -v go >/dev/null 2>&1; then \
|
||||
CURRENT=$$(go env GOVERSION 2>/dev/null | sed 's/^go//'); \
|
||||
OLDEST=$$(printf '%s\n%s\n' "$(GO_VERSION)" "$$CURRENT" | sort -V | head -n1); \
|
||||
if [ "$$OLDEST" = "$(GO_VERSION)" ] && [ -n "$$CURRENT" ]; then \
|
||||
echo " go$$CURRENT already installed (>= $(GO_VERSION)), skipping."; \
|
||||
exit 0; \
|
||||
fi; \
|
||||
echo " go$$CURRENT is older than $(GO_VERSION), upgrading."; \
|
||||
else \
|
||||
echo " no Go toolchain on PATH, installing."; \
|
||||
fi; \
|
||||
DEB_ARCH=$$(dpkg --print-architecture); \
|
||||
case "$$DEB_ARCH" in \
|
||||
amd64) GOARCH=amd64 ;; \
|
||||
arm64) GOARCH=arm64 ;; \
|
||||
armhf) GOARCH=armv6l ;; \
|
||||
*) echo " unsupported architecture: $$DEB_ARCH" >&2; exit 1 ;; \
|
||||
esac; \
|
||||
TARBALL="go$(GO_VERSION).linux-$$GOARCH.tar.gz"; \
|
||||
URL="https://go.dev/dl/$$TARBALL"; \
|
||||
echo " downloading $$URL"; \
|
||||
curl -fsSL -o "/tmp/$$TARBALL" "$$URL"; \
|
||||
echo " installing to /usr/local/go"; \
|
||||
$$SUDO rm -rf /usr/local/go; \
|
||||
$$SUDO tar -C /usr/local -xzf "/tmp/$$TARBALL"; \
|
||||
rm -f "/tmp/$$TARBALL"; \
|
||||
echo " installed $$(/usr/local/go/bin/go version)"
|
||||
|
||||
# install-deps-go-tools installs the three Go binaries this repo calls
|
||||
# out to during `make proto` and `make lint`. protoc-gen-go and
|
||||
# protoc-gen-go-grpc pin to specific upstream release branches; golangci-
|
||||
# lint pulls @latest (the v2 install path) and then we assert the
|
||||
# installed version parses as >= GOLANGCI_LINT_VERSION so a stale binary
|
||||
# in $GOPATH/bin from a previous dev session doesn't silently get used
|
||||
# against Go 1.25 code it can't parse. Run `make install-deps
|
||||
# GOLANGCI_LINT_VERSION=2.0.0` if you want to enforce a tighter floor.
|
||||
install-deps-go-tools:
|
||||
@set -eu; \
|
||||
if ! command -v go >/dev/null 2>&1; then \
|
||||
export PATH="/usr/local/go/bin:$$PATH"; \
|
||||
fi; \
|
||||
echo "==> Installing Go tools via 'go install'"; \
|
||||
echo " google.golang.org/protobuf/cmd/protoc-gen-go"; \
|
||||
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest; \
|
||||
echo " google.golang.org/grpc/cmd/protoc-gen-go-grpc"; \
|
||||
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest; \
|
||||
echo " github.com/golangci/golangci-lint/v2/cmd/golangci-lint"; \
|
||||
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest; \
|
||||
GOBIN="$$(go env GOBIN)"; \
|
||||
if [ -z "$$GOBIN" ]; then GOBIN="$$(go env GOPATH)/bin"; fi; \
|
||||
echo "==> Asserting golangci-lint version >= $(GOLANGCI_LINT_VERSION)"; \
|
||||
if ! "$$GOBIN/golangci-lint" version >/dev/null 2>&1; then \
|
||||
echo " ERROR: $$GOBIN/golangci-lint is not executable" >&2; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
INSTALLED=$$("$$GOBIN/golangci-lint" version 2>&1 | sed -En 's/.*has version v?([0-9][0-9.]*).*/\1/p' | head -n1); \
|
||||
if [ -z "$$INSTALLED" ]; then \
|
||||
echo " ERROR: could not parse golangci-lint version output" >&2; \
|
||||
"$$GOBIN/golangci-lint" version >&2; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
OLDEST=$$(printf '%s\n%s\n' "$(GOLANGCI_LINT_VERSION)" "$$INSTALLED" | sort -V | head -n1); \
|
||||
if [ "$$OLDEST" != "$(GOLANGCI_LINT_VERSION)" ]; then \
|
||||
echo " ERROR: golangci-lint $$INSTALLED is older than the required $(GOLANGCI_LINT_VERSION)" >&2; \
|
||||
echo " The tool understands Go 1.25 syntax only from v1.64.0 / v2.x onward." >&2; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
echo " golangci-lint $$INSTALLED (>= $(GOLANGCI_LINT_VERSION)) OK"
|
||||
|
||||
tests/.venv: tests/requirements.txt
|
||||
python3 -m venv tests/.venv
|
||||
tests/.venv/bin/pip install -q -r tests/requirements.txt
|
||||
|
||||
Reference in New Issue
Block a user