@google-cloud/cloud-run-mcp 1.3.0 → 1.5.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,7 +37,7 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
+  const { registerTools } = await esmock('../../tools/tools.js', {}, {
         '../../lib/gcp-projects.js': {
           listProjects: () =>
             Promise.resolve([{ id: 'project1' }, { id: 'project2' }]),
@@ -69,7 +68,7 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
+  const { registerTools } = await esmock('../../tools/tools.js', {}, {
         '../../lib/gcp-projects.js': {
           createProjectAndAttachBilling: (projectId) =>
             Promise.resolve({
@@ -101,7 +100,7 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
+  const { registerTools } = await esmock('../../tools/tools.js', {}, {
         '../../lib/gcp-projects.js': {
           createProjectAndAttachBilling: () =>
             Promise.resolve({
@@ -135,7 +134,7 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
+  const { registerTools } = await esmock('../../tools/tools.js', {}, {
         '../../lib/cloud-run-services.js': {
           listServices: () =>
             Promise.resolve([
@@ -172,7 +171,7 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
+  const { registerTools } = await esmock('../../tools/tools.js', {}, {
         '../../lib/cloud-run-services.js': {
           getService: () =>
             Promise.resolve({
@@ -223,7 +222,7 @@ describe('registerTools', () => {
         return Promise.resolve({ logs: 'log3\nlog4', requestOptions: null });
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
+  const { registerTools } = await esmock('../../tools/tools.js', {}, {
         '../../lib/cloud-run-services.js': {
           getServiceLogs: getServiceLogs,
         },
@@ -251,40 +250,7 @@ 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 () => {
@@ -292,7 +258,7 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
+  const { registerTools } = await esmock('../../tools/tools.js', {}, {
         '../../lib/cloud-run-deploy.js': {
           deploy: () => Promise.resolve({ uri: 'my-uri' }),
         },
@@ -303,12 +269,15 @@ describe('registerTools', () => {
       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,7 +296,7 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
+  const { registerTools } = await esmock('../../tools/tools.js', {}, {
         '../../lib/cloud-run-deploy.js': {
           deploy: () => Promise.resolve({ uri: 'my-uri' }),
         },
@@ -338,12 +307,15 @@ describe('registerTools', () => {
       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,7 +334,7 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../../tools.js', {
+  const { registerTools } = await esmock('../../tools/tools.js', {}, {
         '../../lib/cloud-run-deploy.js': {
           deployImage: () => Promise.resolve({ uri: 'my-uri' }),
         },
@@ -373,12 +345,15 @@ describe('registerTools', () => {
       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 +372,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-deploy.test.js

@@ -14,145 +14,111 @@ 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/cloud-run-deploy.js';
-import readline from 'readline/promises';
-import { stdin as input, stdout as output } from 'process';
 import fs from 'fs/promises';
 import path from 'path';
 
-/**
- * Gets the project ID from command line arguments or prompts the user.
- * If "new" is provided, it returns undefined to trigger new project creation.
- * @returns {Promise<string|undefined>} The Google Cloud project ID or undefined.
- */
-async function getProjectId() {
-  let projectIdInput = process.argv[2]; // Get the third element (index 2) which is the first argument
-
-  if (!projectIdInput) {
-    const rl = readline.createInterface({ input, output });
-    projectIdInput = await rl.question(
-      'Please enter your Google Cloud project ID: '
-    );
-    rl.close();
-  }
-
-  if (!projectIdInput || projectIdInput.trim() === '') {
-    console.error('No project ID provided. Exiting.');
-    process.exit(1);
-  }
-  if (projectIdInput.toLowerCase() === 'new') {
-    console.error(
-      'Project creation ("new") is now handled by test-create-project.js. Please provide an existing project ID. Exiting.'
-    );
-    process.exit(1);
-  }
-  console.log(`Using Project ID: ${projectIdInput}`);
-  return projectIdInput;
-}
-
-const projectIdToUse = await getProjectId();
-
-// Configuration for Go deployment with Dockerfile
-const configGoWithDockerfile = {
-  projectId: projectIdToUse, // Use the obtained project ID
-  serviceName: 'example-go-app-docker', // Name of the Cloud Run service
-  region: 'europe-west1', // Google Cloud region
-  files: [
-    'example-sources-to-deploy/main.go',
-    'example-sources-to-deploy/go.mod',
-    'example-sources-to-deploy/Dockerfile',
-  ],
-};
-
-// Configuration for Go deployment without Dockerfile (using buildpacks)
-const configGoWithoutDockerfile = {
-  projectId: projectIdToUse,
-  serviceName: 'example-go-app-buildpack',
-  region: 'europe-west1',
-  files: [
-    'example-sources-to-deploy/main.go',
-    'example-sources-to-deploy/go.mod',
-    // Dockerfile is intentionally omitted here
-  ],
-};
-
-// Configuration for Go deployment with file content (using buildpacks)
-const configGoWithContent = {
-  projectId: projectIdToUse,
-  serviceName: 'example-go-app-content',
-  region: 'europe-west1',
-  files: [], // To be populated with file content
-};
-
-// Configuration for a deployment that is expected to fail
-const configFailingBuild = {
-  projectId: projectIdToUse,
-  serviceName: 'example-failing-app',
-  region: 'europe-west1',
-  files: [
-    {
-      filename: 'main.txt',
-      content:
-        'This is not a valid application source file and should cause a build failure.',
-    },
-  ],
-};
-
-// Configuration for deploying a container image
-const configImageDeploy = {
-  projectId: projectIdToUse,
-  serviceName: 'hello-from-image',
-  region: 'europe-west1',
-  imageUrl: 'gcr.io/cloudrun/hello',
-};
-
-try {
-  console.log('\n--- Testing container image deployment ---');
-  await deployImage(configImageDeploy);
-  console.log('--- Container image deployment test completed ---');
-
-  console.log('\n--- Testing intentionally failing build ---');
-  try {
-    await deploy(configFailingBuild);
-    // If deploy doesn't throw an error, then the test has failed because it was expected to fail.
-    console.error(
-      'Deployment test failed: The build with invalid files succeeded when it was expected to fail.'
-    );
-    process.exit(1);
-  } catch (error) {
-    console.log('Intentionally failing build test completed as expected.');
-  }
-
-  console.log('--- Testing Go deployment with Dockerfile ---');
-  await deploy(configGoWithDockerfile);
-  console.log('--- Go deployment with Dockerfile test completed ---');
-
-  console.log(
-    '\n--- Testing Go deployment without Dockerfile (Buildpacks) ---'
-  );
-  await deploy(configGoWithoutDockerfile);
-  console.log(
-    '--- Go deployment without Dockerfile (Buildpacks) test completed ---'
-  );
-
-  console.log('\n--- Testing Go deployment with file content (Buildpacks) ---');
-  const mainGoContent = await fs.readFile(
-    path.resolve('example-sources-to-deploy/main.go'),
-    'utf-8'
-  );
-  const goModContent = await fs.readFile(
-    path.resolve('example-sources-to-deploy/go.mod'),
-    'utf-8'
-  );
-  configGoWithContent.files = [
-    { filename: 'main.go', content: mainGoContent },
-    { filename: 'go.mod', content: goModContent },
-  ];
-  await deploy(configGoWithContent);
-  console.log(
-    '--- Go deployment with file content (Buildpacks) test completed ---'
+const projectId = process.env.GOOGLE_CLOUD_PROJECT || process.argv[2];
+if (!projectId) {
+  console.error(
+    'Usage: node <script> <projectId> or set GOOGLE_CLOUD_PROJECT'
   );
-} catch (error) {
-  console.error('An unexpected error occurred in the test script:', error);
   process.exit(1);
 }
+
+describe('Cloud Run Deployments', () => {
+  test('should deploy a container image', async () => {
+    const configImageDeploy = {
+      projectId: projectId,
+      serviceName: 'hello-from-image',
+      region: 'europe-west1',
+      imageUrl: 'gcr.io/cloudrun/hello',
+    };
+    await deployImage(configImageDeploy);
+  });
+
+  test('should fail to deploy with invalid files', async () => {
+    const configFailingBuild = {
+      projectId: projectId,
+      serviceName: 'example-failing-app',
+      region: 'europe-west1',
+      files: [
+        {
+          filename: 'main.txt',
+          content:
+            'This is not a valid application source file and should cause a build failure.',
+        },
+      ],
+    };
+    await assert.rejects(deploy(configFailingBuild));
+  });
+
+  
+
+  test('should deploy a Go app with file content (Buildpacks)', async () => {
+    const mainGoContent = await fs.readFile(
+      path.resolve('example-sources-to-deploy/main.go'),
+      'utf-8'
+    );
+    const goModContent = await fs.readFile(
+      path.resolve('example-sources-to-deploy/go.mod'),
+      'utf-8'
+    );
+    const configGoWithContent = {
+      projectId: projectId,
+      serviceName: 'example-go-app-content',
+      region: 'europe-west1',
+      files: [
+        { filename: 'main.go', content: mainGoContent },
+        { filename: 'go.mod', content: goModContent },
+      ],
+    };
+    await deploy(configGoWithContent);
+  });
+
+  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/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 assert from 'node:assert';
+import {
+  getServiceLogs,
+  listServices,
+} from '../../lib/cloud-run-services.js';
 
 /**
- * Prompts the user for required service information
- * @returns {Promise<{projectId: string, region: string, serviceId: string}>} The service details
+ * 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 rl = readline.createInterface({ input, output });
+function getServiceDetails() {
+  const projectId = process.env.GOOGLE_CLOUD_PROJECT || process.argv[2];
+  const [, , arg1, arg2, arg3] = process.argv;
+
+  let region = 'europe-west1';
+  let serviceId;
+
+  if (process.env.GOOGLE_CLOUD_PROJECT) {
+    region = arg1 || 'europe-west1';
+    serviceId = arg2;
+  } else {
+    region = arg2 || 'europe-west1';
+    serviceId = arg3;
+  }
 
-  // Check command line arguments first
-  const [, , projectId, region = 'europe-west1', serviceId] = process.argv;
+  if (!projectId) {
+    console.error(
+      'Usage: node <script> <projectId> [region] [serviceId] or set GOOGLE_CLOUD_PROJECT'
+    );
+    process.exit(1);
+  }
 
-  if (projectId && serviceId) {
-    console.log(`Using command line arguments:
+  console.log(`Using:
 Project ID: ${projectId}
-Region: ${region}
-Service ID: ${serviceId}`);
-    rl.close();
-    return { projectId, region, serviceId };
+Region: ${region}`);
+  if (serviceId) {
+    console.log(`Service ID: ${serviceId}`);
   }
 
-  // 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: ');
+  return { projectId, region, serviceId };
+}
 
-  rl.close();
+const { projectId, region, serviceId } = getServiceDetails();
 
-  return {
-    projectId: projectIdInput.trim(),
-    region: regionInput.trim() || 'europe-west1',
-    serviceId: serviceIdInput.trim(),
-  };
-}
+test('should list services', async () => {
+  const services = await listServices(projectId, region);
+  assert(Array.isArray(services), 'services should be an array');
+  console.log('Services found:', services.length);
+});
 
-async function main() {
-  try {
-    const { projectId, region, serviceId } = await getServiceDetails();
+test('should fetch service logs', async () => {
+  if (!serviceId) {
+    console.log('Skipping service log test: no serviceId provided.');
+    return;
+  }
 
-    if (!projectId || !serviceId) {
-      console.error('Both Project ID and Service ID are required.');
-      process.exit(1);
-    }
+  console.log(
+    `
+Fetching logs for service "${serviceId}" in project "${projectId}" (region: ${region})...`
+  );
 
-    console.log(
-      `\nFetching logs for service "${serviceId}" in project "${projectId}" (region: ${region})...`
-    );
+  const result = await getServiceLogs(projectId, region, 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.');
-  } catch (error) {
-    console.error('Error during service logs test:', error.message);
-    process.exit(1);
+  if (result.logs) {
+    console.log('\nLog entries:');
+    console.log(result.logs);
+  } else {
+    console.log('No logs found for this service.');
   }
-}
+});
+
 
-main();