fix: Small changes from PR suggestions

.github/workflows/code-health.yml

@@ -35,6 +35,7 @@ jobs:
  - name: Run tests
  run: npm test
  env:
+ SKIP_ATLAS_TESTS: "true"
  SKIP_ATLAS_LOCAL_TESTS: "true"
  - name: Upload test results
  if: always() && matrix.os == 'ubuntu-latest'

src/common/session.ts

@@ -101,10 +101,6 @@ export class Session extends EventEmitter<SessionEvents> {
  this.connectionManager.setClientName(this.mcpClient.name || "unknown");
  }
 
- setAtlasLocalClient(atlasLocalClient: Client): void {
- this.atlasLocalClient = atlasLocalClient;
- }
-
  async disconnect(): Promise<void> {
  const atlasCluster = this.connectedAtlasCluster;
 

src/server.ts

@@ -236,7 +236,7 @@ export class Server {
  const client = AtlasLocalClient.connect();
 
  // Set Atlas Local client
- this.session.setAtlasLocalClient(client);
+ this.session.atlasLocalClient = client;
 
  // Register Atlas Local tools
  for (const toolConstructor of AtlasLocalTools) {

src/tools/atlasLocal/atlasLocalTool.ts

@@ -13,15 +13,14 @@ export abstract class AtlasLocalToolBase extends ToolBase {
  }
 
  protected async execute(...args: Parameters<ToolCallback<typeof this.argsShape>>): Promise<CallToolResult> {
- // Get the client
  const client = this.session.atlasLocalClient;
 
  // If the client is not found, throw an error
  // This should never happen:
  // - atlas-local tools are only added after the client is set
  // this means that if we were unable to get the client, the tool will not be registered
  // - in case the tool was registered by accident
- // verifyAllowed in the base class would still return false preventing the tool from being registered,
+ // verifyAllowed would still return false preventing the tool from being registered,
  // preventing the tool from being executed
  if (!client) {
  return {

src/tools/atlasLocal/create/createDeployment.ts

@@ -22,6 +22,7 @@ export class CreateDeploymentTool extends AtlasLocalToolBase {
  type: "MCPServer" as CreationSourceType,
  source: "MCPServer",
  },
+ doNotTrack: !this.telemetry.isTelemetryEnabled(),
  };
  // Create the deployment
  const deployment = await client.createDeployment(deploymentOptions);

tests/integration/helpers.ts

@@ -377,7 +377,7 @@ export function waitUntil<T extends ConnectionState>(
  });
 }
 
-export function waitUntilMcpClientIsSet(
+export function waitUntilAtlasLocalClientIsSet(
  mcpServer: Server,
  signal: AbortSignal,
  timeout: number = 5000

tests/integration/tools/atlas-local/connectDeployment.test.ts

@@ -6,7 +6,7 @@ import {
  getResponseElements,
  setupIntegrationTest,
  validateToolMetadata,
- waitUntilMcpClientIsSet,
+ waitUntilAtlasLocalClientIsSet,
 } from "../../helpers.js";
 import { afterEach, describe, expect, it } from "vitest";
 
@@ -20,7 +20,7 @@ const integration = setupIntegrationTest(
 // That's why we skip the tests on macOS in GitHub Actions
 describe.skipIf(isMacOSInGitHubActions)("atlas-local-connect-deployment", () => {
  beforeEach(async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
  });
 
  validateToolMetadata(integration, "atlas-local-connect-deployment", "Connect to a MongoDB Atlas Local deployment", [
@@ -57,7 +57,7 @@ describe.skipIf(isMacOSInGitHubActions)("atlas-local-connect-deployment with dep
  let deploymentNamesToCleanup: string[] = [];
 
  beforeEach(async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
 
  // Create deployments
  deploymentName = `test-deployment-1-${Date.now()}`;
@@ -105,7 +105,7 @@ describe.skipIf(isMacOSInGitHubActions)("atlas-local-connect-deployment with dep
 describe.skipIf(!isMacOSInGitHubActions)("atlas-local-connect-deployment [MacOS in GitHub Actions]", () => {
  it("should not have the atlas-local-connect-deployment tool", async ({ signal }) => {
  // This should throw an error because the client is not set within the timeout of 5 seconds (default)
- await expect(waitUntilMcpClientIsSet(integration.mcpServer(), signal)).rejects.toThrow();
+ await expect(waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal)).rejects.toThrow();
 
  const { tools } = await integration.mcpClient().listTools();
  const connectDeployment = tools.find((tool) => tool.name === "atlas-local-connect-deployment");

tests/integration/tools/atlas-local/createDeployment.test.ts

@@ -4,7 +4,7 @@ import {
  expectDefined,
  getResponseElements,
  setupIntegrationTest,
- waitUntilMcpClientIsSet,
+ waitUntilAtlasLocalClientIsSet,
 } from "../../helpers.js";
 import { afterEach, describe, expect, it } from "vitest";
 
@@ -35,7 +35,7 @@ describe("atlas-local-create-deployment", () => {
  );
 
  it.skipIf(isMacOSInGitHubActions)("should have the atlas-local-create-deployment tool", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
 
  const { tools } = await integration.mcpClient().listTools();
  const createDeployment = tools.find((tool) => tool.name === "atlas-local-create-deployment");
@@ -46,7 +46,7 @@ describe("atlas-local-create-deployment", () => {
  "[MacOS in GitHub Actions] should not have the atlas-local-create-deployment tool",
  async ({ signal }) => {
  // This should throw an error because the client is not set within the timeout of 5 seconds (default)
- await expect(waitUntilMcpClientIsSet(integration.mcpServer(), signal)).rejects.toThrow();
+ await expect(waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal)).rejects.toThrow();
 
  const { tools } = await integration.mcpClient().listTools();
  const createDeployment = tools.find((tool) => tool.name === "atlas-local-create-deployment");
@@ -55,7 +55,7 @@ describe("atlas-local-create-deployment", () => {
  );
 
  it.skipIf(isMacOSInGitHubActions)("should have correct metadata", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
  const { tools } = await integration.mcpClient().listTools();
  const createDeployment = tools.find((tool) => tool.name === "atlas-local-create-deployment");
  expectDefined(createDeployment);
@@ -65,7 +65,7 @@ describe("atlas-local-create-deployment", () => {
  });
 
  it.skipIf(isMacOSInGitHubActions)("should create a deployment when calling the tool", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
  const deploymentName = `test-deployment-${Date.now()}`;
 
  // Check that deployment doesn't exist before creation
@@ -98,7 +98,7 @@ describe("atlas-local-create-deployment", () => {
  it.skipIf(isMacOSInGitHubActions)(
  "should return an error when creating a deployment that already exists",
  async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
 
  // Create a deployment
  const deploymentName = `test-deployment-${Date.now()}`;
@@ -120,7 +120,7 @@ describe("atlas-local-create-deployment", () => {
  );
 
  it.skipIf(isMacOSInGitHubActions)("should create a deployment with the correct name", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
 
  // Create a deployment
  const deploymentName = `test-deployment-${Date.now()}`;
@@ -148,7 +148,7 @@ describe("atlas-local-create-deployment", () => {
  });
 
  it.skipIf(isMacOSInGitHubActions)("should create a deployment when name is not provided", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
 
  // Create a deployment
  const createResponse = await integration.mcpClient().callTool({

tests/integration/tools/atlas-local/deleteDeployment.test.ts

@@ -4,7 +4,7 @@ import {
  expectDefined,
  getResponseElements,
  setupIntegrationTest,
- waitUntilMcpClientIsSet,
+ waitUntilAtlasLocalClientIsSet,
 } from "../../helpers.js";
 import { describe, expect, it } from "vitest";
 
@@ -19,7 +19,7 @@ describe("atlas-local-delete-deployment", () => {
  );
 
  it.skipIf(isMacOSInGitHubActions)("should have the atlas-local-delete-deployment tool", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
 
  const { tools } = await integration.mcpClient().listTools();
  const deleteDeployment = tools.find((tool) => tool.name === "atlas-local-delete-deployment");
@@ -30,7 +30,7 @@ describe("atlas-local-delete-deployment", () => {
  "[MacOS in GitHub Actions] should not have the atlas-local-delete-deployment tool",
  async ({ signal }) => {
  // This should throw an error because the client is not set within the timeout of 5 seconds (default)
- await expect(waitUntilMcpClientIsSet(integration.mcpServer(), signal)).rejects.toThrow();
+ await expect(waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal)).rejects.toThrow();
 
  const { tools } = await integration.mcpClient().listTools();
  const deleteDeployment = tools.find((tool) => tool.name === "atlas-local-delete-deployment");
@@ -39,7 +39,7 @@ describe("atlas-local-delete-deployment", () => {
  );
 
  it.skipIf(isMacOSInGitHubActions)("should have correct metadata", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
  const { tools } = await integration.mcpClient().listTools();
  const deleteDeployment = tools.find((tool) => tool.name === "atlas-local-delete-deployment");
  expectDefined(deleteDeployment);
@@ -51,7 +51,7 @@ describe("atlas-local-delete-deployment", () => {
  it.skipIf(isMacOSInGitHubActions)(
  "should return 'no such container' error when deployment to delete does not exist",
  async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
  const deploymentName = "non-existent";
 
  const response = await integration.mcpClient().callTool({
@@ -67,7 +67,7 @@ describe("atlas-local-delete-deployment", () => {
  );
 
  it.skipIf(isMacOSInGitHubActions)("should delete a deployment when calling the tool", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
  // Create a deployment
  const deploymentName = `test-deployment-${Date.now()}`;
  await integration.mcpClient().callTool({

tests/integration/tools/atlas-local/listDeployments.test.ts

@@ -4,7 +4,7 @@ import {
  expectDefined,
  getResponseElements,
  setupIntegrationTest,
- waitUntilMcpClientIsSet,
+ waitUntilAtlasLocalClientIsSet,
 } from "../../helpers.js";
 import { describe, expect, it } from "vitest";
 
@@ -19,7 +19,7 @@ describe("atlas-local-list-deployments", () => {
  );
 
  it.skipIf(isMacOSInGitHubActions)("should have the atlas-local-list-deployments tool", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
 
  const { tools } = await integration.mcpClient().listTools();
  const listDeployments = tools.find((tool) => tool.name === "atlas-local-list-deployments");
@@ -30,7 +30,7 @@ describe("atlas-local-list-deployments", () => {
  "[MacOS in GitHub Actions] should not have the atlas-local-list-deployments tool",
  async ({ signal }) => {
  // This should throw an error because the client is not set within the timeout of 5 seconds (default)
- await expect(waitUntilMcpClientIsSet(integration.mcpServer(), signal)).rejects.toThrow();
+ await expect(waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal)).rejects.toThrow();
 
  const { tools } = await integration.mcpClient().listTools();
  const listDeployments = tools.find((tool) => tool.name === "atlas-local-list-deployments");
@@ -39,7 +39,7 @@ describe("atlas-local-list-deployments", () => {
  );
 
  it.skipIf(isMacOSInGitHubActions)("should have correct metadata", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
  const { tools } = await integration.mcpClient().listTools();
  const listDeployments = tools.find((tool) => tool.name === "atlas-local-list-deployments");
  expectDefined(listDeployments);
@@ -49,7 +49,7 @@ describe("atlas-local-list-deployments", () => {
  });
 
  it.skipIf(isMacOSInGitHubActions)("should not crash when calling the tool", async ({ signal }) => {
- await waitUntilMcpClientIsSet(integration.mcpServer(), signal);
+ await waitUntilAtlasLocalClientIsSet(integration.mcpServer(), signal);
 
  const response = await integration.mcpClient().callTool({
  name: "atlas-local-list-deployments",

vitest.config.ts

@@ -10,6 +10,10 @@ const vitestDefaultExcludes = [
  "**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress,tsup,build,eslint,prettier}.config.*",
 ];
 
+if (process.env.SKIP_ATLAS_TESTS === "true") {
+ vitestDefaultExcludes.push("**/atlas/**");
+}
+
 if (process.env.SKIP_ATLAS_LOCAL_TESTS === "true") {
  vitestDefaultExcludes.push("**/atlas-local/**");
 }