steve
b6f8de1dcc
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.
102 lines
3.2 KiB
Go
102 lines
3.2 KiB
Go
package http
|
|
|
|
import (
|
|
stdhttp "net/http"
|
|
|
|
"gitea.dcglab.co.uk/steve/restic-manager/internal/store"
|
|
)
|
|
|
|
// hostView is the JSON projection of a Host row. Same shape as the
|
|
// store row, but with explicit time-strings so wire format is stable
|
|
// across DB driver changes.
|
|
type hostView struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
OS string `json:"os"`
|
|
Arch string `json:"arch"`
|
|
AgentVersion string `json:"agent_version,omitempty"`
|
|
ResticVersion string `json:"restic_version,omitempty"`
|
|
ProtocolVersion int `json:"protocol_version"`
|
|
EnrolledAt string `json:"enrolled_at"`
|
|
LastSeenAt *string `json:"last_seen_at,omitempty"`
|
|
Status string `json:"status"`
|
|
Tags []string `json:"tags"`
|
|
CurrentJobID *string `json:"current_job_id,omitempty"`
|
|
LastBackupAt *string `json:"last_backup_at,omitempty"`
|
|
LastBackupStatus *string `json:"last_backup_status,omitempty"`
|
|
RepoSizeBytes int64 `json:"repo_size_bytes"`
|
|
SnapshotCount int `json:"snapshot_count"`
|
|
OpenAlertCount int `json:"open_alert_count"`
|
|
}
|
|
|
|
// handleListHosts returns the full fleet as JSON. Authenticated; the
|
|
// shape mirrors what the dashboard renders, so external API consumers
|
|
// see the same projection.
|
|
func (s *Server) handleListHosts(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
|
if !s.authedUser(r) {
|
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
|
return
|
|
}
|
|
hosts, err := s.deps.Store.ListHosts(r.Context())
|
|
if err != nil {
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
out := make([]hostView, 0, len(hosts))
|
|
for _, h := range hosts {
|
|
out = append(out, hostToView(h))
|
|
}
|
|
writeJSON(w, stdhttp.StatusOK, map[string]any{
|
|
"count": len(out),
|
|
"hosts": out,
|
|
})
|
|
}
|
|
|
|
// handleFleetSummary returns the dashboard tile aggregate.
|
|
func (s *Server) handleFleetSummary(w stdhttp.ResponseWriter, r *stdhttp.Request) {
|
|
if !s.authedUser(r) {
|
|
writeJSONError(w, stdhttp.StatusUnauthorized, "unauthorized", "")
|
|
return
|
|
}
|
|
fs, err := s.deps.Store.FleetSummary(r.Context())
|
|
if err != nil {
|
|
writeJSONError(w, stdhttp.StatusInternalServerError, "internal", "")
|
|
return
|
|
}
|
|
writeJSON(w, stdhttp.StatusOK, fs)
|
|
}
|
|
|
|
// hostToView converts a store.Host to its JSON shape. Times become
|
|
// RFC 3339 strings; nullable times are passed through as nil.
|
|
func hostToView(h store.Host) hostView {
|
|
v := hostView{
|
|
ID: h.ID,
|
|
Name: h.Name,
|
|
OS: h.OS,
|
|
Arch: h.Arch,
|
|
AgentVersion: h.AgentVersion,
|
|
ResticVersion: h.ResticVersion,
|
|
ProtocolVersion: h.ProtocolVersion,
|
|
EnrolledAt: h.EnrolledAt.Format("2006-01-02T15:04:05.000000000Z"),
|
|
Status: h.Status,
|
|
Tags: h.Tags,
|
|
CurrentJobID: h.CurrentJobID,
|
|
LastBackupStatus: h.LastBackupStatus,
|
|
RepoSizeBytes: h.RepoSizeBytes,
|
|
SnapshotCount: h.SnapshotCount,
|
|
OpenAlertCount: h.OpenAlertCount,
|
|
}
|
|
if v.Tags == nil {
|
|
v.Tags = []string{}
|
|
}
|
|
if h.LastSeenAt != nil {
|
|
s := h.LastSeenAt.Format("2006-01-02T15:04:05.000000000Z")
|
|
v.LastSeenAt = &s
|
|
}
|
|
if h.LastBackupAt != nil {
|
|
s := h.LastBackupAt.Format("2006-01-02T15:04:05.000000000Z")
|
|
v.LastBackupAt = &s
|
|
}
|
|
return v
|
|
}
|