@google-cloud/cloud-run-mcp 1.10.0 → 1.11.0

package/test/need-gcp/workflows/deployment-workflows.test.js

@@ -26,6 +26,27 @@ import {
   setupProject,
 } from '../test-helpers.js';
 
+const GCP_REGION = 'asia-southeast1';
+const RUN_INGRESS_POLICY = process.env.RUN_INGRESS_POLICY || undefined;
+const ZIP_DEPLOY_SUCCESS_MESSAGE =
+  'Deployment completed successfully with zip deploy';
+const SOURCE_BUILD_DEPLOY_SUCCESS_MESSAGE =
+  'Deployment completed successfully with source build deploy';
+
+async function assertDeploymentSuccess(config, expectedMessage) {
+  let successMessage = '';
+  config.progressCallback = (p) => {
+    if (p.data === expectedMessage) {
+      successMessage = p.data;
+    }
+  };
+  if (RUN_INGRESS_POLICY) {
+    config.ingress = RUN_INGRESS_POLICY;
+  }
+  await deploy(config);
+  assert.strictEqual(successMessage, expectedMessage);
+}
+
 describe('Deployment workflows', () => {
   let projectId;
 
@@ -33,6 +54,8 @@ describe('Deployment workflows', () => {
     try {
       projectId = await setupProject();
       await setSourceDeployProjectPermissions(projectId);
+      console.log('Waiting 2 minutes for IAM propagation...');
+      await new Promise((resolve) => setTimeout(resolve, 120000));
     } catch (err) {
       console.error('Error during project creation and setup:', err);
       throw err;
@@ -43,9 +66,12 @@ describe('Deployment workflows', () => {
     const configImageDeploy = {
       projectId: projectId,
       serviceName: 'hello-scenario',
-      region: 'us-central1',
+      region: GCP_REGION,
       imageUrl: 'gcr.io/cloudrun/hello',
     };
+    if (RUN_INGRESS_POLICY) {
+      configImageDeploy.ingress = RUN_INGRESS_POLICY;
+    }
     await deployImage(configImageDeploy);
 
     console.log('Scenario-1: Deployment completed.');
@@ -55,7 +81,7 @@ describe('Deployment workflows', () => {
     const configFailingBuild = {
       projectId: projectId,
       serviceName: 'example-failing-app',
-      region: 'us-central1',
+      region: GCP_REGION,
       files: [
         {
           filename: 'main.txt',
@@ -64,6 +90,9 @@ describe('Deployment workflows', () => {
         },
       ],
     };
+    if (RUN_INGRESS_POLICY) {
+      configFailingBuild.ingress = RUN_INGRESS_POLICY;
+    }
     await assert.rejects(
       deploy(configFailingBuild),
       { message: /ERROR: failed to detect: no buildpacks participating/ },
@@ -73,26 +102,163 @@ describe('Deployment workflows', () => {
 
   test('Scenario-3: Starting deployment of Go app with file content...', async () => {
     const mainGoContent = await fs.readFile(
-      path.resolve('example-sources-to-deploy/main.go'),
+      path.resolve('example-sources-to-deploy/golang/main.go'),
       'utf-8'
     );
     const goModContent = await fs.readFile(
-      path.resolve('example-sources-to-deploy/go.mod'),
+      path.resolve('example-sources-to-deploy/golang/go.mod'),
       'utf-8'
     );
     const configGoWithContent = {
       projectId: projectId,
       serviceName: 'example-go-app-content',
-      region: 'us-central1',
+      region: GCP_REGION,
       files: [
         { filename: 'main.go', content: mainGoContent },
         { filename: 'go.mod', content: goModContent },
       ],
     };
-    await deploy(configGoWithContent);
+    await assertDeploymentSuccess(
+      configGoWithContent,
+      SOURCE_BUILD_DEPLOY_SUCCESS_MESSAGE
+    );
     console.log('Scenario-3: Deployment completed.');
   });
 
+  test('Scenario-4: Starting deployment of pip-based Python app with folder path... uses zip deploy', async () => {
+    const configPipProject = {
+      projectId: projectId,
+      serviceName: 'example-pip-project-folder-path',
+      region: GCP_REGION,
+      files: ['example-sources-to-deploy/python/pip-project'],
+    };
+    await assertDeploymentSuccess(configPipProject, ZIP_DEPLOY_SUCCESS_MESSAGE);
+    console.log('Scenario-4: Deployment completed.');
+  });
+
+  test('Scenario-5: Starting deployment of pip-based Python app with file-based content... uses source build deploy', async () => {
+    const mainPyContent = await fs.readFile(
+      path.resolve('example-sources-to-deploy/python/pip-project/main.py'),
+      'utf-8'
+    );
+    const requirementsTxtContent = await fs.readFile(
+      path.resolve(
+        'example-sources-to-deploy/python/pip-project/requirements.txt'
+      ),
+      'utf-8'
+    );
+    const configPipProject = {
+      projectId: projectId,
+      serviceName: 'example-pip-project-file-content',
+      region: GCP_REGION,
+      files: [
+        { filename: 'main.py', content: mainPyContent },
+        { filename: 'requirements.txt', content: requirementsTxtContent },
+      ],
+    };
+    await assertDeploymentSuccess(
+      configPipProject,
+      SOURCE_BUILD_DEPLOY_SUCCESS_MESSAGE
+    );
+    console.log('Scenario-5: Deployment completed.');
+  });
+
+  test('Scenario-6: Starting deployment of pyproject-based Python app with folder path... uses zip deploy', async () => {
+    const configPyprojectProject = {
+      projectId: projectId,
+      serviceName: 'example-pyproject-project-folder-path',
+      region: GCP_REGION,
+      files: ['example-sources-to-deploy/python/pyproject-project'],
+    };
+    await assertDeploymentSuccess(
+      configPyprojectProject,
+      ZIP_DEPLOY_SUCCESS_MESSAGE
+    );
+    console.log('Scenario-6: Deployment completed.');
+  });
+
+  test('Scenario-7: Starting deployment of pyproject-based Python app with file-based content... uses source build deploy', async () => {
+    const mainPyContent = await fs.readFile(
+      path.resolve(
+        'example-sources-to-deploy/python/pyproject-project/main.py'
+      ),
+      'utf-8'
+    );
+    const pyprojectContent = await fs.readFile(
+      path.resolve(
+        'example-sources-to-deploy/python/pyproject-project/pyproject.toml'
+      ),
+      'utf-8'
+    );
+    const configPyprojectProject = {
+      projectId: projectId,
+      serviceName: 'example-pyproject-project-file-content',
+      region: GCP_REGION,
+      files: [
+        { filename: 'main.py', content: mainPyContent },
+        { filename: 'pyproject.toml', content: pyprojectContent },
+      ],
+    };
+    await assertDeploymentSuccess(
+      configPyprojectProject,
+      SOURCE_BUILD_DEPLOY_SUCCESS_MESSAGE
+    );
+    console.log('Scenario-7: Deployment completed.');
+  });
+
+  test('Scenario-8: Starting deployment of Node.js app with folder path... uses zip deploy', async () => {
+    const configNodeProject = {
+      projectId: projectId,
+      serviceName: 'example-node-project-folder-path',
+      region: GCP_REGION,
+      files: ['example-sources-to-deploy/nodejs'],
+    };
+    await assertDeploymentSuccess(
+      configNodeProject,
+      ZIP_DEPLOY_SUCCESS_MESSAGE
+    );
+    console.log('Scenario-8: Deployment completed.');
+  });
+
+  test('Scenario-9: Starting deployment of Node.js app with file content... uses build deploy', async () => {
+    const packageJsonContent = await fs.readFile(
+      path.resolve('example-sources-to-deploy/nodejs/package.json'),
+      'utf-8'
+    );
+    const indexJsContent = await fs.readFile(
+      path.resolve('example-sources-to-deploy/nodejs/index.js'),
+      'utf-8'
+    );
+    const configNodeWithContent = {
+      projectId: projectId,
+      serviceName: 'example-node-project-file-content',
+      region: GCP_REGION,
+      files: [
+        { filename: 'package.json', content: packageJsonContent },
+        { filename: 'index.js', content: indexJsContent },
+      ],
+    };
+    await assertDeploymentSuccess(
+      configNodeWithContent,
+      SOURCE_BUILD_DEPLOY_SUCCESS_MESSAGE
+    );
+    console.log('Scenario-9: Deployment completed.');
+  });
+
+  test('Scenario-10: Starting deployment of Java app with folder path... uses source build deploy', async () => {
+    const configJavaProject = {
+      projectId: projectId,
+      serviceName: 'example-java-project-folder-path',
+      region: GCP_REGION,
+      files: ['example-sources-to-deploy/java'],
+    };
+    await assertDeploymentSuccess(
+      configJavaProject,
+      SOURCE_BUILD_DEPLOY_SUCCESS_MESSAGE
+    );
+    console.log('Scenario-10: Deployment completed.');
+  });
+
   after(async () => {
     // Clean up: delete the project created for tests
     cleanupProject(projectId);

package/tools/register-tools.js

@@ -241,11 +241,21 @@ function registerGetServiceTool(server, options) {
             options.accessToken
           );
           if (serviceDetails) {
+            // Format last deployment date, handling both Protobuf Timestamp (with
+            // seconds as string or number) and standard Date/ISO strings.
+            const lastDeployedDate = serviceDetails.updateTime
+              ? new Date(
+                  serviceDetails.updateTime.seconds
+                    ? Number(serviceDetails.updateTime.seconds) * 1000
+                    : serviceDetails.updateTime
+                ).toUTCString()
+              : 'N/A';
+            const consoleUrl = `https://console.cloud.google.com/run/detail/${region}/${service}?project=${project}`;
             return {
               content: [
                 {
                   type: 'text',
-                  text: `Name: ${service}\nRegion: ${region}\nProject: ${project}\nURL: ${serviceDetails.uri}\nLast deployed by: ${serviceDetails.lastModifier}`,
+                  text: `Name: ${service}\nRegion: ${region}\nProject: ${project}\nURL: ${serviceDetails.uri}\nConsole URL: ${consoleUrl}\nLast deployed by: ${serviceDetails.lastModifier}\nLast deployed date: ${lastDeployedDate}`,
                 },
               ],
             };
@@ -366,7 +376,9 @@ function registerDeployLocalFolderTool(server, options) {
           .string()
           .optional()
           .default(options.defaultServiceName)
-          .describe('Name of the Cloud Run service to deploy to'),
+          .describe(
+            'Name of the Cloud Run service to deploy to. If not provided, it will be inferred.'
+          ),
         folderPath: z
           .string()
           .describe(
@@ -405,13 +417,15 @@ function registerDeployLocalFolderTool(server, options) {
             files: [folderPath],
             skipIamCheck: options.skipIamCheck, // Pass the new flag
             accessToken: options.accessToken,
+            ingress: options.ingress,
             progressCallback,
           });
+          const serviceName = service || response.service;
           return {
             content: [
               {
                 type: 'text',
-                text: `Cloud Run service ${service} deployed from folder ${folderPath} in project ${project}\nCloud Console: https://console.cloud.google.com/run/detail/${region}/${service}?project=${project}\nService URL: ${response.uri}`,
+                text: `Cloud Run service ${serviceName} deployed from folder ${folderPath} in project ${project}\nCloud Console: https://console.cloud.google.com/run/detail/${region}/${serviceName}?project=${project}\nService URL: ${response.uri}`,
               },
             ],
           };
@@ -507,6 +521,7 @@ function registerDeployFileContentsTool(server, options) {
             files: files,
             skipIamCheck: options.skipIamCheck, // Pass the new flag
             accessToken: options.accessToken,
+            ingress: options.ingress,
             progressCallback,
           });
           return {
@@ -588,6 +603,7 @@ function registerDeployContainerImageTool(server, options) {
             imageUrl: imageUrl,
             skipIamCheck: options.skipIamCheck,
             accessToken: options.accessToken,
+            ingress: options.ingress,
             progressCallback,
           });
           return {