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

package/.github/workflows/npm-publish.yml

@@ -2,7 +2,7 @@ name: Publish to npm
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   publish-npm:

package/CONTRIBUTING.md

@@ -126,7 +126,7 @@ This script requires an existing Google Cloud Project ID to be provided when pro
 
 ## Publishing to npm
 
-To update the [npm package]https://www.npmjs.com/package/@google-cloud/cloud-run-mcp)
+To update the [npm package](https://www.npmjs.com/package/@google-cloud/cloud-run-mcp)
 
 Run the following:
 

package/lib/cloud-api/billing.js

@@ -96,3 +96,88 @@ export async function attachProjectToBillingAccount(
     return null;
   }
 }
+
+/**
+ * Checks if billing is enabled for a given project.
+ * @async
+ * @function isBillingEnabled
+ * @param {string} projectId - The ID of the project to check.
+ * @returns {Promise<boolean>} A promise that resolves to true if billing is enabled, false otherwise.
+ */
+export async function isBillingEnabled(projectId) {
+  const { CloudBillingClient } = await import('@google-cloud/billing');
+  const client = new CloudBillingClient();
+  const projectName = `projects/${projectId}`;
+  try {
+    // getProjectBillingInfo requires cloudbilling.googleapis.com API to check billing status
+    // https://docs.cloud.google.com/billing/docs/reference/rest/v1/projects/getBillingInfo
+    const [billingInfo] = await client.getProjectBillingInfo({
+      name: projectName,
+    });
+    return billingInfo.billingEnabled;
+  } catch (error) {
+    console.error(
+      `Error checking billing status for project ${projectId}:`,
+      error.message || error
+    );
+    return false;
+  }
+}
+
+/**
+ * Ensures billing is enabled for a project. If not, attempts to enable it
+ * by attaching the single open billing account if one is found.
+ * @param {object} context - The context object containing clients and other parameters.
+ * @param {string} projectId The project ID to check billing for.
+ * @param {function} progressCallback A callback function for progress updates.
+ */
+export async function ensureBillingEnabled(
+  context,
+  projectId,
+  progressCallback
+) {
+  if (!(await isBillingEnabled(projectId))) {
+    // Billing is disabled, try to fix it.
+    const accounts = await listBillingAccounts();
+
+    if (accounts && accounts.length === 1 && accounts[0].open) {
+      // Exactly one open account found, try to attach it.
+      const account = accounts[0];
+      const attemptMessage = `Billing is not enabled for project ${projectId}. Found one open billing account: ${account.displayName} (${account.name}). Attempting to attach it...`;
+      console.log(attemptMessage);
+      if (progressCallback)
+        progressCallback({ level: 'info', data: attemptMessage });
+
+      const attachmentResult = await attachProjectToBillingAccount(
+        projectId,
+        account.name
+      );
+
+      if (!attachmentResult || !attachmentResult.billingEnabled) {
+        const attachFailMessage = `Failed to automatically attach project ${projectId} to billing account ${account.name}. Please enable billing manually: https://console.cloud.google.com/billing/linkedaccount?project=${projectId}`;
+        if (progressCallback)
+          progressCallback({ level: 'error', data: attachFailMessage });
+        throw new Error(attachFailMessage);
+      }
+      const attachSuccessMessage = `Successfully attached project ${projectId} to billing account ${account.name}.`;
+      console.log(attachSuccessMessage);
+      if (progressCallback)
+        progressCallback({ level: 'info', data: attachSuccessMessage });
+      // If we get here, billing is now enabled, and we can proceed to API checks.
+    } else {
+      // Cannot auto-attach. Throw error.
+      let reason;
+      if (!accounts || accounts.length === 0) {
+        reason = 'no billing accounts were found';
+      } else if (accounts.length > 1) {
+        reason = 'multiple billing accounts were found';
+      } else {
+        reason = `the only available billing account '${accounts[0].displayName}' is not open`;
+      }
+      const errorMessage = `Billing is not enabled for project ${projectId}, and it could not be enabled automatically because ${reason}. Please enable billing to use Google Cloud services: https://console.cloud.google.com/billing/linkedaccount?project=${projectId}`;
+      if (progressCallback)
+        progressCallback({ level: 'error', data: errorMessage });
+      throw new Error(errorMessage);
+    }
+  }
+}

package/lib/cloud-api/helpers.js

@@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { ensureBillingEnabled } from './billing.js';
+
+const PREREQUISITE_APIS = [
+  'serviceusage.googleapis.com',
+  'cloudbilling.googleapis.com',
+];
+
 /**
  * Calls a function with retry logic for GCP API calls.
  * Retries on gRPC error code 7 (PERMISSION_DENIED).
@@ -84,6 +91,54 @@ async function checkAndEnableApi(
   }
 }
 
+/**
+ * Enables a single Google Cloud API with retry logic.
+ * @param {object} serviceUsageClient - The Service Usage client.
+ * @param {string} projectId - The Google Cloud project ID.
+ * @param {string} api - The API identifier (e.g., 'run.googleapis.com').
+ * @param {function(string, string=): void} progressCallback - A function to call with progress updates.
+ * @returns {Promise<void>} A promise that resolves when the API is enabled.
+ * @throws {Error} If the API fails to enable or if there's an issue checking its status.
+ */
+export async function enableApiWithRetry(
+  serviceUsageClient,
+  projectId,
+  api,
+  progressCallback
+) {
+  const serviceName = `projects/${projectId}/services/${api}`;
+  try {
+    await checkAndEnableApi(
+      serviceUsageClient,
+      serviceName,
+      api,
+      progressCallback
+    );
+  } catch (error) {
+    // First attempt failed, log a warning and retry once after a delay.
+    const warnMsg = `Failed to check/enable ${api}, retrying in 1s...`;
+    console.warn(warnMsg);
+    if (progressCallback) progressCallback({ level: 'warn', data: warnMsg });
+
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+    try {
+      await checkAndEnableApi(
+        serviceUsageClient,
+        serviceName,
+        api,
+        progressCallback
+      );
+    } catch (retryError) {
+      // If the retry also fails, throw an error.
+      const errorMessage = `Failed to ensure API [${api}] is enabled after retry. Please check manually.`;
+      console.error(errorMessage, retryError);
+      if (progressCallback)
+        progressCallback({ level: 'error', data: errorMessage });
+      throw new Error(errorMessage);
+    }
+  }
+}
+
 /**
  * Ensures that the specified Google Cloud APIs are enabled for the given project.
  * If an API is not enabled, it attempts to enable it.  Retries any failure once after 1s.
@@ -104,42 +159,29 @@ export async function ensureApisEnabled(
   apis,
   progressCallback
 ) {
+  for (const api of PREREQUISITE_APIS) {
+    await enableApiWithRetry(
+      context.serviceUsageClient,
+      projectId,
+      api,
+      progressCallback
+    );
+  }
+
+  // Before enabling other APIs, ensure billing is enabled.
+  await ensureBillingEnabled(context, projectId, progressCallback);
+
   const message = 'Checking and enabling required APIs...';
   console.log(message);
   if (progressCallback) progressCallback({ level: 'info', data: message });
 
   for (const api of apis) {
-    const serviceName = `projects/${projectId}/services/${api}`;
-    try {
-      await checkAndEnableApi(
-        context.serviceUsageClient,
-        serviceName,
-        api,
-        progressCallback
-      );
-    } catch (error) {
-      // First attempt failed, log a warning and retry once after a delay.
-      const warnMsg = `Failed to check/enable ${api}, retrying in 1s...`;
-      console.warn(warnMsg);
-      if (progressCallback) progressCallback({ level: 'warn', data: warnMsg });
-
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-      try {
-        await checkAndEnableApi(
-          context.serviceUsageClient,
-          serviceName,
-          api,
-          progressCallback
-        );
-      } catch (retryError) {
-        // If the retry also fails, throw an error.
-        const errorMessage = `Failed to ensure API [${api}] is enabled after retry. Please check manually.`;
-        console.error(errorMessage, retryError);
-        if (progressCallback)
-          progressCallback({ level: 'error', data: errorMessage });
-        throw new Error(errorMessage);
-      }
-    }
+    await enableApiWithRetry(
+      context.serviceUsageClient,
+      projectId,
+      api,
+      progressCallback
+    );
   }
   const successMsg = 'All required APIs are enabled.';
   console.log(successMsg);

package/lib/deployment/constants.js

@@ -0,0 +1,54 @@
+/*
+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.
+*/
+
+export const DEPLOYMENT_CONFIG = {
+  REPO_NAME: 'mcp-cloud-run-deployments',
+  ZIP_FILE_NAME: 'source.zip',
+  TARGZ_FILE_NAME: 'source.tar.gz',
+  IMAGE_TAG: 'latest',
+  LABEL_CREATED_BY: 'cloud-run-mcp',
+  DEFAULT_NODE_BASE_IMAGE: 'nodejs22',
+  NO_BUILD_IMAGE_TYPE: 'scratch',
+};
+
+export const TEMP_PATHS = {
+  BASE: '.cloud-run-mcp',
+  SUBDIR: 'source',
+};
+
+export const REQUIRED_APIS = {
+  SOURCE_DEPLOY: [
+    'serviceusage.googleapis.com',
+    'iam.googleapis.com',
+    'storage.googleapis.com',
+    'cloudbuild.googleapis.com',
+    'artifactregistry.googleapis.com',
+    'run.googleapis.com',
+  ],
+  IMAGE_DEPLOY: ['serviceusage.googleapis.com', 'run.googleapis.com'],
+};
+
+export const DEPLOYMENT_TYPES = {
+  NO_BUILD: 'no-build',
+  IMAGE: 'image',
+  WITH_BUILD: 'with-build',
+};
+
+export const RUNTIMES = {
+  NODEJS: 'nodejs',
+};
+
+export const MAX_ALLOWED_DIRECT_SOURCE_SIZE_BYTES = 250 * 1024 * 1024; // 250 MiB