Merge branch 'main' into feat-MCP-40

Author: jeroenvervaeke

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22-alpine
+FROM node:24-alpine
 ARG VERSION=latest
 RUN addgroup -S mcp && adduser -S mcp -G mcp
 RUN npm install -g mongodb-mcp-server@${VERSION}

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "mongodb-mcp-server",
   "description": "MongoDB Model Context Protocol Server",
-  "version": "1.0.3-prerelease.1",
+  "version": "1.1.0-prerelease.1",
   "type": "module",
   "exports": {
     ".": {

package.json

@@ -35,7 +35,9 @@ async function findAllTestProjects(client: ApiClient, orgId: string): Promise<Gr
     return testProjects.filter((proj) => isOlderThanADay(proj.created));
 }
 
-async function deleteAllClustersOnStaleProject(client: ApiClient, projectId: string): Promise<void> {
+async function deleteAllClustersOnStaleProject(client: ApiClient, projectId: string): Promise<string[]> {
+    const errors: string[] = [];
+
     const allClusters = await client
         .listClusters({
             params: {
@@ -47,10 +49,18 @@ async function deleteAllClustersOnStaleProject(client: ApiClient, projectId: str
         .then((res) => res.results || []);
 
     await Promise.allSettled(
-        allClusters.map((cluster) =>
-            client.deleteCluster({ params: { path: { groupId: projectId || "", clusterName: cluster.name || "" } } })
-        )
+        allClusters.map(async (cluster) => {
+            try {
+                await client.deleteCluster({
+                    params: { path: { groupId: projectId || "", clusterName: cluster.name || "" } },
+                });
+            } catch (error) {
+                errors.push(`Failed to delete cluster ${cluster.name} in project ${projectId}: ${String(error)}`);
+            }
+        })
     );
+
+    return errors;
 }
 
 async function main(): Promise<void> {
@@ -70,27 +80,47 @@ async function main(): Promise<void> {
 
     if (testProjects.length === 0) {
         console.log("No stale test projects found for cleanup.");
+        return;
     }
 
+    const allErrors: string[] = [];
+
     for (const project of testProjects) {
         console.log(`Cleaning up project: ${project.name} (${project.id})`);
         if (!project.id) {
             console.warn(`Skipping project with missing ID: ${project.name}`);
             continue;
         }
 
-        await deleteAllClustersOnStaleProject(apiClient, project.id);
-        await apiClient.deleteProject({
-            params: {
-                path: {
-                    groupId: project.id,
+        // Try to delete all clusters first
+        const clusterErrors = await deleteAllClustersOnStaleProject(apiClient, project.id);
+        allErrors.push(...clusterErrors);
+
+        // Try to delete the project
+        try {
+            await apiClient.deleteProject({
+                params: {
+                    path: {
+                        groupId: project.id,
+                    },
                 },
-            },
-        });
-        console.log(`Deleted project: ${project.name} (${project.id})`);
+            });
+            console.log(`Deleted project: ${project.name} (${project.id})`);
+        } catch (error) {
+            const errorStr = String(error);
+            const errorMessage = `Failed to delete project ${project.name} (${project.id}): ${errorStr}`;
+            console.error(errorMessage);
+            allErrors.push(errorMessage);
+        }
+    }
+
+    if (allErrors.length > 0) {
+        const errorList = allErrors.map((err, i) => `${i + 1}. ${err}`).join("\n");
+        const errorSummary = `Cleanup completed with ${allErrors.length} error(s):\n${errorList}`;
+        throw new Error(errorSummary);
     }
 
-    return;
+    console.log("All stale test projects cleaned up successfully.");
 }
 
 describe("Cleanup Atlas Test Leftovers", () => {

scripts/cleanupAtlasTestLeftovers.test.ts

@@ -201,6 +201,7 @@ export const defaultUserConfig: UserConfig = {
         "drop-database",
         "drop-collection",
         "delete-many",
+        "drop-index",
     ],
     transport: "stdio",
     httpPort: 3000,

src/common/config.ts

@@ -1,5 +1,5 @@
 // This file was generated by scripts/updatePackageVersion.ts - Do not edit it manually.
 export const packageInfo = {
-    version: "1.0.3-prerelease.1",
+    version: "1.1.0-prerelease.1",
     mcpServerName: "MongoDB MCP Server",
 };