Skip to content

fix: creating multiple users on atlas connect [MCP-280] #721

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

Merged
merged 5 commits into from
Nov 12, 2025
Merged

fix: creating multiple users on atlas connect [MCP-280] #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f9c47d
fix: creating multiple users on atlas connect [MCP-280]
fmenezes Nov 10, 2025
ed5ec2f
fix
fmenezes Nov 11, 2025
37e1537
Merge branch 'main' into MCP-280
fmenezes Nov 11, 2025
3387a6f
fix
fmenezes Nov 11, 2025
8e0a29a
Update tests/integration/tools/atlas/clusters.test.ts
fmenezes Nov 12, 2025
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
56 changes: 35 additions & 21 deletions src/tools/atlas/connect/connectCluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,39 @@ export class ConnectClusterTool extends AtlasToolBase {
const ipAccessListUpdated = await ensureCurrentIpInAccessList(this.session.apiClient, projectId);
let createdUser = false;

const state = this.queryConnection(projectId, clusterName);
switch (state) {
case "connected-to-other-cluster":
case "disconnected": {
await this.session.disconnect();

const { connectionString, atlas } = await this.prepareClusterConnection(
projectId,
clusterName,
connectionType
);

createdUser = true;

// try to connect for about 5 minutes asynchronously
void this.connectToCluster(connectionString, atlas).catch((err: unknown) => {
const error = err instanceof Error ? err : new Error(String(err));
this.session.logger.error({
id: LogId.atlasConnectFailure,
context: "atlas-connect-cluster",
message: `error connecting to cluster: ${error.message}`,
});
});
break;
}
case "connecting":
case "connected":
case "unknown":
default: {
break;
}
}

for (let i = 0; i < 60; i++) {
const state = this.queryConnection(projectId, clusterName);
switch (state) {
Expand Down Expand Up @@ -246,34 +279,15 @@ export class ConnectClusterTool extends AtlasToolBase {
return { content };
}
case "connecting":
case "unknown": {
break;
}
case "unknown":
case "connected-to-other-cluster":
case "disconnected":
default: {
await this.session.disconnect();
const { connectionString, atlas } = await this.prepareClusterConnection(
projectId,
clusterName,
connectionType
);

createdUser = true;
// try to connect for about 5 minutes asynchronously
void this.connectToCluster(connectionString, atlas).catch((err: unknown) => {
const error = err instanceof Error ? err : new Error(String(err));
this.session.logger.error({
id: LogId.atlasConnectFailure,
context: "atlas-connect-cluster",
message: `error connecting to cluster: ${error.message}`,
});
});
break;
}
}

await sleep(500);
await sleep(500); // wait 500ms before checking the connection state again
}

const content: CallToolResult["content"] = [
Expand Down
103 changes: 94 additions & 9 deletions tests/integration/tools/atlas/atlasHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,16 @@ interface ProjectTestArgs {
getIpAddress: () => string;
}

interface ClusterTestArgs {
getProjectId: () => string;
getIpAddress: () => string;
getClusterName: () => string;
}

type ProjectTestFunction = (args: ProjectTestArgs) => void;

type ClusterTestFunction = (args: ClusterTestArgs) => void;

export function withCredentials(integration: IntegrationTest, fn: IntegrationTestFunction): SuiteCollector<object> {
const describeFn =
!process.env.MDB_MCP_API_CLIENT_ID?.length || !process.env.MDB_MCP_API_CLIENT_SECRET?.length
Expand Down Expand Up @@ -71,25 +79,25 @@ export function withProject(integration: IntegrationTest, fn: ProjectTestFunctio
}
});

afterAll(() => {
afterAll(async () => {
if (!projectId) {
return;
}

const apiClient = integration.mcpServer().session.apiClient;

// send the delete request and ignore errors
apiClient
.deleteGroup({
try {
await apiClient.deleteGroup({
params: {
path: {
groupId: projectId,
},
},
})
.catch((error) => {
console.log("Failed to delete project:", error);
});
} catch (error) {
// send the delete request and ignore errors
console.log("Failed to delete group:", error);
}
});

const args = {
Expand All @@ -101,10 +109,12 @@ export function withProject(integration: IntegrationTest, fn: ProjectTestFunctio
});
}

export const randomId = new ObjectId().toString();
export function randomId(): string {
return new ObjectId().toString();
}

async function createGroup(apiClient: ApiClient): Promise<Group & Required<Pick<Group, "id">>> {
const projectName: string = `testProj-` + randomId;
const projectName: string = `testProj-` + randomId();

const orgs = await apiClient.listOrgs();
if (!orgs?.results?.length || !orgs.results[0]?.id) {
Expand Down Expand Up @@ -229,3 +239,78 @@ export async function waitCluster(
`Cluster wait timeout: ${clusterName} did not meet condition within ${maxPollingIterations} iterations`
);
}

export function withCluster(integration: IntegrationTest, fn: ClusterTestFunction): SuiteCollector<object> {
return withProject(integration, ({ getProjectId, getIpAddress }) => {
describe("with cluster", () => {
const clusterName: string = `test-cluster-${randomId()}`;

beforeAll(async () => {
const apiClient = integration.mcpServer().session.apiClient;

const projectId = getProjectId();

const input = {
groupId: projectId,
name: clusterName,
clusterType: "REPLICASET",
replicationSpecs: [
{
zoneName: "Zone 1",
regionConfigs: [
{
providerName: "TENANT",
backingProviderName: "AWS",
regionName: "US_EAST_1",
electableSpecs: {
instanceSize: "M0",
},
},
],
},
],
terminationProtectionEnabled: false,
} as unknown as ClusterDescription20240805;

await apiClient.createCluster({
params: {
path: {
groupId: projectId,
},
},
body: input,
});

await waitCluster(integration.mcpServer().session, projectId, clusterName, (cluster) => {
return cluster.stateName === "IDLE";
});
});

afterAll(async () => {
const apiClient = integration.mcpServer().session.apiClient;

try {
// send the delete request and ignore errors
await apiClient.deleteCluster({
params: {
path: {
groupId: getProjectId(),
clusterName,
},
},
});
} catch (error) {
console.log("Failed to delete cluster:", error);
}
});

const args = {
getProjectId: (): string => getProjectId(),
getIpAddress: (): string => getIpAddress(),
getClusterName: (): string => clusterName,
};

fn(args);
});
});
}
73 changes: 70 additions & 3 deletions tests/integration/tools/atlas/clusters.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import type { Session } from "../../../../src/common/session.js";
import { expectDefined, getResponseContent } from "../../helpers.js";
import { describeWithAtlas, withProject, randomId, deleteCluster, waitCluster, sleep } from "./atlasHelpers.js";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import {
describeWithAtlas,
withProject,
withCluster,
randomId,
deleteCluster,
waitCluster,
sleep,
} from "./atlasHelpers.js";
import { afterAll, beforeAll, describe, expect, it, vitest } from "vitest";

describeWithAtlas("clusters", (integration) => {
withProject(integration, ({ getProjectId, getIpAddress }) => {
const clusterName = "ClusterTest-" + randomId;
const clusterName = "ClusterTest-" + randomId();

afterAll(async () => {
const projectId = getProjectId();
Expand Down Expand Up @@ -142,6 +150,11 @@ describeWithAtlas("clusters", (integration) => {
});

it("connects to cluster", async () => {
const createDatabaseUserSpy = vitest.spyOn(
integration.mcpServer().session.apiClient,
"createDatabaseUser"
);

const projectId = getProjectId();
const connectionType = "standard";
let connected = false;
Expand All @@ -158,6 +171,8 @@ describeWithAtlas("clusters", (integration) => {
if (content.includes(`Connected to cluster "${clusterName}"`)) {
connected = true;

expect(createDatabaseUserSpy).toHaveBeenCalledTimes(1);

// assert that some of the element s have the message
expect(content).toContain(
"Note: A temporary user has been created to enable secure connection to the cluster. For more information, see https://dochub.mongodb.org/core/mongodb-mcp-server-tools-considerations"
Expand All @@ -172,6 +187,58 @@ describeWithAtlas("clusters", (integration) => {
expect(connected).toBe(true);
});

describe("when connected", () => {
withCluster(
integration,
({ getProjectId: getSecondaryProjectId, getClusterName: getSecondaryClusterName }) => {
beforeAll(async () => {
let connected = false;
for (let i = 0; i < 10; i++) {
const response = await integration.mcpClient().callTool({
Copy link
Collaborator

@blva blva Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[q] why do we need to call connect several times, shouldn't we connect and wait a considerable amount of time and that should be enough?

Copy link
Collaborator Author

@fmenezes fmenezes Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the edge case where atlas can take a long time to provision the DB user to data plane, in which case we need to keep waiting

name: "atlas-connect-cluster",
arguments: {
projectId: getSecondaryProjectId(),
clusterName: getSecondaryClusterName(),
connectionType: "standard",
},
});

const content = getResponseContent(response.content);

if (content.includes(`Connected to cluster "${getSecondaryClusterName()}"`)) {
connected = true;
break;
}

await sleep(500);
}

if (!connected) {
throw new Error("Could not connect to cluster before tests");
}
});

it("disconnects and deletes the database user before connecting to another cluster", async () => {
const deleteDatabaseUserSpy = vitest.spyOn(
integration.mcpServer().session.apiClient,
"deleteDatabaseUser"
);

await integration.mcpClient().callTool({
name: "atlas-connect-cluster",
arguments: {
projectId: getProjectId(),
clusterName: clusterName,
connectionType: "standard",
},
});

expect(deleteDatabaseUserSpy).toHaveBeenCalledTimes(1);
});
}
);
});

describe("when not connected", () => {
it("prompts for atlas-connect-cluster when querying mongodb", async () => {
const response = await integration.mcpClient().callTool({
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tools/atlas/dbUsers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describeWithAtlas("db users", (integration) => {
withProject(integration, ({ getProjectId }) => {
let userName: string;
beforeEach(() => {
userName = "testuser-" + randomId;
userName = "testuser-" + randomId();
});

const createUserWithMCP = async (password?: string): Promise<unknown> => {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tools/atlas/performanceAdvisor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type { BaseEvent, ToolEvent } from "../../../../src/telemetry/types.js";

describeWithAtlas("performanceAdvisor", (integration) => {
withProject(integration, ({ getProjectId }) => {
const clusterName = "ClusterTest-" + randomId;
const clusterName = "ClusterTest-" + randomId();

afterAll(async () => {
const projectId = getProjectId();
Expand Down
Loading