From 1ce9c355ab883c2c8cfcc9159b36193c334f31ea Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sun, 19 Apr 2026 00:50:12 +0100 Subject: [PATCH] test: share lifecycle token drift fixtures --- src/cli/daemon-cli/lifecycle-core.test.ts | 82 ++++++++++------------- 1 file changed, 34 insertions(+), 48 deletions(-) diff --git a/src/cli/daemon-cli/lifecycle-core.test.ts b/src/cli/daemon-cli/lifecycle-core.test.ts index 5416a36946e..9d51a360f74 100644 --- a/src/cli/daemon-cli/lifecycle-core.test.ts +++ b/src/cli/daemon-cli/lifecycle-core.test.ts @@ -46,6 +46,36 @@ function createServiceRunArgs(checkTokenDrift?: boolean) { }; } +function stubConfigSecretRefGatewayToken() { + loadConfig.mockReturnValue({ + secrets: { + providers: { + default: { source: "env" }, + }, + }, + gateway: { + auth: { + mode: "token", + token: { + source: "env", + provider: "default", + id: "SERVICE_GATEWAY_TOKEN", + }, + }, + }, + }); +} + +function stubServiceGatewayTokenEnv() { + service.readCommand.mockResolvedValue({ + programArguments: [], + environment: { + OPENCLAW_GATEWAY_TOKEN: "service-token", + SERVICE_GATEWAY_TOKEN: "service-token", + }, + }); +} + describe("runServiceRestart token drift", () => { beforeAll(async () => { ({ runServiceRestart, runServiceStart, runServiceStop } = await import("./lifecycle-core.js")); @@ -122,30 +152,8 @@ describe("runServiceRestart token drift", () => { }); it("resolves config token SecretRefs using service command env before drift checks", async () => { - loadConfig.mockReturnValue({ - secrets: { - providers: { - default: { source: "env" }, - }, - }, - gateway: { - auth: { - mode: "token", - token: { - source: "env", - provider: "default", - id: "SERVICE_GATEWAY_TOKEN", - }, - }, - }, - }); - service.readCommand.mockResolvedValue({ - programArguments: [], - environment: { - OPENCLAW_GATEWAY_TOKEN: "service-token", - SERVICE_GATEWAY_TOKEN: "service-token", - }, - }); + stubConfigSecretRefGatewayToken(); + stubServiceGatewayTokenEnv(); await runServiceRestart(createServiceRunArgs(true)); @@ -154,30 +162,8 @@ describe("runServiceRestart token drift", () => { }); it("prefers service command env over process env for SecretRef token drift resolution", async () => { - loadConfig.mockReturnValue({ - secrets: { - providers: { - default: { source: "env" }, - }, - }, - gateway: { - auth: { - mode: "token", - token: { - source: "env", - provider: "default", - id: "SERVICE_GATEWAY_TOKEN", - }, - }, - }, - }); - service.readCommand.mockResolvedValue({ - programArguments: [], - environment: { - OPENCLAW_GATEWAY_TOKEN: "service-token", - SERVICE_GATEWAY_TOKEN: "service-token", - }, - }); + stubConfigSecretRefGatewayToken(); + stubServiceGatewayTokenEnv(); vi.stubEnv("SERVICE_GATEWAY_TOKEN", "process-token"); await runServiceRestart(createServiceRunArgs(true));