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

package/lib/gcp-auth-check.js

@@ -19,10 +19,9 @@ import { GoogleAuth } from 'google-auth-library';
 /**
  * Checks for the presence of properly setup Google Cloud Platform (GCP) authentication
  * using the official Google Auth Library for Node.js. If GCP auth is not found, it logs an
- * error message and exits the process, instructing the user on how to set them up.
- * This check is primarily for local/stdio environments where explicit setup is often needed.
+ * error message and returns false.
  * @async
- * @returns {Promise<void>} A promise that resolves if GCP auth are found, or rejects and exits the process if not.
+ * @returns {Promise<boolean>} A promise that resolves to true if GCP auth are found, and false otherwise.
  */
 export async function ensureGCPCredentials() {
   console.error('Checking for Google Cloud Application Default Credentials...');
@@ -35,6 +34,7 @@ export async function ensureGCPCredentials() {
     await client.getAccessToken();
 
     console.log('Application Default Credentials found.');
+    return true;
   } catch (error) {
     console.error(
       'ERROR: Google Cloud Application Default Credentials are not set up.'
@@ -74,6 +74,6 @@ export async function ensureGCPCredentials() {
     if (error.stack) {
       console.error('Error stack:', error.stack);
     }
-    // process.exit(1);
+    return false;
   }
 }

package/lib/gcp-projects.js

@@ -72,7 +72,7 @@ export async function createProject(projectId) {
   }
 
   try {
-    const projectPayload = { projectId: projectIdToUse, name: projectIdToUse };
+    const projectPayload = { projectId: projectIdToUse };
 
     console.log(`Attempting to create project with ID: ${projectIdToUse}`);
 

package/mcp-server.js

@@ -30,6 +30,7 @@ import { ensureGCPCredentials } from './lib/gcp-auth-check.js';
 import 'dotenv/config';
 
 const gcpInfo = await checkGCP();
+let gcpCredentialsAvailable = false;
 
 /**
  * Ensure that console.log and console.error are compatible with stdio.
@@ -52,7 +53,6 @@ function shouldStartStdio() {
 
 if (shouldStartStdio()) {
   makeLoggingCompatibleWithStdio();
-  await ensureGCPCredentials();
 }
 
 // Read default configurations from environment variables
@@ -88,6 +88,7 @@ async function getServer() {
       defaultRegion: effectiveRegion,
       defaultServiceName,
       skipIamCheck,
+      gcpCredentialsAvailable,
     });
   } else {
     console.log(
@@ -99,6 +100,7 @@ async function getServer() {
       defaultRegion: effectiveRegion,
       defaultServiceName,
       skipIamCheck,
+      gcpCredentialsAvailable,
     });
   }
 
@@ -110,13 +112,14 @@ async function getServer() {
 
 // stdio
 if (shouldStartStdio()) {
+  gcpCredentialsAvailable = await ensureGCPCredentials();
   const stdioTransport = new StdioServerTransport();
   const server = await getServer();
   await server.connect(stdioTransport);
   console.log('Cloud Run MCP server stdio transport connected');
 } else {
   console.log('Running on GCP, stdio transport will not be started.');
-  await ensureGCPCredentials();
+  gcpCredentialsAvailable = await ensureGCPCredentials();
   const app = express();
   app.use(express.json());
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google-cloud/cloud-run-mcp",
-  "version": "1.0.0",
+  "version": "1.3.0",
   "type": "module",
   "description": "Cloud Run MCP deployment tool",
   "main": "mcp-server.js",
@@ -9,14 +9,14 @@
   },
   "scripts": {
     "deploy": "gcloud run deploy cloud-run-mcp --source . --no-invoker-iam-check",
-    "test:deploy": "node test/test-deploy.js",
-    "test:create-project": "node test/test-create-project.js",
-    "test:service-logs": "node test/test-service-logs.js",
-    "test:gcp-auth": "node test/test-gcp-auth.js",
-    "test:prompts": "node --test test/test-prompts.js",
-    "test:mcp": "node --test test/test-mcp-server.js",
-    "test:tools": "node --test test/test-tools.js",
-    "test": "node test/run-all-tests.js",
+    "test:deploy": "node test/need-gcp/cloud-run-deploy.test.js",
+    "test:create-project": "node test/need-gcp/gcp-projects.test.js",
+    "test:service-logs": "node test/need-gcp/cloud-run-services.test.js",
+    "test:gcp-auth": "node test/need-gcp/gcp-auth-check.test.js",
+    "test:prompts": "node --test test/local/prompts.test.js",
+    "test:mcp": "node --test test/local/mcp-server.test.js",
+    "test:tools": "node --test test/local/tools.test.js",
+    "test": "node --test test/local/*.test.js",
     "mcp-inspector": "npx @modelcontextprotocol/inspector node mcp-server.js",
     "start": "node mcp-server.js",
     "lint:check": "prettier --check .",

package/test/local/gemini-extension.test.js

@@ -0,0 +1,35 @@
+import { test, describe } from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const rootDir = path.resolve(__dirname, '..', '..');
+const geminiExtensionJsonPath = path.resolve(rootDir, 'gemini-extension.json');
+
+describe('Gemini CLI extension', () => {
+  test('gemini-extension.json should be at the root', () => {
+    assert.ok(
+      fs.existsSync(geminiExtensionJsonPath),
+      'gemini-extension.json not found at the project root'
+    );
+  });
+
+  test('contextFileName from gemini-extension.json should exist', () => {
+    const geminiExtensionJson = JSON.parse(
+      fs.readFileSync(geminiExtensionJsonPath, 'utf-8')
+    );
+    const contextFileName = geminiExtensionJson.contextFileName;
+    assert.ok(
+      contextFileName,
+      'contextFileName not found in gemini-extension.json'
+    );
+    const contextFilePath = path.resolve(rootDir, contextFileName);
+    assert.ok(
+      fs.existsSync(contextFilePath),
+      `context file name '${contextFileName}' not found`
+    );
+  });
+});

package/test/local/npx.test.js

@@ -0,0 +1,36 @@
+import { test, describe } from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
+const mcpServerPath = path.resolve(__dirname, '..', '..', 'mcp-server.js');
+
+describe('The repository is properly structured to be executed using npx', () => {
+  test('package.json should be at the root', () => {
+    assert.ok(
+      fs.existsSync(packageJsonPath),
+      'package.json not found at the project root'
+    );
+  });
+
+  test('package.json should have a bin attribute for cloud-run-mcp', () => {
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+    assert.ok(packageJson.bin, 'bin attribute not found in package.json');
+    assert.ok(
+      packageJson.bin['cloud-run-mcp'],
+      'cloud-run-mcp not found in bin attribute'
+    );
+  });
+
+  test('mcp-server.js should start with #!/usr/bin/env node', () => {
+    const mcpServerContent = fs.readFileSync(mcpServerPath, 'utf-8');
+    assert.ok(
+      mcpServerContent.startsWith('#!/usr/bin/env node'),
+      'mcp-server.js does not start with #!/usr/bin/env node'
+    );
+  });
+});

package/test/{test-prompts.js → local/prompts.test.js}

@@ -16,7 +16,7 @@ limitations under the License.
 
 import assert from 'node:assert/strict';
 import { describe, it, mock } from 'node:test';
-import { registerPrompts } from '../prompts.js';
+import { registerPrompts } from '../../prompts.js';
 
 describe('registerPrompts', () => {
   it('should register deploy and logs prompts', () => {

package/test/{test-tools.js → local/tools.test.js}

@@ -8,7 +8,7 @@ describe('registerTools', () => {
       registerTool: mock.fn(),
     };
 
-    const { registerTools } = await esmock('../tools.js', {});
+    const { registerTools } = await esmock('../../tools.js', {});
 
     registerTools(server);
 
@@ -38,14 +38,14 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/gcp-projects.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/gcp-projects.js': {
           listProjects: () =>
             Promise.resolve([{ id: 'project1' }, { id: 'project2' }]),
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'list_projects'
@@ -69,8 +69,8 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/gcp-projects.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/gcp-projects.js': {
           createProjectAndAttachBilling: (projectId) =>
             Promise.resolve({
               projectId: projectId,
@@ -79,7 +79,7 @@ describe('registerTools', () => {
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'create_project'
@@ -101,8 +101,8 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/gcp-projects.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/gcp-projects.js': {
           createProjectAndAttachBilling: () =>
             Promise.resolve({
               projectId: 'generated-project',
@@ -111,7 +111,7 @@ describe('registerTools', () => {
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'create_project'
@@ -135,8 +135,8 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/cloud-run-services.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/cloud-run-services.js': {
           listServices: () =>
             Promise.resolve([
               { name: 'service1', uri: 'uri1' },
@@ -145,7 +145,7 @@ describe('registerTools', () => {
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'list_services'
@@ -172,8 +172,8 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/cloud-run-services.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/cloud-run-services.js': {
           getService: () =>
             Promise.resolve({
               name: 'my-service',
@@ -183,7 +183,7 @@ describe('registerTools', () => {
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'get_service'
@@ -223,13 +223,13 @@ describe('registerTools', () => {
         return Promise.resolve({ logs: 'log3\nlog4', requestOptions: null });
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/cloud-run-services.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/cloud-run-services.js': {
           getServiceLogs: getServiceLogs,
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'get_service_log'
@@ -257,13 +257,13 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/cloud-run-deploy.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/cloud-run-deploy.js': {
           deploy: () => Promise.resolve({ uri: 'my-uri' }),
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'deploy_local_files'
@@ -292,13 +292,13 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/cloud-run-deploy.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/cloud-run-deploy.js': {
           deploy: () => Promise.resolve({ uri: 'my-uri' }),
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'deploy_local_folder'
@@ -327,13 +327,13 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/cloud-run-deploy.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/cloud-run-deploy.js': {
           deploy: () => Promise.resolve({ uri: 'my-uri' }),
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'deploy_file_contents'
@@ -362,13 +362,13 @@ describe('registerTools', () => {
         registerTool: mock.fn(),
       };
 
-      const { registerTools } = await esmock('../tools.js', {
-        '../lib/cloud-run-deploy.js': {
+      const { registerTools } = await esmock('../../tools.js', {
+        '../../lib/cloud-run-deploy.js': {
           deployImage: () => Promise.resolve({ uri: 'my-uri' }),
         },
       });
 
-      registerTools(server);
+      registerTools(server, { gcpCredentialsAvailable: true });
 
       const handler = server.registerTool.mock.calls.find(
         (call) => call.arguments[0] === 'deploy_container_image'
@@ -390,4 +390,35 @@ describe('registerTools', () => {
       });
     });
   });
+
+  describe('when gcp credentials are not available', () => {
+    it('should return an error for all tools', async () => {
+      const server = {
+        registerTool: mock.fn(),
+      };
+
+      const { registerTools } = await esmock('../../tools.js', {});
+
+      registerTools(server, { gcpCredentialsAvailable: false });
+
+      const toolNames = server.registerTool.mock.calls.map(
+        (call) => call.arguments[0]
+      );
+
+      for (const toolName of toolNames) {
+        const handler = server.registerTool.mock.calls.find(
+          (call) => call.arguments[0] === toolName
+        ).arguments[2];
+        const result = await handler({});
+        assert.deepStrictEqual(result, {
+          content: [
+            {
+              type: 'text',
+              text: 'GCP credentials are not available. Please configure your environment.',
+            },
+          ],
+        });
+      }
+    });
+  });
 });

package/test/{test-deploy.js → need-gcp/cloud-run-deploy.test.js}

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { deploy, deployImage } from '../lib/cloud-run-deploy.js';
+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';

package/test/{test-service-logs.js → need-gcp/cloud-run-services.test.js}

@@ -16,7 +16,7 @@ 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 { getServiceLogs } from '../../lib/cloud-run-services.js';
 
 /**
  * Prompts the user for required service information