@mycadet/cli 0.12.7 → 0.12.9

package/src/__tests__/sleep.test.ts

@@ -7,6 +7,7 @@ import {
   spyOn,
   test,
 } from "bun:test";
+import type { GuardianTokenData } from "../lib/guardian-token.js";
 import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -49,10 +50,8 @@ mock.module("../lib/drain.js", () => ({
 
 const realGuardianToken = { ...(await import("../lib/guardian-token.js")) };
 const loadGuardianTokenMock = mock(
-  (_assistantId: string) =>
-    ({ accessToken: "test-guardian-token" }) as unknown as ReturnType<
-      typeof realGuardianToken.loadGuardianToken
-    >,
+  (_assistantId: string): GuardianTokenData | null =>
+    makeGuardianTokenData({ accessToken: "test-guardian-token" }),
 );
 mock.module("../lib/guardian-token.js", () => ({
   ...realGuardianToken,
@@ -92,6 +91,7 @@ import {
   DEFAULT_GATEWAY_PORT,
   DEFAULT_QDRANT_PORT,
 } from "../lib/constants.js";
+import { makeGuardianTokenData } from "./helpers/guardian-token.js";
 
 // Write a lockfile entry so the real resolveTargetAssistant() finds our test
 // assistant without needing to mock the entire assistant-config module.
@@ -153,9 +153,9 @@ describe("sleep command", () => {
     drainAssistantMock.mockReset();
     drainAssistantMock.mockResolvedValue("drained");
     loadGuardianTokenMock.mockReset();
-    loadGuardianTokenMock.mockReturnValue({
-      accessToken: "test-guardian-token",
-    } as unknown as ReturnType<typeof realGuardianToken.loadGuardianToken>);
+    loadGuardianTokenMock.mockReturnValue(
+      makeGuardianTokenData({ accessToken: "test-guardian-token" }),
+    );
     resolveFreshBearerTokenMock.mockReset();
     resolveFreshBearerTokenMock.mockImplementation(
       async (_url, _id, bearerToken, _cloud) => bearerToken,
@@ -180,11 +180,11 @@ describe("sleep command", () => {
     process.argv = ["bun", "cadet", "sleep", "sleep-test"];
 
     const consoleError = spyOn(console, "error").mockImplementation(() => {});
-    const exitMock = mock((code?: number) => {
+    const exitMock = mock((code?: number | string | undefined): never => {
       throw new Error(`process.exit:${code}`);
     });
     const originalExit = process.exit;
-    process.exit = exitMock as unknown as typeof process.exit;
+    process.exit = exitMock;
 
     try {
       await expect(sleep()).rejects.toThrow("process.exit:1");
@@ -300,11 +300,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "sleep-test", "--wait"];
 
       const consoleLog = spyOn(console, "log").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
       try {
         await expect(sleep()).rejects.toThrow("process.exit:130");
       } finally {
@@ -350,11 +350,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "sleep-test", "--wait=abc"];
 
       const consoleError = spyOn(console, "error").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
       try {
         await expect(sleep()).rejects.toThrow("process.exit:1");
         expect(consoleError).toHaveBeenCalledWith(
@@ -484,11 +484,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "--all"];
 
       const consoleError = spyOn(console, "error").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
 
       try {
         await expect(sleep()).rejects.toThrow("process.exit:1");
@@ -511,11 +511,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "--all"];
 
       const consoleError = spyOn(console, "error").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
 
       try {
         await expect(sleep()).rejects.toThrow("process.exit:1");
@@ -532,11 +532,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "sleep-test", "--all"];
 
       const consoleError = spyOn(console, "error").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
 
       try {
         await expect(sleep()).rejects.toThrow("process.exit:1");

package/src/__tests__/statefulset.test.ts

@@ -35,7 +35,7 @@ describe("getBuilderManagedEnvKeys", () => {
       expect(always.has(key)).toBe(true);
     }
 
-    expect(always.has("CADET_DISABLE_PLATFORM")).toBe(false);
+    expect(always.has("CADET_DISABLE_CLOUD")).toBe(false);
     expect(always.has("CADET_DEVICE_ID")).toBe(false);
   });
 
@@ -60,8 +60,8 @@ describe("getBuilderManagedEnvKeys", () => {
       a.name.localeCompare(b.name),
     );
     expect(sorted).toEqual([
+      { name: "CADET_CLOUD_URL", hostVar: "CADET_CLOUD_URL" },
       { name: "CADET_ENVIRONMENT", hostVar: "CADET_ENVIRONMENT" },
-      { name: "CADET_PLATFORM_URL", hostVar: "CADET_PLATFORM_URL" },
       { name: "TUNNEL_BASE_URL", hostVar: "TUNNEL_BASE_URL" },
     ]);
   });
@@ -76,8 +76,8 @@ describe("getBuilderManagedEnvKeys", () => {
       expect(hostForwarded).toContainEqual({ name: envVar, hostVar: envVar });
     }
     expect(hostForwarded).toContainEqual({
-      name: "CADET_PLATFORM_URL",
-      hostVar: "CADET_PLATFORM_URL",
+      name: "CADET_CLOUD_URL",
+      hostVar: "CADET_CLOUD_URL",
     });
   });
 
@@ -126,7 +126,7 @@ describe("buildServiceRunArgs extra env routing", () => {
       gatewayContainer: "test-gateway",
       network: "test-net",
     },
-    extraGatewayEnv: { CADET_DISABLE_PLATFORM: "1" },
+    extraGatewayEnv: { CADET_DISABLE_CLOUD: "1" },
     extraAssistantEnv: { FOO: "bar" },
   };
 
@@ -134,19 +134,19 @@ describe("buildServiceRunArgs extra env routing", () => {
 
   test("extraGatewayEnv lands only in gateway args", () => {
     const gatewayArgs = runArgs.gateway();
-    expect(gatewayArgs).toContain("CADET_DISABLE_PLATFORM=1");
+    expect(gatewayArgs).toContain("CADET_DISABLE_CLOUD=1");
     expect(gatewayArgs).not.toContain("FOO=bar");
   });
 
   test("extraAssistantEnv lands only in assistant args", () => {
     const assistantArgs = runArgs.assistant();
     expect(assistantArgs).toContain("FOO=bar");
-    expect(assistantArgs).not.toContain("CADET_DISABLE_PLATFORM=1");
+    expect(assistantArgs).not.toContain("CADET_DISABLE_CLOUD=1");
   });
 
   test("credential-executor args get neither extra env map", () => {
     const cesArgs = runArgs["credential-executor"]();
-    expect(cesArgs).not.toContain("CADET_DISABLE_PLATFORM=1");
+    expect(cesArgs).not.toContain("CADET_DISABLE_CLOUD=1");
     expect(cesArgs).not.toContain("FOO=bar");
   });
 

package/src/__tests__/{tailscale-tunnel.test.ts → tailscale.test.ts}

@@ -20,7 +20,7 @@ import {
   stopTailscaleServe,
   type TailscaleCommandResult,
   type TailscaleDeps,
-} from "../lib/tailscale-tunnel.js";
+} from "../lib/tunnels/tailscale.js";
 import { snapshotEnv } from "./helpers/env.js";
 
 describe("Tailscale discovery", () => {
@@ -79,7 +79,7 @@ function makeDeps(opts: {
   const calls: string[][] = [];
   const binary = opts.binary === undefined ? "tailscale" : opts.binary;
   const deps: TailscaleDeps = {
-    findBinary: () => binary,
+    findBinary: async () => binary,
     run: (_bin, args) => {
       calls.push(args);
       return opts.responses?.[args.join(" ")] ?? ok();

package/src/__tests__/teleport-backup.test.ts

@@ -9,19 +9,19 @@ import {
   test,
 } from "bun:test";
 
-import * as platformClient from "../lib/platform-client.js";
+import * as cloudClient from "../lib/cloud-client.js";
 import {
   createPlatformBackup,
   listPlatformBackups,
 } from "../lib/teleport-backup.js";
 
-const authHeadersSpy = spyOn(platformClient, "authHeaders").mockResolvedValue({
+const authHeadersSpy = spyOn(cloudClient, "authHeaders").mockResolvedValue({
   "Content-Type": "application/json",
   "X-Session-Token": "platform-token",
   "Cadet-Organization-Id": "org-1",
 });
 const invalidateOrgIdCacheSpy = spyOn(
-  platformClient,
+  cloudClient,
   "invalidateOrgIdCache",
 ).mockImplementation(() => {});