@google-cloud/cloud-run-mcp 1.3.0 → 1.6.0

package/test/local/tools.test.js

@@ -8,11 +8,11 @@ describe('registerTools', () => {
       registerTool: mock.fn(),
     };
 
-    const { registerTools } = await esmock('../../tools.js', {});
+    const { registerTools } = await esmock('../../tools/tools.js', {});
 
     registerTools(server);
 
-    assert.strictEqual(server.registerTool.mock.callCount(), 9);
+    assert.strictEqual(server.registerTool.mock.callCount(), 8);
     const toolNames = server.registerTool.mock.calls.map(
       (call) => call.arguments[0]
     );
@@ -22,7 +22,6 @@ describe('registerTools', () => {
         'create_project',
         'deploy_container_image',
         'deploy_file_contents',
-        'deploy_local_files',
         'deploy_local_folder',
         'get_service',
         'get_service_log',
@@ -38,12 +37,16 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/gcp-projects.js': {
-          listProjects: () =>
-            Promise.resolve([{ id: 'project1' }, { id: 'project2' }]),
-        },
-      });
+      const { registerTools } = await esmock(
+        '../../tools/tools.js',
+        {},
+        {
+          '../../lib/cloud-api/projects.js': {
+            listProjects: () =>
+              Promise.resolve([{ id: 'project1' }, { id: 'project2' }]),
+          },
+        }
+      );
 
       registerTools(server, { gcpCredentialsAvailable: true });
 
@@ -69,15 +72,19 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/gcp-projects.js': {
-          createProjectAndAttachBilling: (projectId) =>
-            Promise.resolve({
-              projectId: projectId,
-              billingMessage: 'billing message',
-            }),
-        },
-      });
+      const { registerTools } = await esmock(
+        '../../tools/tools.js',
+        {},
+        {
+          '../../lib/cloud-api/projects.js': {
+            createProjectAndAttachBilling: (projectId) =>
+              Promise.resolve({
+                projectId: projectId,
+                billingMessage: `Project ${projectId} created successfully. Billing attached.`,
+              }),
+          },
+        }
+      );
 
       registerTools(server, { gcpCredentialsAvailable: true });
 
@@ -90,7 +97,7 @@ describe('registerTools', () => {
         content: [
           {
             type: 'text',
-            text: 'Successfully created GCP project with ID "my-project". You can now use this project ID for deployments.',
+            text: 'Project my-project created successfully. Billing attached.',
           },
         ],
       });
@@ -101,15 +108,20 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/gcp-projects.js': {
-          createProjectAndAttachBilling: () =>
-            Promise.resolve({
-              projectId: 'generated-project',
-              billingMessage: 'billing message',
-            }),
-        },
-      });
+      const { registerTools } = await esmock(
+        '../../tools/tools.js',
+        {},
+        {
+          '../../lib/cloud-api/projects.js': {
+            createProjectAndAttachBilling: () =>
+              Promise.resolve({
+                projectId: 'generated-project',
+                billingMessage:
+                  'Project generated-project created successfully. Billing attached.',
+              }),
+          },
+        }
+      );
 
       registerTools(server, { gcpCredentialsAvailable: true });
 
@@ -122,7 +134,7 @@ describe('registerTools', () => {
         content: [
           {
             type: 'text',
-            text: 'Successfully created GCP project with ID "generated-project". You can now use this project ID for deployments.',
+            text: 'Project generated-project created successfully. Billing attached.',
           },
         ],
       });
@@ -135,15 +147,25 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/cloud-run-services.js': {
-          listServices: () =>
-            Promise.resolve([
-              { name: 'service1', uri: 'uri1' },
-              { name: 'service2', uri: 'uri2' },
-            ]),
-        },
-      });
+      const { registerTools } = await esmock(
+        '../../tools/tools.js',
+        {},
+        {
+          '../../lib/cloud-api/run.js': {
+            listServices: () =>
+              Promise.resolve({
+                'my-region1': [
+                  { name: 'service1', uri: 'uri1' },
+                  { name: 'service2', uri: 'uri2' },
+                ],
+                'my-region2': [
+                  { name: 'service3', uri: 'uri3' },
+                  { name: 'service4', uri: 'uri4' },
+                ],
+              }),
+          },
+        }
+      );
 
       registerTools(server, { gcpCredentialsAvailable: true });
 
@@ -152,14 +174,17 @@ describe('registerTools', () => {
       ).arguments[2];
       const result = await handler({
         project: 'my-project',
-        region: 'my-region',
       });
 
       assert.deepStrictEqual(result, {
         content: [
           {
             type: 'text',
-            text: 'Services in project my-project (location my-region):\n- service1 (URL: uri1)\n- service2 (URL: uri2)',
+            text: 'Services in project my-project (location my-region1):\n- service1 (URL: uri1)\n- service2 (URL: uri2)',
+          },
+          {
+            type: 'text',
+            text: 'Services in project my-project (location my-region2):\n- service3 (URL: uri3)\n- service4 (URL: uri4)',
           },
         ],
       });
@@ -172,16 +197,20 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/cloud-run-services.js': {
-          getService: () =>
-            Promise.resolve({
-              name: 'my-service',
-              uri: 'my-uri',
-              lastModifier: 'me',
-            }),
-        },
-      });
+      const { registerTools } = await esmock(
+        '../../tools/tools.js',
+        {},
+        {
+          '../../lib/cloud-api/run.js': {
+            getService: () =>
+              Promise.resolve({
+                name: 'my-service',
+                uri: 'my-uri',
+                lastModifier: 'me',
+              }),
+          },
+        }
+      );
 
       registerTools(server, { gcpCredentialsAvailable: true });
 
@@ -223,11 +252,15 @@ describe('registerTools', () => {
         return Promise.resolve({ logs: 'log3\nlog4', requestOptions: null });
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/cloud-run-services.js': {
-          getServiceLogs: getServiceLogs,
-        },
-      });
+      const { registerTools } = await esmock(
+        '../../tools/tools.js',
+        {},
+        {
+          '../../lib/cloud-api/run.js': {
+            getServiceLogs: getServiceLogs,
+          },
+        }
+      );
 
       registerTools(server, { gcpCredentialsAvailable: true });
 
@@ -251,64 +284,36 @@ describe('registerTools', () => {
     });
   });
 
-  describe('deploy_local_files', () => {
-    it('should deploy local files', async () => {
-      const server = {
-        registerTool: mock.fn(),
-      };
-
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/cloud-run-deploy.js': {
-          deploy: () => Promise.resolve({ uri: 'my-uri' }),
-        },
-      });
-
-      registerTools(server, { gcpCredentialsAvailable: true });
-
-      const handler = server.registerTool.mock.calls.find(
-        (call) => call.arguments[0] === 'deploy_local_files'
-      ).arguments[2];
-      const result = await handler({
-        project: 'my-project',
-        region: 'my-region',
-        service: 'my-service',
-        files: ['file1', 'file2'],
-      });
-
-      assert.deepStrictEqual(result, {
-        content: [
-          {
-            type: 'text',
-            text: 'Cloud Run service my-service deployed in project my-project\nCloud Console: https://console.cloud.google.com/run/detail/my-region/my-service?project=my-project\nService URL: my-uri',
-          },
-        ],
-      });
-    });
-  });
-
   describe('deploy_local_folder', () => {
     it('should deploy local folder', async () => {
       const server = {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/cloud-run-deploy.js': {
-          deploy: () => Promise.resolve({ uri: 'my-uri' }),
-        },
-      });
+      const { registerTools } = await esmock(
+        '../../tools/tools.js',
+        {},
+        {
+          '../../lib/deployment/deployer.js': {
+            deploy: () => Promise.resolve({ uri: 'my-uri' }),
+          },
+        }
+      );
 
       registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'deploy_local_folder'
       ).arguments[2];
-      const result = await handler({
-        project: 'my-project',
-        region: 'my-region',
-        service: 'my-service',
-        folderPath: '/my/folder',
-      });
+      const result = await handler(
+        {
+          project: 'my-project',
+          region: 'my-region',
+          service: 'my-service',
+          folderPath: '/my/folder',
+        },
+        { sendNotification: mock.fn() }
+      );
 
       assert.deepStrictEqual(result, {
         content: [
@@ -327,23 +332,30 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/cloud-run-deploy.js': {
-          deploy: () => Promise.resolve({ uri: 'my-uri' }),
-        },
-      });
+      const { registerTools } = await esmock(
+        '../../tools/tools.js',
+        {},
+        {
+          '../../lib/deployment/deployer.js': {
+            deploy: () => Promise.resolve({ uri: 'my-uri' }),
+          },
+        }
+      );
 
       registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'deploy_file_contents'
       ).arguments[2];
-      const result = await handler({
-        project: 'my-project',
-        region: 'my-region',
-        service: 'my-service',
-        files: [{ filename: 'file1', content: 'content1' }],
-      });
+      const result = await handler(
+        {
+          project: 'my-project',
+          region: 'my-region',
+          service: 'my-service',
+          files: [{ filename: 'file1', content: 'content1' }],
+        },
+        { sendNotification: mock.fn() }
+      );
 
       assert.deepStrictEqual(result, {
         content: [
@@ -362,23 +374,30 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
-        '../../lib/cloud-run-deploy.js': {
-          deployImage: () => Promise.resolve({ uri: 'my-uri' }),
-        },
-      });
+      const { registerTools } = await esmock(
+        '../../tools/tools.js',
+        {},
+        {
+          '../../lib/deployment/deployer.js': {
+            deployImage: () => Promise.resolve({ uri: 'my-uri' }),
+          },
+        }
+      );
 
       registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'deploy_container_image'
       ).arguments[2];
-      const result = await handler({
-        project: 'my-project',
-        region: 'my-region',
-        service: 'my-service',
-        imageUrl: 'gcr.io/my-project/my-image',
-      });
+      const result = await handler(
+        {
+          project: 'my-project',
+          region: 'my-region',
+          service: 'my-service',
+          imageUrl: 'gcr.io/my-project/my-image',
+        },
+        { sendNotification: mock.fn() }
+      );
 
       assert.deepStrictEqual(result, {
         content: [
@@ -397,7 +416,7 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {});
+      const { registerTools } = await esmock('../../tools/tools.js', {});
 
       registerTools(server, { gcpCredentialsAvailable: false });
 

package/test/need-gcp/cloud-run-services.test.js

@@ -14,96 +14,76 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import readline from 'readline/promises';
-import { stdin as input, stdout as output } from 'process';
-import { getServiceLogs } from '../../lib/cloud-run-services.js';
+import { test } from 'node:test';
+import { getServiceLogs, listServices } from '../../lib/cloud-api/run.js';
+import assert from 'node:assert';
 
 /**
- * Prompts the user for required service information
- * @returns {Promise<{projectId: string, region: string, serviceId: string}>} The service details
+ * Get the GCP project ID from GOOGLE_CLOUD_PROJECT or command line argument.
+ * @returns {string} The GCP project ID
  */
-async function getServiceDetails() {
-  const rl = readline.createInterface({ input, output });
-
-  // Check command line arguments first
-  const [, , projectId, region = 'europe-west1', serviceId] = process.argv;
-
-  if (projectId && serviceId) {
-    console.log(`Using command line arguments:
-Project ID: ${projectId}
-Region: ${region}
-Service ID: ${serviceId}`);
-    rl.close();
-    return { projectId, region, serviceId };
+function getProjectId() {
+  const projectId = process.env.GOOGLE_CLOUD_PROJECT || process.argv[2];
+  if (!projectId) {
+    console.error(
+      'Usage: node <script> <projectId> or set GOOGLE_CLOUD_PROJECT'
+    );
+    process.exit(1);
   }
+  console.log(`Using Project ID: ${projectId}`);
+  return projectId;
+}
 
-  // If not provided via command line, prompt for the values
-  const projectIdInput = await rl.question('Enter the Project ID: ');
-  const regionInput = await rl.question(
-    'Enter the region (press Enter for europe-west1): '
-  );
-  const serviceIdInput = await rl.question('Enter the Service ID: ');
+/**
+ * Gets service details from GOOGLE_CLOUD_PROJECT or command line arguments.
+ * @returns {{projectId: string, region: string, serviceId: string}} The service details
+ */
+async function getServiceDetails() {
+  const projectId = getProjectId();
+  let region, serviceId;
 
-  rl.close();
+  try {
+    const allServices = await listServices(projectId);
 
-  return {
-    projectId: projectIdInput.trim(),
-    region: regionInput.trim() || 'europe-west1',
-    serviceId: serviceIdInput.trim(),
-  };
-}
+    if (!allServices || Object.keys(allServices).length === 0) {
+      assert.fail('No services found for the given project.');
+    }
 
-async function main() {
-  try {
-    const { projectId, region, serviceId } = await getServiceDetails();
+    const regions = Object.keys(allServices);
+    region = regions[0];
 
-    if (!projectId || !serviceId) {
-      console.error('Both Project ID and Service ID are required.');
-      process.exit(1);
+    if (!allServices[region] || allServices[region].length === 0) {
+      assert.fail(`No services found in region: ${region}`);
     }
 
-    console.log(
-      `\nFetching logs for service "${serviceId}" in project "${projectId}" (region: ${region})...`
-    );
+    const serviceName = allServices[region][0].name;
+    serviceId = serviceName.split('/').pop();
+    console.log(`Using region - ${region} and service ID - ${serviceId}`);
 
-    let requestOptions;
-    let pageCount = 0;
-    const MAX_PAGES = 3; // Limit the number of pages to avoid too much output
-
-    do {
-      const result = await getServiceLogs(
-        projectId,
-        region,
-        serviceId,
-        requestOptions
-      );
-
-      if (result.logs) {
-        console.log('\nLog entries:');
-        console.log(result.logs);
-      } else {
-        console.log('No logs found for this service.');
-      }
-
-      requestOptions = result.requestOptions;
-      pageCount++;
-
-      if (requestOptions && pageCount < MAX_PAGES) {
-        const rl = readline.createInterface({ input, output });
-        const answer = await rl.question('\nFetch more logs? (y/N): ');
-        rl.close();
-
-        if (answer.toLowerCase() !== 'y') {
-          break;
-        }
-      }
-    } while (requestOptions && pageCount < MAX_PAGES);
-
-    console.log('\nService logs test completed successfully.');
+    return { projectId, region, serviceId };
   } catch (error) {
-    console.error('Error during service logs test:', error.message);
-    process.exit(1);
+    // Better error handling for the API call itself
+    console.error('Error fetching services:', error.message);
+    throw error; // Re-throw the error to fail the test
   }
 }
 
-main();
+test('should list services', async () => {
+  const projectId = getProjectId();
+  const services = await listServices(projectId);
+  console.log('Services found:', services ? Object.keys(services) : 'None');
+  console.log('All Services', services);
+});
+
+test('should fetch service logs', async () => {
+  const { projectId, region, serviceId } = await getServiceDetails();
+
+  const result = await getServiceLogs(projectId, region, serviceId);
+
+  if (result.logs) {
+    console.log('\nLog entries:');
+    console.log(result.logs);
+  } else {
+    console.log('No logs found for this service.');
+  }
+});

package/test/need-gcp/deployer.test.js

@@ -0,0 +1,71 @@
+/*
+Copyright 2025 Google LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { describe, test } from 'node:test';
+import assert from 'node:assert';
+import { deploy, deployImage } from '../../lib/deployment/deployer.js';
+
+const projectId = process.env.GOOGLE_CLOUD_PROJECT || process.argv[2];
+if (!projectId) {
+  console.error('Usage: node <script> <projectId> or set GOOGLE_CLOUD_PROJECT');
+  process.exit(1);
+}
+
+describe('Cloud Run Deployments', () => {
+  test('should fail to deploy without a service name', async () => {
+    const config = {
+      projectId: projectId,
+      region: 'europe-west1',
+      files: ['example-sources-to-deploy/main.go'],
+    };
+    await assert.rejects(deploy(config), {
+      message: 'Error: serviceName is required in the configuration object.',
+    });
+  });
+
+  test('should fail to deploy image without a service name', async () => {
+    const config = {
+      projectId: projectId,
+      region: 'europe-west1',
+      imageUrl: 'gcr.io/cloudrun/hello',
+    };
+    await assert.rejects(deployImage(config), {
+      message: 'Error: serviceName is required in the configuration object.',
+    });
+  });
+
+  test('should fail to deploy without a project id', async () => {
+    const config = {
+      serviceName: 'hello-from-image',
+      region: 'europe-west1',
+      files: ['example-sources-to-deploy/main.go'],
+    };
+    await assert.rejects(deploy(config), {
+      message: 'Error: projectId is required in the configuration object.',
+    });
+  });
+
+  test('should fail to deploy image without a project id', async () => {
+    const config = {
+      serviceName: 'hello-from-image',
+      region: 'europe-west1',
+      imageUrl: 'gcr.io/cloudrun/hello',
+    };
+    await assert.rejects(deployImage(config), {
+      message: 'Error: projectId is required in the configuration object.',
+    });
+  });
+});

package/test/need-gcp/gcp-auth-check.test.js

@@ -17,7 +17,7 @@ limitations under the License.
 import assert from 'node:assert/strict';
 import { describe, it, mock, beforeEach, afterEach } from 'node:test';
 import { GoogleAuth } from 'google-auth-library';
-import { ensureGCPCredentials } from '../../lib/gcp-auth-check.js';
+import { ensureGCPCredentials } from '../../lib/cloud-api/auth.js';
 
 describe('ensureGCPCredentials', () => {
   let originalConsoleLog;