Skip to content

Accept current Coven daemon health shape #4512

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

Closed
pasmud wants to merge 1 commit into from
+16 −3
Closed

Accept current Coven daemon health shape #4512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/lib/daemon-startup-contract.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ assert.deepEqual(assessDaemonStartupCompatibility(healthy, "1.2.3"), {
apiVersion: "v1",
});

assert.deepEqual(assessDaemonStartupCompatibility({ ...healthy, apiVersion: "coven.daemon.v1" }, "1.2.3"), {
ok: true,
daemonVersion: "1.2.3",
apiVersion: "coven.daemon.v1",
});

assert.deepEqual(assessDaemonStartupCompatibility({ ...healthy, covenVersion: "0.0.0" }, "1.2.3"), {
ok: true,
daemonVersion: "1.2.3",
apiVersion: "v1",
});

assert.deepEqual(assessDaemonStartupCompatibility({ ...healthy, apiVersion: "v2" }, "1.2.3"), {
ok: false,
code: "unsupported_api",
Expand Down
7 changes: 4 additions & 3 deletions src/lib/daemon-startup-contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { exactSemver } from "./exact-semver.ts";

/** The named daemon API versions Cave can safely adopt. */
export const SUPPORTED_DAEMON_API_VERSIONS = new Set(["1", "v1"]);
export const SUPPORTED_DAEMON_API_VERSIONS = new Set(["1", "v1", "coven.daemon.v1"]);

export type DaemonStartupHealth = {
ok?: unknown;
Expand Down Expand Up @@ -46,8 +46,8 @@ export function assessDaemonStartupCompatibility(
};
}

const daemonVersion = exactSemver(health.covenVersion);
if (!daemonVersion) {
const reportedDaemonVersion = exactSemver(health.covenVersion);
if (!reportedDaemonVersion) {
return {
ok: false,
code: "invalid_runtime_version",
Expand All @@ -64,6 +64,7 @@ export function assessDaemonStartupCompatibility(
};
}

const daemonVersion = reportedDaemonVersion === "0.0.0" ? expectedVersion : reportedDaemonVersion;
if (daemonVersion !== expectedVersion) {
return {
ok: false,
Expand Down
Loading