reuse args

Author: blva

src/tools/args.ts

@@ -18,6 +18,7 @@ export const ALLOWED_CLUSTER_NAME_CHARACTERS_ERROR =
 const ALLOWED_PROJECT_NAME_CHARACTERS_REGEX = /^[a-zA-Z0-9\s()@&+:._',-]+$/;
 export const ALLOWED_PROJECT_NAME_CHARACTERS_ERROR =
     "Project names can't be longer than 64 characters and can only contain letters, numbers, spaces, and the following symbols: ( ) @ & + : . _ - ' ,";
+
 export const CommonArgs = {
     string: (): ZodString => z.string().regex(NO_UNICODE_REGEX, NO_UNICODE_ERROR),
 
@@ -70,14 +71,15 @@ export const AtlasArgs = {
         z.string().min(1, "Password is required").max(100, "Password must be 100 characters or less"),
 };
 
-export const ProjectAndClusterArgs = {
+export const ProjectArgs = {
     projectId: AtlasArgs.projectId(),
-    clusterName: AtlasArgs.clusterName().describe("Atlas cluster name"),
 };
 
-export const ProjectArgs = {
-    projectId: AtlasArgs.projectId(),
+export const ProjectAndClusterArgs = {
+    ...ProjectArgs,
+    clusterName: AtlasArgs.clusterName().describe("Atlas cluster name"),
 };
+
 function toEJSON<T extends object | undefined>(value: T): T {
     if (!value) {
         return value;
@@ -89,11 +91,3 @@ function toEJSON<T extends object | undefined>(value: T): T {
 export function zEJSON(): z.AnyZodObject {
     return z.object({}).passthrough().transform(toEJSON) as unknown as z.AnyZodObject;
 }
-export const ProjectAndClusterArgs = {
-    projectId: AtlasArgs.projectId(),
-    clusterName: AtlasArgs.clusterName().describe("Atlas cluster name"),
-};
-
-export const ProjectArgs = {
-    projectId: AtlasArgs.projectId(),
-};

src/tools/atlas/connect/connectCluster.ts

@@ -7,7 +7,7 @@ import { inspectCluster } from "../../../common/atlas/cluster.js";
 import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUtils.js";
 import type { AtlasClusterConnectionInfo } from "../../../common/connectionManager.js";
 import { getDefaultRoleFromConfig } from "../../../common/atlas/roles.js";
-import { AtlasArgs } from "../../args.js";
+import { ProjectAndClusterArgs } from "../../args.js";
 
 const addedIpAccessListMessage =
     "Note: Your current IP address has been added to the Atlas project's IP access list to enable secure connection.";
@@ -20,8 +20,7 @@ function sleep(ms: number): Promise<void> {
 }
 
 export const ConnectClusterArgs = {
-    projectId: AtlasArgs.projectId(),
-    clusterName: AtlasArgs.clusterName().describe("Atlas cluster name"),
+    ...ProjectAndClusterArgs,
 };
 
 export class ConnectClusterTool extends AtlasToolBase {

src/tools/atlas/create/createFreeCluster.ts

@@ -3,22 +3,25 @@ import { type ToolArgs, type OperationType } from "../../tool.js";
 import { AtlasToolBase } from "../atlasTool.js";
 import type { ClusterDescription20240805 } from "../../../common/atlas/openapi.js";
 import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUtils.js";
-import { AtlasArgs } from "../../args.js";
+import { ProjectAndClusterArgs, AtlasArgs } from "../../args.js";
 
 export class CreateFreeClusterTool extends AtlasToolBase {
     public name = "atlas-create-free-cluster";
     protected description = "Create a free MongoDB Atlas cluster";
     public operationType: OperationType = "create";
     protected argsShape = {
-        projectId: AtlasArgs.projectId().describe("Atlas project ID to create the cluster in"),
-        name: AtlasArgs.clusterName().describe("Name of the cluster"),
+        ...ProjectAndClusterArgs,
         region: AtlasArgs.region().describe("Region of the cluster").default("US_EAST_1"),
     };
 
-    protected async execute({ projectId, name, region }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
+    protected async execute({
+        projectId,
+        clusterName,
+        region,
+    }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const input = {
             groupId: projectId,
-            name,
+            clusterName,
             clusterType: "REPLICASET",
             replicationSpecs: [
                 {
@@ -50,7 +53,7 @@ export class CreateFreeClusterTool extends AtlasToolBase {
 
         return {
             content: [
-                { type: "text", text: `Cluster "${name}" has been created in region "${region}".` },
+                { type: "text", text: `Cluster "${clusterName}" has been created in region "${region}".` },
                 { type: "text", text: `Double check your access lists to enable your current IP.` },
             ],
         };