chore: simplify drop-index API

nirinchev · nirinchev · commit 3315b049916c · 2025-10-20T10:52:15.000+03:00
diff --git a/src/tools/mongodb/delete/dropIndex.ts b/src/tools/mongodb/delete/dropIndex.ts
@@ -1,6 +1,5 @@
 import z from "zod";
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import type { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { DbOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
 import { type ToolArgs, type OperationType, formatUntrustedData, FeatureFlags } from "../../tool.js";
 
@@ -10,86 +9,62 @@ export class DropIndexTool extends MongoDBToolBase {
     protected argsShape = {
         ...DbOperationArgs,
         indexName: z.string().nonempty().describe("The name of the index to be dropped."),
-        type: this.isFeatureFlagEnabled(FeatureFlags.VectorSearch)
-            ? z
-                  .enum(["classic", "search"])
-                  .describe(
-                      "The type of index to be deleted. Use 'classic' for standard indexes and 'search' for atlas search and vector search indexes."
-                  )
-            : z
-                  .literal("classic")
-                  .default("classic")
-                  .describe("The type of index to be deleted. Is always set to 'classic'."),
     };
     public operationType: OperationType = "delete";
 
-    protected async execute(toolArgs: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
+    protected async execute({
+        database,
+        collection,
+        indexName,
+    }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();
-        switch (toolArgs.type) {
-            case "classic":
-                return this.dropClassicIndex(provider, toolArgs);
-            case "search":
-                return this.dropSearchIndex(provider, toolArgs);
-        }
-    }
+        const existingIndex = (await provider.getIndexes(database, collection)).find((idx) => idx.name === indexName);
+        if (existingIndex) {
+            const result = await provider.runCommand(database, {
+                dropIndexes: collection,
+                index: indexName,
+            });
 
-    private async dropClassicIndex(
-        provider: NodeDriverServiceProvider,
-        { database, collection, indexName }: ToolArgs<typeof this.argsShape>
-    ): Promise<CallToolResult> {
-        const result = await provider.runCommand(database, {
-            dropIndexes: collection,
-            index: indexName,
-        });
-
-        return {
-            content: formatUntrustedData(
-                `${result.ok ? "Successfully dropped" : "Failed to drop"} the index from the provided namespace.`,
-                JSON.stringify({
-                    indexName,
-                    namespace: `${database}.${collection}`,
-                })
-            ),
-            isError: result.ok ? undefined : true,
-        };
-    }
-
-    private async dropSearchIndex(
-        provider: NodeDriverServiceProvider,
-        { database, collection, indexName }: ToolArgs<typeof this.argsShape>
-    ): Promise<CallToolResult> {
-        await this.ensureSearchIsSupported();
-        const indexes = await provider.getSearchIndexes(database, collection, indexName);
-        if (indexes.length === 0) {
             return {
                 content: formatUntrustedData(
-                    "Index does not exist in the provided namespace.",
-                    JSON.stringify({ indexName, namespace: `${database}.${collection}` })
+                    `${result.ok ? "Successfully dropped" : "Failed to drop"} the index from the provided namespace.`,
+                    JSON.stringify({
+                        indexName,
+                        namespace: `${database}.${collection}`,
+                    })
                 ),
-                isError: true,
+                isError: result.ok ? undefined : true,
             };
         }
 
-        await provider.dropSearchIndex(database, collection, indexName);
+        if (this.isFeatureFlagEnabled(FeatureFlags.VectorSearch) && (await this.session.isSearchSupported())) {
+            const existingSearchIndex = (await provider.getSearchIndexes(database, collection, indexName))[0];
+            if (existingSearchIndex) {
+                await provider.dropSearchIndex(database, collection, indexName);
+                return {
+                    content: formatUntrustedData(
+                        "Successfully dropped the index from the provided namespace.",
+                        JSON.stringify({
+                            indexName,
+                            namespace: `${database}.${collection}`,
+                        })
+                    ),
+                };
+            }
+        }
+
         return {
             content: formatUntrustedData(
-                "Successfully dropped the index from the provided namespace.",
-                JSON.stringify({
-                    indexName,
-                    namespace: `${database}.${collection}`,
-                })
+                "Index does not exist in the provided namespace.",
+                JSON.stringify({ indexName, namespace: `${database}.${collection}` })
             ),
+            isError: true,
         };
     }
 
-    protected getConfirmationMessage({
-        database,
-        collection,
-        indexName,
-        type,
-    }: ToolArgs<typeof this.argsShape>): string {
+    protected getConfirmationMessage({ database, collection, indexName }: ToolArgs<typeof this.argsShape>): string {
         return (
-            `You are about to drop the ${type === "search" ? "search index" : "index"} named \`${indexName}\` from the \`${database}.${collection}\` namespace:\n\n` +
+            `You are about to drop the index named \`${indexName}\` from the \`${database}.${collection}\` namespace:\n\n` +
             "This operation will permanently remove the index and might affect the performance of queries relying on this index.\n\n" +
             "**Do you confirm the execution of the action?**"
         );
diff --git a/tests/accuracy/dropIndex.test.ts b/tests/accuracy/dropIndex.test.ts
@@ -29,7 +29,6 @@ describeAccuracyTests(
                         database: "mflix",
                         collection: "movies",
                         indexName: "year_1",
-                        type: "classic",
                     },
                 },
             ],
@@ -49,7 +48,6 @@ describeAccuracyTests(
                                 keys: {
                                     title: "text",
                                 },
-                                type: "classic",
                             },
                         ],
                     },
@@ -67,7 +65,6 @@ describeAccuracyTests(
                         database: "mflix",
                         collection: "movies",
                         indexName: Matcher.string(),
-                        type: "classic",
                     },
                 },
                 {
@@ -76,7 +73,6 @@ describeAccuracyTests(
                         database: "mflix",
                         collection: "movies",
                         indexName: Matcher.string(),
-                        type: "classic",
                     },
                 },
             ],
@@ -118,7 +114,6 @@ describeAccuracyTests(
                         database: "mflix",
                         collection: "movies",
                         indexName: Matcher.string(),
-                        type: "search",
                     },
                 },
             ],
diff --git a/tests/integration/tools/mongodb/delete/dropIndex.test.ts b/tests/integration/tools/mongodb/delete/dropIndex.test.ts
