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

package/lib/cloud-api/projects.js

@@ -18,6 +18,7 @@ import {
   listBillingAccounts,
   attachProjectToBillingAccount,
 } from './billing.js';
+import { getProjectsClient } from '../clients.js';
 
 /**
  * Lists all accessible Google Cloud Platform projects.
@@ -26,8 +27,7 @@ import {
  * @returns {Promise<Array<{id: string}>>} A promise that resolves to an array of project objects, each with an 'id' property. Returns an empty array on error.
  */
 export async function listProjects() {
-  const { ProjectsClient } = await import('@google-cloud/resource-manager');
-  const client = new ProjectsClient();
+  const client = await getProjectsClient();
   try {
     const [projects] = await client.searchProjects();
     return projects.map((project) => ({
@@ -72,8 +72,7 @@ export function generateProjectId() {
  * @returns {Promise<{projectId: string}|null>} A promise that resolves to an object containing the new project's ID.
  */
 export async function createProject(projectId, parent) {
-  const { ProjectsClient } = await import('@google-cloud/resource-manager');
-  const client = new ProjectsClient();
+  const client = await getProjectsClient();
   let projectIdToUse = projectId;
 
   if (!projectIdToUse) {
@@ -173,8 +172,7 @@ export async function createProjectAndAttachBilling(projectIdParam, parent) {
  * @returns {Promise<void>} A promise that resolves when the delete operation is initiated.
  */
 export async function deleteProject(projectId) {
-  const { ProjectsClient } = await import('@google-cloud/resource-manager');
-  const client = new ProjectsClient();
+  const client = await getProjectsClient();
   try {
     console.log(`Attempting to delete project with ID: ${projectId}`);
     await client.deleteProject({ name: `projects/${projectId}` });

package/lib/cloud-api/registry.js

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { getArtifactRegistryClient } from '../clients.js';
 import { callWithRetry } from './helpers.js';
 import { logAndProgress } from '../util/helpers.js';
 
@@ -22,7 +23,6 @@ import { logAndProgress } from '../util/helpers.js';
  * If the repository does not exist, it attempts to create it with the specified format.
  *
  * @async
- * @param {object} context - The context object containing clients and other parameters.
  * @param {string} projectId - The Google Cloud project ID.
  * @param {string} location - The Google Cloud region for the repository.
  * @param {string} repositoryId - The ID for the Artifact Registry repository.
@@ -32,15 +32,15 @@ import { logAndProgress } from '../util/helpers.js';
  * @throws {Error} If there's an error checking or creating the repository.
  */
 export async function ensureArtifactRegistryRepoExists(
-  context,
   projectId,
   location,
   repositoryId,
   format = 'DOCKER',
   progressCallback
 ) {
+  const artifactRegistryClient = await getArtifactRegistryClient(projectId);
   const parent = `projects/${projectId}/locations/${location}`;
-  const repoPath = context.artifactRegistryClient.repositoryPath(
+  const repoPath = artifactRegistryClient.repositoryPath(
     projectId,
     location,
     repositoryId
@@ -48,7 +48,7 @@ export async function ensureArtifactRegistryRepoExists(
 
   try {
     const [repository] = await callWithRetry(
-      () => context.artifactRegistryClient.getRepository({ name: repoPath }),
+      () => artifactRegistryClient.getRepository({ name: repoPath }),
       `artifactRegistry.getRepository ${repositoryId}`
     );
     await logAndProgress(
@@ -68,7 +68,7 @@ export async function ensureArtifactRegistryRepoExists(
 
       const [operation] = await callWithRetry(
         () =>
-          context.artifactRegistryClient.createRepository({
+          artifactRegistryClient.createRepository({
             parent: parent,
             repository: repositoryToCreate,
             repositoryId: repositoryId,

package/lib/cloud-api/run.js

@@ -15,13 +15,14 @@ limitations under the License.
 */
 
 import protofiles from 'google-proto-files';
+import {
+  getRunClient,
+  getServiceUsageClient,
+  getLoggingClient,
+} from '../clients.js';
 import { callWithRetry, ensureApisEnabled } from './helpers.js';
 import { logAndProgress } from '../util/helpers.js';
 
-let runClient;
-let serviceUsageClient;
-let loggingClient;
-
 async function listCloudRunLocations(projectId) {
   const listLocationsRequest = {
     name: `projects/${projectId}`,
@@ -29,6 +30,7 @@ async function listCloudRunLocations(projectId) {
 
   const availableLocations = [];
   try {
+    const runClient = await getRunClient(projectId);
     console.log('Listing Cloud Run supported locations:');
     const iterable = runClient.listLocationsAsync(listLocationsRequest);
     for await (const location of iterable) {
@@ -50,18 +52,9 @@ async function listCloudRunLocations(projectId) {
  * @returns {Promise<object>} - A promise that resolves to an object mapping region to list of service objects in that region.
  */
 export async function listServices(projectId) {
-  if (!runClient) {
-    const { v2 } = await import('@google-cloud/run');
-    const { ServicesClient } = v2;
-    const { ServiceUsageClient } = await import('@google-cloud/service-usage');
-    runClient = new ServicesClient({ projectId });
-    serviceUsageClient = new ServiceUsageClient({ projectId });
-  }
-  const context = {
-    runClient: runClient,
-    serviceUsageClient: serviceUsageClient,
-  };
-  await ensureApisEnabled(context, projectId, ['run.googleapis.com']);
+  const runClient = await getRunClient(projectId);
+
+  await ensureApisEnabled(projectId, ['run.googleapis.com']);
   const locations = await listCloudRunLocations(projectId);
 
   const allServices = {};
@@ -93,11 +86,7 @@ export async function listServices(projectId) {
  * @returns {Promise<object>} - A promise that resolves to the service object.
  */
 export async function getService(projectId, location, serviceId) {
-  if (!runClient) {
-    const { v2 } = await import('@google-cloud/run');
-    const { ServicesClient } = v2;
-    runClient = new ServicesClient({ projectId });
-  }
+  const runClient = await getRunClient(projectId);
 
   const servicePath = runClient.servicePath(projectId, location, serviceId);
 
@@ -138,10 +127,7 @@ export async function getServiceLogs(
   serviceId,
   requestOptions
 ) {
-  if (!loggingClient) {
-    const { Logging } = await import('@google-cloud/logging');
-    loggingClient = new Logging({ projectId });
-  }
+  const loggingClient = await getLoggingClient(projectId);
 
   try {
     const LOG_SEVERITY = 'DEFAULT'; // e.g., 'DEFAULT', 'INFO', 'WARNING', 'ERROR'
@@ -237,21 +223,16 @@ function formatLogEntry(entry) {
  * @throws {Error} If there's an error checking the service (other than not found).
  */
 export async function checkCloudRunServiceExists(
-  context,
   projectId,
   location,
   serviceId,
   progressCallback
 ) {
-  const parent = context.runClient.locationPath(projectId, location);
-  const servicePath = context.runClient.servicePath(
-    projectId,
-    location,
-    serviceId
-  );
+  const runClient = await getRunClient(projectId);
+  const servicePath = runClient.servicePath(projectId, location, serviceId);
   try {
     await callWithRetry(
-      () => context.runClient.getService({ name: servicePath }),
+      () => runClient.getService({ name: servicePath }),
       `getService ${serviceId}`
     );
     await logAndProgress(

package/lib/cloud-api/storage.js

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { getStorageClient } from '../clients.js';
 import { callWithRetry } from './helpers.js';
 import { logAndProgress } from '../util/helpers.js';
 
@@ -22,7 +23,7 @@ import { logAndProgress } from '../util/helpers.js';
  * If the bucket does not exist, it attempts to create it in the specified location.
  *
  * @async
- * @param {object} context - The context object containing clients and other parameters.
+ * @param {string} projectId - The Google Cloud project ID.
  * @param {string} bucketName - The name of the storage bucket.
  * @param {string} [location='us'] - The location to create the bucket in if it doesn't exist. Defaults to 'us'.
  * @param {function(object): void} [progressCallback] - Optional callback for progress updates.
@@ -30,12 +31,13 @@ import { logAndProgress } from '../util/helpers.js';
  * @throws {Error} If there's an error checking or creating the bucket.
  */
 export async function ensureStorageBucketExists(
-  context,
+  projectId,
   bucketName,
   location = 'us',
   progressCallback
 ) {
-  const bucket = context.storage.bucket(bucketName);
+  const storage = await getStorageClient(projectId);
+  const bucket = storage.bucket(bucketName);
   try {
     const [exists] = await callWithRetry(
       () => bucket.exists(),
@@ -54,8 +56,7 @@ export async function ensureStorageBucketExists(
       );
       try {
         const [createdBucket] = await callWithRetry(
-          () =>
-            context.storage.createBucket(bucketName, { location: location }),
+          () => storage.createBucket(bucketName, { location: location }),
           `storage.createBucket ${bucketName}`
         );
         await logAndProgress(
@@ -85,7 +86,6 @@ export async function ensureStorageBucketExists(
  * Uploads a buffer to a specified Google Cloud Storage bucket and blob name.
  *
  * @async
- * @param {object} context - The context object containing clients and other parameters.
  * @param {import('@google-cloud/storage').Bucket} bucket - The Google Cloud Storage bucket object.
  * @param {Buffer} buffer - The buffer containing the data to upload.
  * @param {string} destinationBlobName - The name for the blob in the bucket.
@@ -94,7 +94,6 @@ export async function ensureStorageBucketExists(
  * @throws {Error} If the upload fails.
  */
 export async function uploadToStorageBucket(
-  context,
   bucket,
   buffer,
   destinationBlobName,

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