Remove deleteAndWaitCluster and use existing deleteCluster

Author: kylelai1

tests/integration/tools/atlas/atlasHelpers.ts

@@ -176,12 +176,11 @@ export async function assertClusterIsAvailable(
     }
 }
 
-export async function deleteAndWaitCluster(
+export async function deleteCluster(
     session: Session,
     projectId: string,
     clusterName: string,
-    pollingInterval: number = 1000,
-    maxPollingIterations: number = 300
+    shouldWaitTillClusterIsDeleted: boolean = false
 ): Promise<void> {
     await session.apiClient.deleteCluster({
         params: {
@@ -192,16 +191,25 @@ export async function deleteAndWaitCluster(
         },
     });
 
-    for (let i = 0; i < maxPollingIterations; i++) {
-        const isAvailable = await assertClusterIsAvailable(session, projectId, clusterName);
-        if (!isAvailable) {
-            return;
+    if (!shouldWaitTillClusterIsDeleted) {
+        return;
+    }
+
+    while (true) {
+        try {
+            await session.apiClient.getCluster({
+                params: {
+                    path: {
+                        groupId: projectId,
+                        clusterName,
+                    },
+                },
+            });
+            await sleep(1000);
+        } catch {
+            break;
         }
-        await sleep(pollingInterval);
     }
-    throw new Error(
-        `Cluster deletion timeout: ${clusterName} did not delete within ${maxPollingIterations} iterations`
-    );
 }
 
 export async function waitCluster(

tests/integration/tools/atlas/clusters.test.ts

@@ -1,70 +1,12 @@
 import type { Session } from "../../../../src/common/session.js";
 import { expectDefined, getDataFromUntrustedContent, getResponseElements } from "../../helpers.js";
-import { describeWithAtlas, withProject, randomId, parseTable } from "./atlasHelpers.js";
+import { describeWithAtlas, withProject, randomId, parseTable, deleteCluster, waitCluster } from "./atlasHelpers.js";
 import { afterAll, beforeAll, describe, expect, it } from "vitest";
 
 function sleep(ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-async function deleteCluster(
-    session: Session,
-    projectId: string,
-    clusterName: string,
-    wait: boolean = false
-): Promise<void> {
-    await session.apiClient.deleteCluster({
-        params: {
-            path: {
-                groupId: projectId,
-                clusterName,
-            },
-        },
-    });
-
-    if (!wait) {
-        return;
-    }
-
-    while (true) {
-        try {
-            await session.apiClient.getCluster({
-                params: {
-                    path: {
-                        groupId: projectId,
-                        clusterName,
-                    },
-                },
-            });
-            await sleep(1000);
-        } catch {
-            break;
-        }
-    }
-}
-
-async function waitCluster(
-    session: Session,
-    projectId: string,
-    clusterName: string,
-    check: (cluster: ClusterDescription20240805) => boolean | Promise<boolean>
-): Promise<void> {
-    while (true) {
-        const cluster = await session.apiClient.getCluster({
-            params: {
-                path: {
-                    groupId: projectId,
-                    clusterName,
-                },
-            },
-        });
-        if (await check(cluster)) {
-            return;
-        }
-        await sleep(1000);
-    }
-}
-
 describeWithAtlas("clusters", (integration) => {
     withProject(integration, ({ getProjectId, getIpAddress }) => {
         const clusterName = "ClusterTest-" + randomId;

tests/integration/tools/atlas/performanceAdvisor.test.ts

@@ -3,7 +3,7 @@
 
 import type { Session } from "../../../../src/common/session.js";
 import { DEFAULT_LONG_RUNNING_TEST_WAIT_TIMEOUT_MS, expectDefined, getResponseElements } from "../../helpers.js";
-import { describeWithAtlas, withProject, randomId, deleteAndWaitCluster, waitCluster } from "./atlasHelpers.js";
+import { describeWithAtlas, withProject, randomId, waitCluster, deleteCluster } from "./atlasHelpers.js";
 import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest";
 
 describeWithAtlas("performanceAdvisor", (integration) => {
@@ -14,7 +14,7 @@ describeWithAtlas("performanceAdvisor", (integration) => {
             const projectId = getProjectId();
             if (projectId) {
                 const session: Session = integration.mcpServer().session;
-                await deleteAndWaitCluster(session, projectId, clusterName, 1000, 1200);
+                await deleteCluster(session, projectId, clusterName);
             }
         }, DEFAULT_LONG_RUNNING_TEST_WAIT_TIMEOUT_MS);