update: refresh install.toml commit + built_at from new binary
After `banger update` swaps binaries, install.toml needs to reflect
the just-installed identity. The previous code passed
buildinfo.Current().{Commit,BuiltAt} into installmeta.UpdateBuildInfo
— but buildinfo.Current() in the running CLI is the OLD pre-swap
binary's identity (we're it), not the staged one. install.toml's
version field got refreshed to target.Version while commit and
built_at stayed pinned at the previous release. `banger doctor`
compares the running CLI's three fields against install.toml's
three fields and so raised a false-positive drift warning on
every update.
Fix: after the swap, exec /usr/local/bin/banger version, parse the
three-line output, and write all three fields to install.toml. If
the exec fails for any reason we fall back to the old behaviour
(version + stale commit/built_at) with a warning, since install.toml
drift is a doctor warning not a broken host — same posture as
before for the failure path.
The parser is split out (parseVersionOutput) and table-tested:
happy path, whitespace-tolerance, missing-field rejection, empty
input rejection, ignoring unrelated lines.
Caught by running v0.1.0 → v0.1.1 live as the first end-to-end
smoke test of the self-update flow, which was the whole point of
that exercise.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
a0b5c7fa3c
commit
d867d61eb3
3 changed files with 152 additions and 8 deletions
|
|
@ -198,13 +198,20 @@ func (d *deps) runUpdate(cmd *cobra.Command, opts runUpdateOpts) error {
|
|||
}
|
||||
|
||||
// Finalise: refresh install metadata, drop backups, clean staging.
|
||||
info := buildinfo.Current()
|
||||
// We just installed `target.Version` — info.Version still reflects
|
||||
// the OLD running binary (we're it). The new bangerd encodes its
|
||||
// own version; for install.toml we record what we INSTALLED.
|
||||
if err := installmeta.UpdateBuildInfo(installmeta.DefaultPath, target.Version, info.Commit, info.BuiltAt); err != nil {
|
||||
// Don't fail the update for this — the install is healthy;
|
||||
// install.toml drift is a doctor warning, not a broken host.
|
||||
// Read the new binary's identity by exec'ing it; buildinfo.Current()
|
||||
// reflects the OLD running CLI (we're it), so the commit + built_at
|
||||
// have to come from the freshly-swapped /usr/local/bin/banger or
|
||||
// install.toml ends up with mixed-version fields.
|
||||
newInfo, err := readInstalledBuildinfo(ctx, targets.Banger)
|
||||
if err != nil {
|
||||
fmt.Fprintf(out, "warning: read installed buildinfo: %v\n", err)
|
||||
// Fall back to the manifest version + the running binary's
|
||||
// commit/built_at. install.toml drift is a doctor warning,
|
||||
// not a broken host, so don't fail the update.
|
||||
old := buildinfo.Current()
|
||||
newInfo = buildinfo.Info{Version: target.Version, Commit: old.Commit, BuiltAt: old.BuiltAt}
|
||||
}
|
||||
if err := installmeta.UpdateBuildInfo(installmeta.DefaultPath, newInfo.Version, newInfo.Commit, newInfo.BuiltAt); err != nil {
|
||||
fmt.Fprintf(out, "warning: update install metadata: %v\n", err)
|
||||
}
|
||||
if err := updater.CleanupBackups(swap); err != nil {
|
||||
|
|
@ -283,6 +290,51 @@ func sanityRunStaged(ctx context.Context, staged updater.StagedRelease, expected
|
|||
return nil
|
||||
}
|
||||
|
||||
// readInstalledBuildinfo execs the just-swapped banger binary, parses
|
||||
// its three-line `version` output, and returns the parsed identity.
|
||||
// Used to refresh install.toml after an update so the on-disk record
|
||||
// reflects the binary that's actually installed — buildinfo.Current()
|
||||
// in the running process is the OLD binary's identity, not the one we
|
||||
// just put on disk.
|
||||
//
|
||||
// Output shape (from internal/cli/banger.go versionString):
|
||||
//
|
||||
// version: vX.Y.Z
|
||||
// commit: <sha>
|
||||
// built_at: <RFC3339>
|
||||
func readInstalledBuildinfo(ctx context.Context, bangerPath string) (buildinfo.Info, error) {
|
||||
out, err := exec.CommandContext(ctx, bangerPath, "version").Output()
|
||||
if err != nil {
|
||||
return buildinfo.Info{}, fmt.Errorf("exec %s version: %w", bangerPath, err)
|
||||
}
|
||||
return parseVersionOutput(string(out))
|
||||
}
|
||||
|
||||
// parseVersionOutput extracts the three identity fields from
|
||||
// `banger version`. Split out of readInstalledBuildinfo so it can be
|
||||
// unit-tested without exec'ing a real binary.
|
||||
func parseVersionOutput(out string) (buildinfo.Info, error) {
|
||||
var info buildinfo.Info
|
||||
for _, line := range strings.Split(out, "\n") {
|
||||
k, v, ok := strings.Cut(line, ":")
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
switch strings.TrimSpace(k) {
|
||||
case "version":
|
||||
info.Version = strings.TrimSpace(v)
|
||||
case "commit":
|
||||
info.Commit = strings.TrimSpace(v)
|
||||
case "built_at":
|
||||
info.BuiltAt = strings.TrimSpace(v)
|
||||
}
|
||||
}
|
||||
if info.Version == "" || info.Commit == "" || info.BuiltAt == "" {
|
||||
return buildinfo.Info{}, fmt.Errorf("could not parse version/commit/built_at from %q", strings.TrimSpace(out))
|
||||
}
|
||||
return info, nil
|
||||
}
|
||||
|
||||
// runPostUpdateDoctor invokes `banger doctor` on the JUST-INSTALLED
|
||||
// CLI (not d.doctor — that's the in-process implementation; we want
|
||||
// to exercise the new binary end-to-end).
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue