chore: merge with main properly

kmruiz · kmruiz · commit 08e47db526dc · 2025-09-03T19:55:07.000+02:00
diff --git a/src/common/config.ts b/src/common/config.ts
@@ -318,10 +318,10 @@ function commaSeparatedToArray<T extends string[]>(str: string | string[] | unde
     return str as T;
 }
 
-export function registerKnownSecretsInRootKeychain(userConfig: UserConfig): void {
+export function registerKnownSecretsInRootKeychain(userConfig: Partial<UserConfig>): void {
     const keychain = Keychain.root;
 
-    const maybeRegister = (value: string | undefined, kind: Secret["kind"]) => {
+    const maybeRegister = (value: string | undefined, kind: Secret["kind"]): void => {
         if (value) {
             keychain.register(value, kind);
         }
diff --git a/src/common/keychain.ts b/src/common/keychain.ts
@@ -14,7 +14,7 @@ export class Keychain {
     private secrets: Secret[];
     private static rootKeychain: Keychain = new Keychain();
 
-    private constructor() {
+    constructor() {
         this.secrets = [];
     }
 
diff --git a/src/common/logger.ts b/src/common/logger.ts
@@ -341,6 +341,10 @@ export class CompositeLogger extends LoggerBase {
 export class NullLogger extends LoggerBase {
     protected type?: LoggerType;
 
+    constructor() {
+        super(undefined);
+    }
+
     protected logCore(): void {
         // No-op logger, does not log anything
     }
diff --git a/src/common/session.ts b/src/common/session.ts
@@ -15,7 +15,7 @@ import type {
 import type { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { ErrorCodes, MongoDBError } from "./errors.js";
 import type { ExportsManager } from "./exportsManager.js";
-import { Keychain } from "./keychain.js";
+import type { Keychain } from "./keychain.js";
 
 export interface SessionOptions {
     apiBaseUrl: string;
diff --git a/src/transports/base.ts b/src/transports/base.ts
@@ -8,7 +8,6 @@ import type { LoggerBase } from "../common/logger.js";
 import { CompositeLogger, ConsoleLogger, DiskLogger, McpLogger } from "../common/logger.js";
 import { ExportsManager } from "../common/exportsManager.js";
 import { DeviceId } from "../helpers/deviceId.js";
-import { type ConnectionManagerFactoryFn } from "../common/connectionManager.js";
 import { Keychain } from "../common/keychain.js";
 import { createMCPConnectionManager, type ConnectionManagerFactoryFn } from "../common/connectionManager.js";
 import {
diff --git a/tests/integration/helpers.ts b/tests/integration/helpers.ts
@@ -14,6 +14,7 @@ import type { ConnectionManager, ConnectionState } from "../../src/common/connec
 import { MCPConnectionManager } from "../../src/common/connectionManager.js";
 import { DeviceId } from "../../src/helpers/deviceId.js";
 import { connectionErrorHandler } from "../../src/common/connectionErrorHandler.js";
+import { Keychain } from "../../src/common/keychain.js";
 
 interface ParameterInfo {
     name: string;
@@ -82,6 +83,7 @@ export function setupIntegrationTest(
             logger,
             exportsManager,
             connectionManager,
+            keychain: new Keychain(),
         });
 
         // Mock hasValidAccessToken for tests
diff --git a/tests/integration/telemetry.test.ts b/tests/integration/telemetry.test.ts
@@ -6,6 +6,7 @@ import { describe, expect, it } from "vitest";
 import { CompositeLogger } from "../../src/common/logger.js";
 import { MCPConnectionManager } from "../../src/common/connectionManager.js";
 import { ExportsManager } from "../../src/common/exportsManager.js";
+import { Keychain } from "../../src/common/keychain.js";
 
 describe("Telemetry", () => {
     it("should resolve the actual device ID", async () => {
@@ -20,6 +21,7 @@ describe("Telemetry", () => {
                 logger,
                 exportsManager: ExportsManager.init(config, logger),
                 connectionManager: new MCPConnectionManager(config, driverOptions, logger, deviceId),
+                keychain: new Keychain(),
             }),
             config,
             deviceId
diff --git a/tests/integration/tools/atlas/dbUsers.test.ts b/tests/integration/tools/atlas/dbUsers.test.ts
@@ -74,7 +74,7 @@ describeWithAtlas("db users", (integration) => {
                 expect(elements[0]?.text).toContain("created successfully");
                 expect(elements[0]?.text).toContain(userName);
                 expect(elements[0]?.text).not.toContain("testpassword");
-                expect(integration.mcpServer().session.keychain.allSecrets).to.deep.equal([
+                expect(integration.mcpServer().session.keychain.allSecrets).toEqual([
                     {
                         value: userName,
                         kind: "user",
@@ -98,7 +98,7 @@ describeWithAtlas("db users", (integration) => {
                 const passwordEnd = elements[0]?.text.length ?? 1 - 1;
 
                 const password = elements[0]?.text.substring(passwordStart).substring(0, passwordEnd).trim();
-                expect(integration.mcpServer().session.keychain.allSecrets).to.deep.equal([
+                expect(integration.mcpServer().session.keychain.allSecrets).toEqual([
                     {
                         value: userName,
                         kind: "user",
diff --git a/tests/integration/tools/mongodb/mongodbTool.test.ts b/tests/integration/tools/mongodb/mongodbTool.test.ts
@@ -17,6 +17,7 @@ import { type ConnectionErrorHandler, connectionErrorHandler } from "../../../..
 import { defaultTestConfig } from "../../helpers.js";
 import { setupMongoDBIntegrationTest } from "./mongodbHelpers.js";
 import { ErrorCodes } from "../../../../src/common/errors.js";
+import { Keychain } from "../../../../src/common/keychain.js";
 
 const injectedErrorHandler: ConnectionErrorHandler = (error) => {
     switch (error.code) {
@@ -88,6 +89,7 @@ describe("MongoDBTool implementations", () => {
             logger,
             exportsManager,
             connectionManager,
+            keychain: new Keychain(),
         });
         const telemetry = Telemetry.create(session, userConfig, deviceId);
 
diff --git a/tests/integration/transports/streamableHttp.test.ts b/tests/integration/transports/streamableHttp.test.ts
@@ -6,6 +6,7 @@ import { config } from "../../../src/common/config.js";
 import type { LoggerType, LogLevel, LogPayload } from "../../../src/common/logger.js";
 import { LoggerBase, LogId } from "../../../src/common/logger.js";
 import { createMCPConnectionManager } from "../../../src/common/connectionManager.js";
+import { Keychain } from "../../../src/common/keychain.js";
 
 describe("StreamableHttpRunner", () => {
     let runner: StreamableHttpRunner;
@@ -138,7 +139,7 @@ describe("StreamableHttpRunner", () => {
         }
 
         it("can provide custom logger", async () => {
-            const logger = new CustomLogger();
+            const logger = new CustomLogger(new Keychain());
             const runner = new StreamableHttpRunner({
                 userConfig: config,
                 createConnectionManager: createMCPConnectionManager,
diff --git a/tests/unit/common/config.test.ts b/tests/unit/common/config.test.ts
@@ -680,7 +680,7 @@ describe("Deprecated CLI arguments", () => {
             it(`should register ${cliArg} as a secret of kind ${secretKind} in the root keychain`, () => {
                 registerKnownSecretsInRootKeychain({ [cliArg]: cliArg });
 
-                expect(keychain.allSecrets).to.deep.equal([{ value: cliArg, kind: secretKind }]);
+                expect(keychain.allSecrets).toEqual([{ value: cliArg, kind: secretKind }]);
             });
         }
     });
diff --git a/tests/unit/common/keychain.test.ts b/tests/unit/common/keychain.test.ts
@@ -15,15 +15,15 @@ describe("Keychain", () => {
 
     it("should register a new secret", () => {
         keychain.register("123456", "password");
-        expect(keychain.allSecrets).to.deep.equal([{ value: "123456", kind: "password" }]);
+        expect(keychain.allSecrets).toEqual([{ value: "123456", kind: "password" }]);
     });
 
     it("should remove cleared secrets", () => {
         keychain.register("123456", "password");
-        expect(keychain.allSecrets).to.deep.equal([{ value: "123456", kind: "password" }]);
+        expect(keychain.allSecrets).toEqual([{ value: "123456", kind: "password" }]);
 
         keychain.clearAllSecrets();
         keychain.register("654321", "user");
-        expect(keychain.allSecrets).to.deep.equal([{ value: "654321", kind: "user" }]);
+        expect(keychain.allSecrets).toEqual([{ value: "654321", kind: "user" }]);
     });
 });
diff --git a/tests/unit/common/session.test.ts b/tests/unit/common/session.test.ts
@@ -7,6 +7,7 @@ import { CompositeLogger } from "../../../src/common/logger.js";
 import { MCPConnectionManager } from "../../../src/common/connectionManager.js";
 import { ExportsManager } from "../../../src/common/exportsManager.js";
 import { DeviceId } from "../../../src/helpers/deviceId.js";
+import { Keychain } from "../../../src/common/keychain.js";
 
 vi.mock("@mongosh/service-provider-node-driver");
 
@@ -28,6 +29,7 @@ describe("Session", () => {
             logger,
             exportsManager: ExportsManager.init(config, logger),
             connectionManager: new MCPConnectionManager(config, driverOptions, logger, mockDeviceId),
+            keychain: new Keychain(),
         });
 
         MockNodeDriverServiceProvider.connect = vi.fn().mockResolvedValue({} as unknown as NodeDriverServiceProvider);
diff --git a/tests/unit/logger.test.ts b/tests/unit/logger.test.ts
@@ -213,9 +213,13 @@ describe("Logger", () => {
         };
 
         it("buffers messages during initialization", async () => {
-            const diskLogger = new DiskLogger(logPath, (err) => {
-                expect.fail(`Disk logger should not fail to initialize: ${err}`);
-            });
+            const diskLogger = new DiskLogger(
+                logPath,
+                (err) => {
+                    expect.fail(`Disk logger should not fail to initialize: ${err}`);
+                },
+                keychain
+            );
 
             diskLogger.info({ id: LogId.serverInitialized, context: "test", message: "Test message" });
             await assertNoLogs();
@@ -229,9 +233,13 @@ describe("Logger", () => {
         });
 
         it("includes attributes in the logs", async () => {
-            const diskLogger = new DiskLogger(logPath, (err) => {
-                expect.fail(`Disk logger should not fail to initialize: ${err}`);
-            });
+            const diskLogger = new DiskLogger(
+                logPath,
+                (err) => {
+                    expect.fail(`Disk logger should not fail to initialize: ${err}`);
+                },
+                keychain
+            );
 
             diskLogger.info({
                 id: LogId.serverInitialized,
diff --git a/tests/unit/resources/common/debug.test.ts b/tests/unit/resources/common/debug.test.ts
@@ -7,6 +7,7 @@ import { CompositeLogger } from "../../../../src/common/logger.js";
 import { MCPConnectionManager } from "../../../../src/common/connectionManager.js";
 import { ExportsManager } from "../../../../src/common/exportsManager.js";
 import { DeviceId } from "../../../../src/helpers/deviceId.js";
+import { Keychain } from "../../../../src/common/keychain.js";
 
 describe("debug resource", () => {
     const logger = new CompositeLogger();
@@ -16,6 +17,7 @@ describe("debug resource", () => {
         logger,
         exportsManager: ExportsManager.init(config, logger),
         connectionManager: new MCPConnectionManager(config, driverOptions, logger, deviceId),
+        keychain: new Keychain(),
     });
     const telemetry = Telemetry.create(session, { ...config, telemetry: "disabled" }, deviceId);
 

Original file line number	Diff line number	Diff line change
`@@ -318,10 +318,10 @@ function commaSeparatedToArray<T extends string[]>(str: string \| string[] \| unde`
`318`	`318`	`return str as T;`
`319`	`319`	`}`
`320`	`320`
`321`		`-export function registerKnownSecretsInRootKeychain(userConfig: UserConfig): void {`
	`321`	`+export function registerKnownSecretsInRootKeychain(userConfig: Partial<UserConfig>): void {`
`322`	`322`	`const keychain = Keychain.root;`
`323`	`323`
`324`		`- const maybeRegister = (value: string \| undefined, kind: Secret["kind"]) => {`
	`324`	`+ const maybeRegister = (value: string \| undefined, kind: Secret["kind"]): void => {`
`325`	`325`	`if (value) {`
`326`	`326`	`keychain.register(value, kind);`
`327`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export class Keychain {`
`14`	`14`	`private secrets: Secret[];`
`15`	`15`	`private static rootKeychain: Keychain = new Keychain();`
`16`	`16`
`17`		`- private constructor() {`
	`17`	`+ constructor() {`
`18`	`18`	`this.secrets = [];`
`19`	`19`	`}`
`20`	`20`