fix: incorrect number of clusters found (#561)

Author: nirinchev

src/tools/atlas/read/listClusters.ts

@@ -97,17 +97,17 @@ ${rows}`,
         }
         const formattedClusters = clusters?.results?.map((cluster) => formatCluster(cluster)) || [];
         const formattedFlexClusters = flexClusters?.results?.map((cluster) => formatFlexCluster(cluster)) || [];
-        const rows = [...formattedClusters, ...formattedFlexClusters]
-            .map((formattedCluster) => {
-                return `${formattedCluster.name || "Unknown"} | ${formattedCluster.instanceType} | ${formattedCluster.instanceSize || "N/A"} | ${formattedCluster.state || "UNKNOWN"} | ${formattedCluster.mongoDBVersion || "N/A"} | ${formattedCluster.connectionString || "N/A"}`;
-            })
-            .join("\n");
+        const allClusters = [...formattedClusters, ...formattedFlexClusters];
         return {
             content: formatUntrustedData(
-                `Found ${rows.length} clusters in project "${project.name}" (${project.id}):`,
+                `Found ${allClusters.length} clusters in project "${project.name}" (${project.id}):`,
                 `Cluster Name | Cluster Type | Tier | State | MongoDB Version | Connection String
 ----------------|----------------|----------------|----------------|----------------|----------------
-${rows}`
+${allClusters
+    .map((formattedCluster) => {
+        return `${formattedCluster.name || "Unknown"} | ${formattedCluster.instanceType} | ${formattedCluster.instanceSize || "N/A"} | ${formattedCluster.state || "UNKNOWN"} | ${formattedCluster.mongoDBVersion || "N/A"} | ${formattedCluster.connectionString || "N/A"}`;
+    })
+    .join("\n")}`
             ),
         };
     }

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

@@ -1,6 +1,6 @@
 import type { Session } from "../../../../src/common/session.js";
-import { expectDefined, getResponseElements } from "../../helpers.js";
-import { describeWithAtlas, withProject, randomId } from "./atlasHelpers.js";
+import { expectDefined, getDataFromUntrustedContent, getResponseElements } from "../../helpers.js";
+import { describeWithAtlas, withProject, randomId, parseTable } from "./atlasHelpers.js";
 import type { ClusterDescription20240805 } from "../../../../src/common/atlas/openapi.js";
 import { afterAll, beforeAll, describe, expect, it } from "vitest";
 
@@ -152,9 +152,12 @@ describeWithAtlas("clusters", (integration) => {
 
                 const elements = getResponseElements(response);
                 expect(elements).toHaveLength(2);
-                expect(elements[0]?.text).toMatch(/Found \d+ clusters in project/);
+
                 expect(elements[1]?.text).toContain("<untrusted-user-data-");
                 expect(elements[1]?.text).toContain(`${clusterName} | `);
+                const data = parseTable(getDataFromUntrustedContent(elements[1]?.text ?? ""));
+                expect(data.length).toBeGreaterThanOrEqual(1);
+                expect(elements[0]?.text).toMatch(`Found ${data.length} clusters in project`);
             });
         });