Merge branch 'main' into MCP-280

Author: fmenezes

package-lock.json

@@ -52,7 +52,8 @@
     "fix": "npm run fix:lint && npm run reformat",
     "fix:lint": "eslint . --fix",
     "reformat": "prettier --write .",
-    "generate": "./scripts/generate.sh && npm run generate:arguments",
+    "generate": "npm run generate:api && npm run generate:arguments",
+    "generate:api": "./scripts/generate.sh",
     "generate:arguments": "tsx scripts/generateArguments.ts",
     "test": "vitest --project eslint-rules --project unit-and-integration --coverage",
     "pretest:accuracy": "npm run build",

package.json

@@ -36,6 +36,7 @@ async function main(): Promise<void> {
         path: string;
         method: string;
         operationId: string;
+        methodName: string;
         requiredParams: boolean;
         tag: string;
         hasResponseBody: boolean;
@@ -45,7 +46,9 @@ async function main(): Promise<void> {
     for (const path in openapi.paths) {
         for (const method in openapi.paths[path]) {
             // @ts-expect-error This is a workaround for the OpenAPI types
-            const operation = openapi.paths[path][method] as OpenAPIV3_1.OperationObject;
+            const operation = openapi.paths[path][method] as OpenAPIV3_1.OperationObject & {
+                "x-xgen-operation-id-override": string;
+            };
 
             if (!operation.operationId || !operation.tags?.length) {
                 continue;
@@ -81,6 +84,7 @@ async function main(): Promise<void> {
             operations.push({
                 path,
                 method: method.toUpperCase(),
+                methodName: operation["x-xgen-operation-id-override"] || operation.operationId || "",
                 operationId: operation.operationId || "",
                 requiredParams,
                 hasResponseBody,
@@ -91,9 +95,9 @@ async function main(): Promise<void> {
 
     const operationOutput = operations
         .map((operation) => {
-            const { operationId, method, path, requiredParams, hasResponseBody } = operation;
+            const { methodName, operationId, method, path, requiredParams, hasResponseBody } = operation;
             return `// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-async ${operationId}(options${requiredParams ? "" : "?"}: FetchOptions<operations["${operationId}"]>) {
+async ${methodName}(options${requiredParams ? "" : "?"}: FetchOptions<operations["${operationId}"]>) {
     const { ${hasResponseBody ? `data, ` : ``}error, response } = await this.client.${method}("${path}", options);
     if (error) {
         throw ApiClientError.fromError(response, error);

scripts/apply.ts

@@ -12,7 +12,7 @@ function isOlderThanTwoHours(date: string): boolean {
 }
 
 async function findTestOrganization(client: ApiClient): Promise<AtlasOrganization> {
-    const orgs = await client.listOrganizations();
+    const orgs = await client.listOrgs();
     const testOrg = orgs?.results?.find((org) => org.name === "MongoDB MCP Test");
 
     if (!testOrg) {
@@ -23,7 +23,7 @@ async function findTestOrganization(client: ApiClient): Promise<AtlasOrganizatio
 }
 
 async function findAllTestProjects(client: ApiClient, orgId: string): Promise<Group[]> {
-    const projects = await client.listOrganizationProjects({
+    const projects = await client.getOrgGroups({
         params: {
             path: {
                 orgId,
@@ -101,7 +101,7 @@ async function main(): Promise<void> {
 
         // Try to delete the project
         try {
-            await apiClient.deleteProject({
+            await apiClient.deleteGroup({
                 params: {
                     path: {
                         groupId: project.id,

scripts/cleanupAtlasTestLeftovers.test.ts

@@ -19,11 +19,11 @@ async function readStdin(): Promise<string> {
 
 function filterOpenapi(openapi: OpenAPIV3_1.Document): OpenAPIV3_1.Document {
     const allowedOperations = [
-        "listProjects",
-        "listOrganizations",
-        "getProject",
-        "createProject",
-        "deleteProject",
+        "listGroups",
+        "listOrgs",
+        "getGroup",
+        "createGroup",
+        "deleteGroup",
         "listClusters",
         "listFlexClusters",
         "getCluster",
@@ -32,28 +32,35 @@ function filterOpenapi(openapi: OpenAPIV3_1.Document): OpenAPIV3_1.Document {
         "createFlexCluster",
         "deleteCluster",
         "deleteFlexCluster",
-        "listClustersForAllProjects",
+        "listClusterDetails",
         "createDatabaseUser",
         "deleteDatabaseUser",
         "listDatabaseUsers",
-        "listProjectIpAccessLists",
-        "createProjectIpAccessList",
-        "deleteProjectIpAccessList",
-        "listOrganizationProjects",
+        "listAccessListEntries",
+        "createAccessListEntry",
+        "deleteAccessListEntry",
+        "getOrgGroups",
         "listAlerts",
-        "listDropIndexes",
+        "listDropIndexSuggestions",
         "listClusterSuggestedIndexes",
         "listSchemaAdvice",
-        "listSlowQueries",
+        "listSlowQueryLogs",
     ];
 
     const filteredPaths = {};
 
     for (const path in openapi.paths) {
         const filteredMethods = {} as OpenAPIV3_1.PathItemObject;
-        for (const method in openapi.paths[path]) {
-            // @ts-expect-error This is a workaround for the OpenAPI types
-            if (allowedOperations.includes((openapi.paths[path][method] as { operationId: string }).operationId)) {
+        // @ts-expect-error This is a workaround for the OpenAPI types
+        for (const [method, operation] of Object.entries(openapi.paths[path])) {
+            const op = operation as OpenAPIV3_1.OperationObject & {
+                "x-xgen-operation-id-override": string;
+            };
+            if (
+                op.operationId &&
+                (allowedOperations.includes(op.operationId) ||
+                    allowedOperations.includes(op["x-xgen-operation-id-override"]))
+            ) {
                 // @ts-expect-error This is a workaround for the OpenAPI types
                 filteredMethods[method] = openapi.paths[path][method] as OpenAPIV3_1.OperationObject;
             }

scripts/filter.ts

@@ -27,7 +27,7 @@ export async function makeCurrentIpAccessListEntry(
 export async function ensureCurrentIpInAccessList(apiClient: ApiClient, projectId: string): Promise<boolean> {
     const entry = await makeCurrentIpAccessListEntry(apiClient, projectId, DEFAULT_ACCESS_LIST_COMMENT);
     try {
-        await apiClient.createProjectIpAccessList({
+        await apiClient.createAccessListEntry({
             params: { path: { groupId: projectId } },
             body: [entry],
         });