steve
e871b05b38
CI / Test (linux/amd64) (pull_request) Successful in 34s
CI / Lint (pull_request) Failing after 16s
CI / Build (windows/amd64) (pull_request) Successful in 22s
CI / Build (linux/amd64) (pull_request) Successful in 20s
CI / Build (linux/arm64) (pull_request) Successful in 21s
Cleanup pass over the repo so CI can enforce lint going forward
without the only-new-issues escape hatch:
* gofumpt -w across the tree (31 hits, all formatting)
* misspell --fix (25 hits, US-locale spelling) — but reverted on
api.JobCancelled = "cancelled" since that literal is the wire +
DB CHECK constraint value, plus matched the case in store/fleet.go
back to "cancelled" and added //nolint:misspell on both for the
next time someone reaches for the auto-fix
* Wrap every `defer rows.Close()` / `defer stmt.Close()` /
`defer res.Body.Close()` in `defer func() { _ = .Close() }()`
to satisfy errcheck without losing the close itself
* websocket.Dial callers (1 prod, 4 tests) now capture + close the
upgrade response Body — coder/websocket can return res with a nil
Body on success, so the test deferred-closes guard against that
* Annotate the two genuine-by-design nilerr cases with //nolint
comments explaining why nil-on-error is the contract (cookie
missing = no session; ctx cancelled mid-backoff = clean shutdown)
* Add brief godoc on the 10 exported const groups + types that
revive flagged (api.HostOS/HostArch/JobKind/JobStatus/LogStream/
ErrorCode, restic.EventKind, store.Role, web.FS)
* Drop the unused (*Server).userByID method
* Inline the unparam baseView(active) — every UI page is under
the dashboard primary nav today
Result: `golangci-lint run ./...` reports 0 issues. CI lint job
no longer needs only-new-issues: true; X-06 follow-up entry in
tasks.md removed.
81 lines
2.2 KiB
Go
81 lines
2.2 KiB
Go
// Package sysinfo collects host metadata at agent startup: OS, arch,
|
|
// hostname, restic version. The agent sends this in `hello` so the
|
|
// server's Host row stays current.
|
|
package sysinfo
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"runtime"
|
|
"strings"
|
|
"time"
|
|
|
|
"gitea.dcglab.co.uk/steve/restic-manager/internal/api"
|
|
)
|
|
|
|
// Snapshot is the bundle of metadata reported in `hello`.
|
|
type Snapshot struct {
|
|
Hostname string
|
|
OS api.HostOS
|
|
Arch api.HostArch
|
|
ResticVersion string
|
|
ProtocolVersion int
|
|
BootTime time.Time
|
|
}
|
|
|
|
// Collect probes the running host. resticPath, if non-empty,
|
|
// overrides PATH lookup.
|
|
func Collect(ctx context.Context, resticPath string) (Snapshot, error) {
|
|
hn, err := os.Hostname()
|
|
if err != nil {
|
|
return Snapshot{}, fmt.Errorf("sysinfo: hostname: %w", err)
|
|
}
|
|
|
|
osTag := api.HostOS(runtime.GOOS)
|
|
archTag := api.HostArch(runtime.GOARCH)
|
|
|
|
resticVer, _ := detectResticVersion(ctx, resticPath) // empty on failure is fine
|
|
return Snapshot{
|
|
Hostname: hn,
|
|
OS: osTag,
|
|
Arch: archTag,
|
|
ResticVersion: resticVer,
|
|
ProtocolVersion: api.CurrentProtocolVersion,
|
|
}, nil
|
|
}
|
|
|
|
// detectResticVersion runs `restic version` and parses the first line.
|
|
// Output looks like:
|
|
//
|
|
// restic 0.17.1 compiled with go1.22.5 on linux/amd64
|
|
//
|
|
// Returns the version token (e.g. "0.17.1") or "" if restic isn't
|
|
// found. We never block startup on a missing restic — the operator
|
|
// might not have installed it yet, and the agent should still be
|
|
// able to connect and report.
|
|
func detectResticVersion(ctx context.Context, override string) (string, error) {
|
|
bin := override
|
|
if bin == "" {
|
|
var err error
|
|
bin, err = exec.LookPath("restic")
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
}
|
|
|
|
versionCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
|
|
defer cancel()
|
|
out, err := exec.CommandContext(versionCtx, bin, "version").Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
first := strings.SplitN(strings.TrimSpace(string(out)), "\n", 2)[0]
|
|
parts := strings.Fields(first)
|
|
if len(parts) >= 2 && parts[0] == "restic" {
|
|
return parts[1], nil
|
|
}
|
|
return "", fmt.Errorf("sysinfo: unrecognized restic version output: %q", first)
|
|
}
|