Skip to content

fix(distribution): make claimed installer reruns idempotent #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teckedd-code2save merged 4 commits into from
Sep 19, 2026
Merged

fix(distribution): make claimed installer reruns idempotent #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8113a35
fix(distribution): unify installer claim JSON parsing
teckedd-code2save Sep 19, 2026
60a6eb8
test(distribution): guard idempotent claim parser
teckedd-code2save Sep 19, 2026
24e817b
chore(distribution): update installer checksum after parser fix
teckedd-code2save Sep 19, 2026
99cdd0f
fix(test): match installer claim parser calls correctly
teckedd-code2save Sep 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions scripts/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ json_escape() {
printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g; s/\r/\\r/g; s/\n/\\n/g'
}

json_string_field() {
local json="$1"
local field="$2"
printf '%s' "$json" | sed -n "s/.*\"${field}\":\"\\([^\"]*\\)\".*/\\1/p"
}

usage() {
cat <<'USAGE'
GroundControl installer
Expand Down Expand Up @@ -327,10 +333,10 @@ if [ "$EXISTING_HEALTHY" -eq 1 ] && [ "$UPGRADE" -eq 0 ]; then
CLAIM_JSON="$(docker exec groundcontrol-web node /app/scripts/create-install-claim.cjs --ttl-minutes "$CLAIM_TTL_MINUTES" 2>/dev/null)" || {
fail "Existing GroundControl predates the claim installer. Re-run with --upgrade to install the current claim-capable image."
}
STAGE="$(printf '%s' "$CLAIM_JSON" | sed -n 's/.*"stage":"\\([^"]*\\)".*/\\1/p')"
INSTANCE_ID="$(printf '%s' "$CLAIM_JSON" | sed -n 's/.*"instanceId":"\\([^"]*\\)".*/\\1/p')"
CLAIM_TOKEN="$(printf '%s' "$CLAIM_JSON" | sed -n 's/.*"claimToken":"\\([^"]*\\)".*/\\1/p')"
EXPIRES_AT="$(printf '%s' "$CLAIM_JSON" | sed -n 's/.*"expiresAt":"\\([^"]*\\)".*/\\1/p')"
STAGE="$(json_string_field "$CLAIM_JSON" "stage")"
INSTANCE_ID="$(json_string_field "$CLAIM_JSON" "instanceId")"
CLAIM_TOKEN="$(json_string_field "$CLAIM_JSON" "claimToken")"
EXPIRES_AT="$(json_string_field "$CLAIM_JSON" "expiresAt")"

if [ "$STAGE" = "already_claimed" ]; then
if [ "$JSON_MODE" -eq 1 ]; then
Expand Down Expand Up @@ -488,10 +494,10 @@ fi

CLAIM_JSON="$(docker exec groundcontrol-web node /app/scripts/create-install-claim.cjs --ttl-minutes "$CLAIM_TTL_MINUTES")" || fail "GroundControl is healthy but could not create the installation claim"

STAGE="$(printf '%s' "$CLAIM_JSON" | sed -n 's/.*"stage":"\([^"]*\)".*/\1/p')"
INSTANCE_ID="$(printf '%s' "$CLAIM_JSON" | sed -n 's/.*"instanceId":"\([^"]*\)".*/\1/p')"
CLAIM_TOKEN="$(printf '%s' "$CLAIM_JSON" | sed -n 's/.*"claimToken":"\([^"]*\)".*/\1/p')"
EXPIRES_AT="$(printf '%s' "$CLAIM_JSON" | sed -n 's/.*"expiresAt":"\([^"]*\)".*/\1/p')"
STAGE="$(json_string_field "$CLAIM_JSON" "stage")"
INSTANCE_ID="$(json_string_field "$CLAIM_JSON" "instanceId")"
CLAIM_TOKEN="$(json_string_field "$CLAIM_JSON" "claimToken")"
EXPIRES_AT="$(json_string_field "$CLAIM_JSON" "expiresAt")"

[ -n "$STAGE" ] || fail "Unexpected claim generator response"

Expand Down
2 changes: 1 addition & 1 deletion scripts/install.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f7fc493e177ad5f03450bc16647022717510db29e5ed5ca0ea03976fe1af5587 install
861c1ede763a302aa988f0b108853a3198b1ef8d4d6347ff8418e58c4c57f6f8 install
6 changes: 6 additions & 0 deletions src/lib/distribution-installer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ describe("GroundControl distribution installer contract", () => {
expect(installer).not.toContain("docker compose down -v");
});

it("uses one claim JSON parser across fresh and idempotent paths", () => {
expect(installer).toContain("json_string_field()");
expect(installer.match(/json_string_field "\$CLAIM_JSON"/g)?.length).toBeGreaterThanOrEqual(8);
expect(installer).not.toContain('sed -n \'s/.*"stage":"\\\\(');
});

it("keeps the management port loopback-only", () => {
expect(installer).toContain('127.0.0.1:');
expect(installer).not.toContain("/root/.ssh");
Expand Down
Loading