hub: delete the host-install version label (R-94) + invert hostinstall gate 1
The Setup tab said 'host-install 1.19.0' while the served script was 1.22.0, and had been wrong since 2026-07-14. Deriving the number honestly is not possible: the Option-1 command downloads felhom-host-install.sh from the website at RUN TIME and the website git-syncs main every 30s (R-110), so no build-time value in the hub can be true. R-94(a) offered derive-or-delete; deleted, which removes the drift class instead of automating it. - configs.go: hostInstallVersion const, pageData.ScriptVersion field and its assignment all removed; a NOTE in their place records why there is no constant here. - customer_unified.html: the sentence now says the command always fetches the current installer, and renders no version. - hostinstall_gates.py gate 1: the third assertion INVERTS — it used to require the hub const to equal SCRIPT_VERSION, it now asserts the hub carries no host-install version literal at all, matched in six code shapes across every .go/.html under hub/ (comments are deliberately not stripped: a // inside a URL literal would blind the scan). - render_test.go: the assertion 'html contains hostInstallVersion' compared the constant to itself and passed at ANY value — demonstrated green with the const at 9.9.9 while the script was 1.22.0. Deleted, not replaced: there is no longer a version to assert. - felhom-host-install.sh: COMMENT ONLY (SCRIPT_VERSION untouched) — it claimed the gate keeps the hub copy equal, an invariant that no longer exists. Red-proofs: restoring the const fails the rewritten gate 1 (3 shapes hit); the old render_test assertion passes at 9.9.9.
This commit is contained in:
@@ -184,9 +184,11 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_VERSION="1.22.0" # the SINGLE version source (F-1): -h, the run banners, and the hub
|
||||
# Setup-tab copy (hub internal/web/configs.go hostInstallVersion —
|
||||
# scripts/hostinstall_gates.py asserts the two stay equal) all follow it.
|
||||
SCRIPT_VERSION="1.22.0" # the SINGLE version source (F-1): -h and the run banners follow it.
|
||||
# The hub used to carry a copy for its Setup tab; R-94 DELETED it
|
||||
# (2026-08-02) because the hub cannot know which version a box runs —
|
||||
# the Setup command fetches this script at run time. scripts/
|
||||
# hostinstall_gates.py now asserts the hub carries NO version literal.
|
||||
# 1.16.0: the FELHOM_ESCROW sudoers alias (controller-driven escrow
|
||||
# ceremony, agent v0.88.0) ships on every install/update — it rides the
|
||||
# CANONICAL sudoers fetch below (configs/felhom-agent.sudoers from the
|
||||
|
||||
@@ -5,9 +5,17 @@ drill-swept findings (DRILL-day0-vm-2026-07-12 F-1/F-7/F-9/F-10 + the ACL-narrow
|
||||
Run from the repo root: python scripts/hostinstall_gates.py
|
||||
|
||||
Gates (all must pass; non-zero exit on any failure):
|
||||
1. version — exactly ONE version source: SCRIPT_VERSION exists, the header line carries
|
||||
no version literal, and the hub Setup-tab const (hub internal/web/configs.go
|
||||
hostInstallVersion) equals SCRIPT_VERSION (F-1 structural fix)
|
||||
1. version — exactly ONE version source: SCRIPT_VERSION exists, the header line carries no
|
||||
version literal, and **the hub carries no host-install version literal at all**.
|
||||
The third assertion inverted on 2026-08-02 (R-94): it used to require the hub's
|
||||
`hostInstallVersion` const to EQUAL SCRIPT_VERSION, which is unachievable
|
||||
honestly — the Option-1 install command downloads felhom-host-install.sh from
|
||||
the website at RUN TIME and the website git-syncs `main` every 30 seconds
|
||||
(R-110), so the hub cannot know which version a given box will run. A
|
||||
build-time literal there is a guess with a version number's authority, and the
|
||||
real one drifted to 1.19.0-vs-1.22.0 and stayed wrong for 19 days. The label was
|
||||
deleted rather than derived; this gate now pins its absence (F-1 structural fix,
|
||||
second form).
|
||||
2. age — the `age` package is installed by the agent-install step (F-10)
|
||||
3. pbs-apply — configs/felhom-pbs-apply is fetched + installed to
|
||||
/usr/local/sbin/felhom-pbs-apply (F-7), and the uninstall removes it
|
||||
@@ -54,21 +62,49 @@ if re.search(r'felhom-host-install\.sh\s+v\d+\.\d+\.\d+', header):
|
||||
else:
|
||||
ok("header has no version literal")
|
||||
|
||||
# hub Setup-tab const must equal SCRIPT_VERSION (the copy the drill found at 1.12.0).
|
||||
if os.path.exists(HUB_CONFIGS) and script_ver:
|
||||
with io.open(HUB_CONFIGS, "r", encoding="utf-8") as f:
|
||||
hub_src = f.read()
|
||||
hm = re.search(r'hostInstallVersion\s*=\s*"(\d+\.\d+\.\d+)"', hub_src)
|
||||
if not hm:
|
||||
fail("hub hostInstallVersion const not found in internal/web/configs.go")
|
||||
elif hm.group(1) != script_ver:
|
||||
fail("hub Setup-tab hostInstallVersion=%s != SCRIPT_VERSION=%s (F-1: bump both together)"
|
||||
% (hm.group(1), script_ver))
|
||||
else:
|
||||
ok("hub Setup-tab hostInstallVersion matches (%s)" % hm.group(1))
|
||||
# The hub must carry NO host-install version literal at all (R-94, 2026-08-02). It cannot know
|
||||
# which version a box will run — the Option-1 command fetches the script from the website at run
|
||||
# time and the website git-syncs `main` every 30s. The const this replaced said 1.19.0 while the
|
||||
# served script was 1.22.0, and had been wrong since 2026-07-14.
|
||||
#
|
||||
# Matched in CODE SHAPES, never as bare prose: the deleted declarations, the struct field, the
|
||||
# assignment and the template action, plus a rename-proof generic form of each. Comments are
|
||||
# deliberately NOT stripped (a `//` inside a URL string literal would truncate the scan and turn
|
||||
# this gate blind); a comment that merely NAMES the identifier is allowed, and configs.go carries
|
||||
# exactly such a note explaining the absence.
|
||||
BANNED = [
|
||||
(r'\bconst\s+hostInstallVersion\b', "const hostInstallVersion"),
|
||||
(r'\bhostInstallVersion\s*=', "hostInstallVersion assignment"),
|
||||
(r'(?i)\bconst\s+\w*hostinstall\w*version\b', "a renamed host-install version const"),
|
||||
(r'\bScriptVersion\s+string\b', "ScriptVersion struct field"),
|
||||
(r'\bScriptVersion\s*:', "ScriptVersion struct assignment"),
|
||||
(r'\{\{\s*\.ScriptVersion\s*\}\}', "{{.ScriptVersion}} template action"),
|
||||
]
|
||||
HUB_DIR = os.path.join(ROOT, "hub")
|
||||
if not os.path.isdir(HUB_DIR):
|
||||
fail("hub/ not found at %s — cannot assert the absence of a host-install version literal" % HUB_DIR)
|
||||
else:
|
||||
if not os.path.exists(HUB_CONFIGS):
|
||||
fail("hub/internal/web/configs.go not found — cannot cross-check the Setup-tab version")
|
||||
scanned, hits = 0, 0
|
||||
for dirpath, dirs, files in os.walk(HUB_DIR):
|
||||
dirs[:] = [d for d in dirs if d not in (".git", "vendor", "node_modules")]
|
||||
for fn in files:
|
||||
if not (fn.endswith(".go") or fn.endswith(".html")):
|
||||
continue
|
||||
fp = os.path.join(dirpath, fn)
|
||||
scanned += 1
|
||||
with io.open(fp, "r", encoding="utf-8") as f:
|
||||
for lineno, line in enumerate(f, 1):
|
||||
for pat, what in BANNED:
|
||||
if re.search(pat, line):
|
||||
hits += 1
|
||||
fail("%s:%d carries %s — the hub must render NO host-install version "
|
||||
"(R-94: the served script is fetched at run time, so no build-time "
|
||||
"value can be true). Single source: scripts/felhom-host-install.sh "
|
||||
"SCRIPT_VERSION. Line: %s"
|
||||
% (os.path.relpath(fp, ROOT), lineno, what, line.strip()[:120]))
|
||||
if not hits:
|
||||
ok("hub carries no host-install version literal (%d .go/.html files scanned, %d shapes checked)"
|
||||
% (scanned, len(BANNED)))
|
||||
|
||||
# ── 2. age package (F-10) ───────────────────────────────────────────────────────
|
||||
# must match the REAL install invocation, not the log_dry echo (red-proof-hardened twice:
|
||||
|
||||
Reference in New Issue
Block a user