From fde50803e8bdcd9be9ee90c648b05131f626a057 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Sat, 24 Oct 2026 02:17:53 +1100 Subject: [PATCH] fix(webui): compare a describe build's release, not its raw version, for drift --- internal/releaseupdate/github.go | 10 ++++++---- internal/releaseupdate/prepare.go | 2 +- internal/webui/api_version.go | 2 +- internal/webui/api_version_test.go | 30 ++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 internal/webui/api_version_test.go diff --git a/internal/releaseupdate/github.go b/internal/releaseupdate/github.go index f78236550..a9dae4916 100644 --- a/internal/releaseupdate/github.go +++ b/internal/releaseupdate/github.go @@ -65,7 +65,7 @@ func (c *GitHubCatalog) Check(ctx context.Context) (Snapshot, error) { } } return Snapshot{Components: []Component{ - component("daemon", "Gateway", installedVersion(buildinfo.Version)), + component("daemon", "Gateway", ReleaseVersion(buildinfo.Version)), component("agent", "Runtime", installedAgent(executableDir())), }}, nil } @@ -192,7 +192,9 @@ func installable(r githubRelease) string { return asset } -func installedVersion(version string) string { +// ReleaseVersion is the release a build was cut from: a git-describe build +// ("1.55.0-218-gabc123") is the same release as its tag. +func ReleaseVersion(version string) string { return buildSuffix.ReplaceAllString(version, "") } @@ -202,13 +204,13 @@ func installedVersion(version string) string { func installedAgent(binDir string) string { data, err := os.ReadFile(filepath.Join(binDir, agentVersionFile)) if binDir == "" || errors.Is(err, os.ErrNotExist) { - return installedVersion(buildinfo.Runtime) + return ReleaseVersion(buildinfo.Runtime) } version := strings.TrimSpace(string(data)) if err != nil || strings.ContainsAny(version, " \n") || ValidateChannel("exact-pin", version) != nil { return "" } - return installedVersion(version) + return ReleaseVersion(version) } func executableDir() string { diff --git a/internal/releaseupdate/prepare.go b/internal/releaseupdate/prepare.go index 2eff63659..bd8390a38 100644 --- a/internal/releaseupdate/prepare.go +++ b/internal/releaseupdate/prepare.go @@ -163,7 +163,7 @@ func (t *Transaction) snapshotHost(ctx context.Context, req PrepareRequest, mani Phase: phasePrepared, Version: req.Version, Previous: map[string]string{ - ComponentDaemon: installedVersion(buildinfo.Version), + ComponentDaemon: ReleaseVersion(buildinfo.Version), ComponentAgent: installedAgent(t.BinDir), }, Units: manifest.Required.Units, diff --git a/internal/webui/api_version.go b/internal/webui/api_version.go index 153a8e826..9c1d479d6 100644 --- a/internal/webui/api_version.go +++ b/internal/webui/api_version.go @@ -44,7 +44,7 @@ type componentVersionStatus struct { // versionStatusFor compares a component's claimed version with the running // one. Drift is reported before update_available. func versionStatusFor(component releaseupdate.Component, running string, ok bool) string { - if ok && component.Installed != "" && running != component.Installed { + if ok && component.Installed != "" && releaseupdate.ReleaseVersion(running) != component.Installed { return statusDrift } if !ok || component.Installed == "" { diff --git a/internal/webui/api_version_test.go b/internal/webui/api_version_test.go new file mode 100644 index 000000000..c53863826 --- /dev/null +++ b/internal/webui/api_version_test.go @@ -0,0 +1,30 @@ +package webui + +import ( + "testing" + + "github.com/samcharles93/archie-core/internal/releaseupdate" +) + +func TestVersionStatusFor(t *testing.T) { + tests := []struct { + name string + installed, running string + available string + ok bool + want string + }{ + {"describe build of the latest release", "1.55.0", "1.55.0-218-g96a7f083", "1.55.0", true, statusOK}, + {"running a different release", "1.55.0", "1.54.3", "1.55.0", true, statusDrift}, + {"older release installed", "1.54.3", "1.54.3", "1.55.0", true, statusUpdateAvailable}, + {"nothing running reported", "1.55.0", "", "1.55.0", false, statusUnknown}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + c := releaseupdate.Component{Installed: tt.installed, Available: tt.available} + if got := versionStatusFor(c, tt.running, tt.ok); got != tt.want { + t.Fatalf("versionStatusFor = %q, want %q", got, tt.want) + } + }) + } +}