Skip to content

fix: [PR-1697] correctly parse v2/ssh endpoint fields #250

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
sigmachirality merged 4 commits into from
Feb 17, 2026
Merged

fix: [PR-1697] correctly parse v2/ssh endpoint fields #250

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59a2b29
accept v2 field names for ssh and image endpoints
samsfcompute Feb 13, 2026
c5c6b3d
feat: parse `v2/ssh` fields correctly and coerce `v0/ssh` response to…
sigmachirality Feb 17, 2026
228ce23
perf: avoid unnecessary object construction
sigmachirality Feb 17, 2026
74d73bb
style: run biome
sigmachirality Feb 17, 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
33 changes: 25 additions & 8 deletions src/lib/nodes/ssh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ import {
logSessionTokenExpiredAndQuit,
} from "../../helpers/errors.ts";
import { handleNodesError, nodesClient } from "../../nodesClient.ts";
import type { components } from "../../schema.ts";
import { jsonOption } from "./utils.ts";

type SshInfo = components["schemas"]["vmorch_GetSshResponse"];
// Canonical SSH info shape (v2 NodeSshInfo format)
type SshInfo = {
hostname: string;
port: number;
host_keys: { key_type: string; key: string }[];
last_successful_key_update: number | null;
last_attempted_key_update: number | null;
};

const ssh = new Command("ssh")
.description(`SSH into a VM on a node.
Expand Down Expand Up @@ -88,7 +94,7 @@ Examples:
);

if (v2Response.ok) {
data = await v2Response.json();
data = (await v2Response.json()) as SshInfo;
hostKeyAlias = `${nodeOrVmId}.v2.nodes.sfcompute.dev`;
}
}
Expand Down Expand Up @@ -136,7 +142,18 @@ Examples:
process.exit(1);
}

data = sshData;
// Coerce v0 response to v2 shape
data = {
hostname: sshData.ssh_hostname,
port: sshData.ssh_port,
host_keys: (sshData.ssh_host_keys ?? []).map((k) => ({
key_type: k.key_type,
key: k.base64_encoded_key,
})),
last_successful_key_update:
sshData.last_successful_key_update ?? null,
last_attempted_key_update: sshData.last_attempted_key_update ?? null,
};
hostKeyAlias = `${vmId}.vms.sfcompute.dev`;
}

Expand All @@ -147,9 +164,9 @@ Examples:
return;
}

const sshHostname = data.ssh_hostname;
const sshPort = data.ssh_port;
const sshHostKeys = data.ssh_host_keys || [];
const sshHostname = data.hostname;
const sshPort = data.port;
const sshHostKeys = data.host_keys;

let sshDestination = sshHostname;
if (sshUsername !== undefined) {
Expand All @@ -168,7 +185,7 @@ Examples:
knownHostsCommand = knownHostsCommand.concat([
hostKeyAlias,
sshHostKey.key_type,
sshHostKey.base64_encoded_key,
sshHostKey.key,
]);
}
// Escape all characters for proper pass through
Expand Down