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

package/lib/cloud-api/helpers.js

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { getServiceUsageClient } from '../clients.js';
 import { ensureBillingEnabled } from './billing.js';
 
 const PREREQUISITE_APIS = [
@@ -93,7 +94,6 @@ 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.
@@ -101,11 +101,15 @@ async function checkAndEnableApi(
  * @throws {Error} If the API fails to enable or if there's an issue checking its status.
  */
 export async function enableApiWithRetry(
-  serviceUsageClient,
   projectId,
   api,
+  accessToken,
   progressCallback
 ) {
+  const serviceUsageClient = await getServiceUsageClient(
+    projectId,
+    accessToken
+  );
   const serviceName = `projects/${projectId}/services/${api}`;
   try {
     await checkAndEnableApi(
@@ -145,7 +149,6 @@ export async function enableApiWithRetry(
  * Throws an error if an API cannot be enabled.
  *
  * @async
- * @param {object} context - The context object containing clients and other parameters.
  * @param {string} projectId - The Google Cloud project ID.
  * @param {string[]} apis - An array of API identifiers to check and enable (e.g., 'run.googleapis.com').
  * @param {function(string, string=): void} progressCallback - A function to call with progress updates.
@@ -154,34 +157,24 @@ export async function enableApiWithRetry(
  * @returns {Promise<void>} A promise that resolves when all specified APIs are enabled.
  */
 export async function ensureApisEnabled(
-  context,
   projectId,
   apis,
+  accessToken,
   progressCallback
 ) {
   for (const api of PREREQUISITE_APIS) {
-    await enableApiWithRetry(
-      context.serviceUsageClient,
-      projectId,
-      api,
-      progressCallback
-    );
+    await enableApiWithRetry(projectId, api, accessToken, progressCallback);
   }
 
   // Before enabling other APIs, ensure billing is enabled.
-  await ensureBillingEnabled(context, projectId, progressCallback);
+  await ensureBillingEnabled(projectId, accessToken, progressCallback);
 
   const message = 'Checking and enabling required APIs...';
   console.log(message);
   if (progressCallback) progressCallback({ level: 'info', data: message });
 
   for (const api of apis) {
-    await enableApiWithRetry(
-      context.serviceUsageClient,
-      projectId,
-      api,
-      progressCallback
-    );
+    await enableApiWithRetry(projectId, api, accessToken, progressCallback);
   }
   const successMsg = 'All required APIs are enabled.';
   console.log(successMsg);

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.
@@ -25,9 +26,8 @@ import {
  * @function listProjects
  * @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();
+export async function listProjects(accessToken) {
+  const client = await getProjectsClient(accessToken);
   try {
     const [projects] = await client.searchProjects();
     return projects.map((project) => ({
@@ -71,9 +71,8 @@ export function generateProjectId() {
  * @param {string} [parent] - Optional. The resource name of the parent under which the project is to be created. e.g., "organizations/123" or "folders/456".
  * @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();
+export async function createProject(projectId, parent, accessToken) {
+  const client = await getProjectsClient(accessToken);
   let projectIdToUse = projectId;
 
   if (!projectIdToUse) {
@@ -113,10 +112,14 @@ export async function createProject(projectId, parent) {
  * @param {string} [parent] - Optional. The resource name of the parent under which the project is to be created. e.g., "organizations/123" or "folders/456".
  * @returns {Promise<{projectId: string, billingMessage: string}>} A promise that resolves to an object containing the project ID and a billing status message.
  */
-export async function createProjectAndAttachBilling(projectIdParam, parent) {
+export async function createProjectAndAttachBilling(
+  projectIdParam,
+  parent,
+  accessToken
+) {
   let newProject;
   try {
-    newProject = await createProject(projectIdParam, parent);
+    newProject = await createProject(projectIdParam, parent, accessToken);
   } catch (error) {
     throw new Error(`Failed to create project: ${error.message}`);
   }
@@ -129,7 +132,7 @@ export async function createProjectAndAttachBilling(projectIdParam, parent) {
   let billingMessage = `Project ${projectId} created successfully.`;
 
   try {
-    const billingAccounts = await listBillingAccounts();
+    const billingAccounts = await listBillingAccounts(accessToken);
     if (billingAccounts && billingAccounts.length > 0) {
       const firstBillingAccount = billingAccounts.find((acc) => acc.open); // Prefer an open account
       if (firstBillingAccount) {
@@ -138,7 +141,8 @@ export async function createProjectAndAttachBilling(projectIdParam, parent) {
         );
         const billingInfo = await attachProjectToBillingAccount(
           projectId,
-          firstBillingAccount.name
+          firstBillingAccount.name,
+          accessToken
         );
         if (billingInfo && billingInfo.billingEnabled) {
           billingMessage += ` It has been attached to billing account ${firstBillingAccount.displayName}.`;
@@ -172,9 +176,8 @@ export async function createProjectAndAttachBilling(projectIdParam, parent) {
  * @param {string} projectId - The ID of the project to delete.
  * @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();
+export async function deleteProject(projectId, accessToken) {
+  const client = await getProjectsClient(accessToken);
   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,19 @@ import { logAndProgress } from '../util/helpers.js';
  * @throws {Error} If there's an error checking or creating the repository.
  */
 export async function ensureArtifactRegistryRepoExists(
-  context,
   projectId,
+  accessToken,
   location,
   repositoryId,
   format = 'DOCKER',
   progressCallback
 ) {
+  const artifactRegistryClient = await getArtifactRegistryClient(
+    projectId,
+    accessToken
+  );
   const parent = `projects/${projectId}/locations/${location}`;
-  const repoPath = context.artifactRegistryClient.repositoryPath(
+  const repoPath = artifactRegistryClient.repositoryPath(
     projectId,
     location,
     repositoryId
@@ -48,7 +52,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 +72,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,20 +15,22 @@ 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) {
+async function listCloudRunLocations(projectId, accessToken) {
   const listLocationsRequest = {
     name: `projects/${projectId}`,
   };
 
   const availableLocations = [];
   try {
+    const runClient = await getRunClient(projectId, accessToken);
     console.log('Listing Cloud Run supported locations:');
     const iterable = runClient.listLocationsAsync(listLocationsRequest);
     for await (const location of iterable) {
@@ -49,20 +51,11 @@ async function listCloudRunLocations(projectId) {
  * @param {string} projectId - The Google Cloud project ID.
  * @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 locations = await listCloudRunLocations(projectId);
+export async function listServices(projectId, accessToken) {
+  const runClient = await getRunClient(projectId, accessToken);
+
+  await ensureApisEnabled(projectId, ['run.googleapis.com'], accessToken);
+  const locations = await listCloudRunLocations(projectId, accessToken);
 
   const allServices = {};
   for (const location of locations) {
@@ -92,12 +85,8 @@ export async function listServices(projectId) {
  * @param {string} serviceId - The ID of the Cloud Run service.
  * @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 });
-  }
+export async function getService(projectId, location, serviceId, accessToken) {
+  const runClient = await getRunClient(projectId, accessToken);
 
   const servicePath = runClient.servicePath(projectId, location, serviceId);
 
@@ -136,13 +125,10 @@ export async function getServiceLogs(
   projectId,
   location,
   serviceId,
+  accessToken,
   requestOptions
 ) {
-  if (!loggingClient) {
-    const { Logging } = await import('@google-cloud/logging');
-    loggingClient = new Logging({ projectId });
-  }
-
+  const loggingClient = await getLoggingClient(projectId, accessToken);
   try {
     const LOG_SEVERITY = 'DEFAULT'; // e.g., 'DEFAULT', 'INFO', 'WARNING', 'ERROR'
     const PAGE_SIZE = 100; // Number of log entries to retrieve per page
@@ -237,21 +223,17 @@ 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,
+  accessToken,
   progressCallback
 ) {
-  const parent = context.runClient.locationPath(projectId, location);
-  const servicePath = context.runClient.servicePath(
-    projectId,
-    location,
-    serviceId
-  );
+  const runClient = await getRunClient(projectId, accessToken);
+  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,14 @@ 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',
+  accessToken,
   progressCallback
 ) {
-  const bucket = context.storage.bucket(bucketName);
+  const storage = await getStorageClient(projectId, accessToken);
+  const bucket = storage.bucket(bucketName);
   try {
     const [exists] = await callWithRetry(
       () => bucket.exists(),
@@ -54,8 +57,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 +87,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 +95,6 @@ export async function ensureStorageBucketExists(
  * @throws {Error} If the upload fails.
  */
 export async function uploadToStorageBucket(
-  context,
   bucket,
   buffer,
   destinationBlobName,