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

package/test/local/cloud-api/build.test.js

@@ -32,6 +32,7 @@ describe('triggerCloudBuild', () => {
   let servicePathMock;
   let locationPathMock;
   let submitBuildMock;
+  let createBuildMock;
   let getBuildMock;
   let getEntriesMock;
   let context;
@@ -56,6 +57,18 @@ describe('triggerCloudBuild', () => {
     getEntriesMock = mock.fn(() =>
       Promise.resolve([[{ data: 'log line 1' }, { data: 'log line 2' }]])
     );
+    createBuildMock = mock.fn(() =>
+      Promise.resolve([
+        {
+          name: `projects/mock-project/locations/mock-location/operations/mock-op-id`,
+          metadata: {
+            build: {
+              id: mockBuildId,
+            },
+          },
+        },
+      ])
+    );
     setTimeoutMock = mock.fn((cb) => cb());
     mock.method(global, 'setTimeout', setTimeoutMock);
 
@@ -71,6 +84,7 @@ describe('triggerCloudBuild', () => {
         submitBuild: submitBuildMock,
       },
       cloudBuildClient: {
+        createBuild: createBuildMock,
         getBuild: getBuildMock,
       },
       loggingClient: {
@@ -90,15 +104,20 @@ describe('triggerCloudBuild', () => {
       },
       '../../../lib/util/helpers.js': {
         logAndProgress: logAndProgressMock,
+        sanitizeCloudRunServiceName: (name) =>
+          name
+            .toLowerCase()
+            .replace(/[^a-z0-9]+/g, '-')
+            .replace(/^-+|-+$/g, ''),
       },
       '../../../lib/cloud-api/run.js': {
         checkCloudRunServiceExists: checkServiceMock,
       },
       '../../../lib/clients.js': {
         getRunClient: () => Promise.resolve(context.runClient),
-        getBuildsClient: () => Promise.resolve(context.buildsClient),
         getCloudBuildClient: () => Promise.resolve(context.cloudBuildClient),
         getLoggingClient: () => Promise.resolve(context.loggingClient),
+        getBuildsClient: () => Promise.resolve(context.buildsClient),
       },
     });
   }
@@ -113,15 +132,23 @@ describe('triggerCloudBuild', () => {
       'mock-repo',
       'gcr.io/mock-project/mock-image',
       true,
-      () => {}
+      'mock-token',
+      () => {},
+      undefined
     );
 
     assert.deepStrictEqual(result, mockSuccessResult);
     assert.strictEqual(checkServiceMock.mock.callCount(), 1);
-    assert.strictEqual(submitBuildMock.mock.callCount(), 1);
+    assert.strictEqual(createBuildMock.mock.callCount(), 1);
     assert.strictEqual(getBuildMock.mock.callCount(), 1);
     assert.strictEqual(createServiceMock.mock.callCount(), 1); // 1 dry run
-    assert.strictEqual(updateServiceMock.mock.callCount(), 0);
+
+    // Verify sanitized service name was used in dry run
+    const dryRunCall = createServiceMock.mock.calls[0].arguments[0];
+    assert.strictEqual(
+      dryRunCall.serviceId,
+      'mock-image' // sanitized from gcr.io/.../mock-image
+    );
 
     const { calls: logCalls } = logAndProgressMock.mock;
     assert.match(logCalls[0].arguments[0], /Performing dry-run creation/);
@@ -143,11 +170,13 @@ describe('triggerCloudBuild', () => {
       'mock-repo',
       'gcr.io/mock-project/mock-image',
       true,
-      () => {}
+      'mock-token',
+      () => {},
+      undefined
     );
 
     assert.strictEqual(checkServiceMock.mock.callCount(), 1);
-    assert.strictEqual(submitBuildMock.mock.callCount(), 1);
+    assert.strictEqual(createBuildMock.mock.callCount(), 1);
     assert.strictEqual(getBuildMock.mock.callCount(), 1);
     assert.strictEqual(createServiceMock.mock.callCount(), 0);
     assert.strictEqual(updateServiceMock.mock.callCount(), 1); // 1 dry run
@@ -165,7 +194,9 @@ describe('triggerCloudBuild', () => {
       'mock-repo',
       'gcr.io/mock-project/mock-image',
       false,
-      () => {}
+      'mock-token',
+      () => {},
+      undefined
     );
 
     assert.deepStrictEqual(result, mockSuccessResult);
@@ -173,9 +204,13 @@ describe('triggerCloudBuild', () => {
     const submitBuildRequest = submitBuildMock.mock.calls[0].arguments[0];
     assert.deepStrictEqual(submitBuildRequest.buildpackBuild, {});
     assert.strictEqual(submitBuildRequest.dockerBuild, undefined);
+    assert.strictEqual(
+      submitBuildRequest.imageUri,
+      'gcr.io/mock-project/mock-image'
+    );
   });
 
-  it('should use docker build when Dockerfile is present', async () => {
+  it('should use docker build when Dockerfile is present and enable BuildKit', async () => {
     const { triggerCloudBuild } = await getTriggerCloudBuild();
     await triggerCloudBuild(
       'mock-project',
@@ -185,13 +220,16 @@ describe('triggerCloudBuild', () => {
       'mock-repo',
       'gcr.io/mock-project/mock-image',
       true, // hasDockerfile = true
-      () => {}
+      'mock-token',
+      () => {},
+      undefined
     );
 
-    assert.strictEqual(submitBuildMock.mock.callCount(), 1);
-    const submitBuildRequest = submitBuildMock.mock.calls[0].arguments[0];
-    assert.deepStrictEqual(submitBuildRequest.dockerBuild, {});
-    assert.strictEqual(submitBuildRequest.buildpackBuild, undefined);
+    assert.strictEqual(createBuildMock.mock.callCount(), 1);
+    const createBuildRequest = createBuildMock.mock.calls[0].arguments[0];
+    const buildSteps = createBuildRequest.build.steps;
+    assert.strictEqual(buildSteps[0].name, 'gcr.io/cloud-builders/docker');
+    assert.deepStrictEqual(buildSteps[0].env, ['DOCKER_BUILDKIT=1']);
   });
 
   it('should poll for build status until completion', async () => {
@@ -215,7 +253,9 @@ describe('triggerCloudBuild', () => {
       'mock-repo',
       'gcr.io/mock-project/mock-image',
       true,
-      () => {}
+      'mock-token',
+      () => {},
+      undefined
     );
 
     assert.strictEqual(getBuildMock.mock.callCount(), 2);
@@ -241,7 +281,9 @@ describe('triggerCloudBuild', () => {
           'mock-repo',
           'gcr.io/mock-project/mock-image',
           true,
-          () => {}
+          'mock-token',
+          () => {},
+          undefined
         ),
       (err) => {
         assert.match(err.message, /Build mock-build-id failed/);
@@ -279,11 +321,13 @@ describe('triggerCloudBuild', () => {
           'mock-repo',
           'gcr.io/mock-project/mock-image',
           true,
-          () => {}
+          'mock-token',
+          () => {},
+          undefined
         ),
       /Dry-run deployment failed: Dry run fail/
     );
-    assert.strictEqual(submitBuildMock.mock.callCount(), 0);
+    assert.strictEqual(createBuildMock.mock.callCount(), 0);
   });
 
   it('should throw if dry-run update fails', async () => {
@@ -303,11 +347,13 @@ describe('triggerCloudBuild', () => {
           'mock-repo',
           'gcr.io/mock-project/mock-image',
           true,
-          () => {}
+          'mock-token',
+          () => {},
+          undefined
         ),
       /Dry-run deployment failed: Dry run fail/
     );
-    assert.strictEqual(submitBuildMock.mock.callCount(), 0);
+    assert.strictEqual(createBuildMock.mock.callCount(), 0);
   });
 
   it('should throw if checkCloudRunServiceExists fails with unexpected error', async () => {
@@ -325,13 +371,37 @@ describe('triggerCloudBuild', () => {
           'mock-repo',
           'gcr.io/mock-project/mock-image',
           true,
-          () => {}
+          'mock-token',
+          () => {},
+          undefined
         ),
       /Permission denied/
     );
   });
 
-  it('should throw if submitBuild fails', async () => {
+  it('should throw if createBuild fails (hasDockerfile = true)', async () => {
+    createBuildMock = mock.fn(() => Promise.reject(new Error('Submit failed')));
+    context.cloudBuildClient.createBuild = createBuildMock;
+    const { triggerCloudBuild } = await getTriggerCloudBuild();
+    await assert.rejects(
+      () =>
+        triggerCloudBuild(
+          'mock-project',
+          'mock-location',
+          'mock-bucket',
+          'mock-blob',
+          'mock-repo',
+          'gcr.io/mock-project/mock-image',
+          true,
+          'mock-token',
+          () => {},
+          undefined
+        ),
+      /Submit failed/
+    );
+  });
+
+  it('should throw if submitBuild fails (hasDockerfile = false)', async () => {
     submitBuildMock = mock.fn(() => Promise.reject(new Error('Submit failed')));
     context.buildsClient.submitBuild = submitBuildMock;
     const { triggerCloudBuild } = await getTriggerCloudBuild();
@@ -344,8 +414,10 @@ describe('triggerCloudBuild', () => {
           'mock-blob',
           'mock-repo',
           'gcr.io/mock-project/mock-image',
-          true,
-          () => {}
+          false,
+          'mock-token',
+          () => {},
+          undefined
         ),
       /Submit failed/
     );
@@ -368,7 +440,9 @@ describe('triggerCloudBuild', () => {
           'mock-repo',
           'gcr.io/mock-project/mock-image',
           true,
-          () => {}
+          'mock-token',
+          () => {},
+          undefined
         ),
       (err) => {
         assert.match(err.message, /Build mock-build-id failed/);
@@ -401,7 +475,9 @@ describe('triggerCloudBuild', () => {
           'mock-repo',
           'gcr.io/mock-project/mock-image',
           true,
-          () => {}
+          'mock-token',
+          () => {},
+          undefined
         ),
       (err) => {
         assert.match(err.message, /Build mock-build-id failed/);
@@ -417,4 +493,233 @@ describe('triggerCloudBuild', () => {
       /Failed to fetch build logs snippet/
     );
   });
+
+  it('should pass ingress to dry run creation', async () => {
+    const { triggerCloudBuild } = await getTriggerCloudBuild();
+    await triggerCloudBuild(
+      'mock-project',
+      'mock-location',
+      'mock-bucket',
+      'mock-blob',
+      'mock-repo',
+      'gcr.io/mock-project/mock-image',
+      true,
+      'mock-token',
+      () => {},
+      'INGRESS_TRAFFIC_INTERNAL_ONLY'
+    );
+
+    assert.strictEqual(createServiceMock.mock.callCount(), 1);
+    const service = createServiceMock.mock.calls[0].arguments[0].service;
+    assert.strictEqual(service.ingress, 'INGRESS_TRAFFIC_INTERNAL_ONLY');
+  });
+});
+
+describe('composeBuild', () => {
+  let ensureARMock;
+  let ensureBucketMock;
+  let uploadToBucketMock;
+  let zipFilesMock;
+  let fsExistsSyncMock;
+  let logAndProgressMock;
+  let checkServiceMock;
+  let createBuildMock;
+  let getBuildMock;
+  let context;
+  const mockBuildId = 'mock-build-id';
+  const mockSuccessResult = {
+    results: {
+      images: [
+        {
+          name: 'us-central1-docker.pkg.dev/mock-project/mock-repo/default_web:latest',
+        },
+      ],
+    },
+    status: 'SUCCESS',
+  };
+
+  beforeEach(() => {
+    logAndProgressMock = mock.fn();
+    ensureARMock = mock.fn(() => Promise.resolve());
+    ensureBucketMock = mock.fn(() => Promise.resolve({}));
+    uploadToBucketMock = mock.fn(() => Promise.resolve());
+    zipFilesMock = mock.fn(() => Promise.resolve(Buffer.from('mock-zip')));
+    fsExistsSyncMock = mock.fn(() => true);
+    checkServiceMock = mock.fn(() => Promise.resolve(false));
+    createBuildMock = mock.fn(() =>
+      Promise.resolve([
+        {
+          metadata: { build: { id: mockBuildId } },
+        },
+      ])
+    );
+    getBuildMock = mock.fn(() => Promise.resolve([mockSuccessResult]));
+
+    context = {
+      runClient: {
+        createService: mock.fn(() => Promise.resolve()),
+        updateService: mock.fn(() => Promise.resolve()),
+      },
+      cloudBuildClient: {
+        createBuild: createBuildMock,
+        getBuild: getBuildMock,
+      },
+      buildsClient: {
+        submitBuild: mock.fn(() =>
+          Promise.resolve([
+            {
+              buildOperation: {
+                name: 'projects/p/locations/l/operations/bW9jay1pZA==',
+              },
+            },
+          ])
+        ),
+      },
+    };
+  });
+
+  async function getBuildModule() {
+    return await esmock('../../../lib/cloud-api/build.js', {
+      'node:fs': {
+        default: {
+          existsSync: fsExistsSyncMock,
+        },
+        existsSync: fsExistsSyncMock,
+      },
+      'node:path': {
+        default: {
+          join: (...args) => args.join('/'),
+        },
+        join: (...args) => args.join('/'),
+      },
+      '../../../lib/cloud-api/helpers.js': {
+        callWithRetry: (fn) => fn(),
+      },
+      '../../../lib/util/helpers.js': {
+        logAndProgress: logAndProgressMock,
+        calculateSourceFingerprint: () => Promise.resolve('mock-fingerprint'),
+      },
+      '../../../lib/cloud-api/run.js': {
+        checkCloudRunServiceExists: checkServiceMock,
+      },
+      '../../../lib/clients.js': {
+        getRunClient: () => Promise.resolve(context.runClient),
+        getCloudBuildClient: () => Promise.resolve(context.cloudBuildClient),
+        getLoggingClient: () => Promise.resolve({}),
+        getBuildsClient: () => Promise.resolve(context.buildsClient),
+      },
+      '../../../lib/cloud-api/registry.js': {
+        ensureArtifactRegistryRepoExists: ensureARMock,
+      },
+      '../../../lib/cloud-api/storage.js': {
+        ensureStorageBucketExists: ensureBucketMock,
+        uploadToStorageBucket: uploadToBucketMock,
+      },
+      '../../../lib/util/archive.js': {
+        zipFiles: zipFilesMock,
+      },
+      '../../../lib/deployment/constants.js': {
+        DEPLOYMENT_CONFIG: {
+          REPO_NAME: 'mock-repo',
+          IMAGE_TAG: 'latest',
+        },
+      },
+    });
+  }
+
+  it('should successfully build multiple services', async () => {
+    const resourcesConfig = {
+      source_builds: {
+        web: { context: 'web_dir' },
+        api: { context: 'api_dir' },
+      },
+    };
+    const { composeBuild } = await getBuildModule();
+
+    const result = await composeBuild(
+      resourcesConfig,
+      'mock-token',
+      'mock-project',
+      'us-central1',
+      '/folder',
+      () => {}
+    );
+
+    assert.strictEqual(
+      result.source_builds.web.image_id,
+      'us-central1-docker.pkg.dev/mock-project/mock-repo/default_web:latest'
+    );
+    assert.strictEqual(
+      result.source_builds.api.image_id,
+      'us-central1-docker.pkg.dev/mock-project/mock-repo/default_web:latest'
+    );
+    assert.strictEqual(ensureARMock.mock.callCount(), 1);
+    assert.strictEqual(zipFilesMock.mock.callCount(), 2);
+    assert.strictEqual(ensureBucketMock.mock.callCount(), 1);
+    const ensureBucketCall = ensureBucketMock.mock.calls[0];
+    assert.strictEqual(ensureBucketCall.arguments[0], 'mock-project');
+    assert.strictEqual(
+      ensureBucketCall.arguments[1],
+      'mock-project_cloudbuild'
+    );
+    assert.strictEqual(ensureBucketCall.arguments[2], 'us-central1');
+    assert.strictEqual(ensureBucketCall.arguments[3], 'mock-token');
+    assert.strictEqual(ensureBucketCall.arguments[4], undefined);
+    assert.strictEqual(ensureBucketCall.arguments[5], false);
+    assert.strictEqual(uploadToBucketMock.mock.callCount(), 2);
+
+    // Verify archive name pattern source/{epoch}.{fingerprint}.tgz
+    assert.match(
+      uploadToBucketMock.mock.calls[0].arguments[2],
+      /^source\/\d+\.mock-fingerprint\.tgz$/
+    );
+
+    assert.strictEqual(createBuildMock.mock.callCount(), 2);
+  });
+
+  it('should handle service with Dockerfile', async () => {
+    fsExistsSyncMock.mock.mockImplementation((p) => p.endsWith('Dockerfile'));
+    const resourcesConfig = {
+      source_builds: {
+        web: { context: 'web_dir' },
+      },
+    };
+    const { composeBuild } = await getBuildModule();
+
+    await composeBuild(
+      resourcesConfig,
+      'mock-token',
+      'mock-project',
+      'us-central1',
+      '/folder',
+      () => {}
+    );
+
+    const createBuildArgs = createBuildMock.mock.calls[0].arguments[0];
+    assert.strictEqual(
+      createBuildArgs.build.steps[0].name,
+      'gcr.io/cloud-builders/docker'
+    );
+  });
+
+  it('should handle service without Dockerfile (buildpacks)', async () => {
+    fsExistsSyncMock.mock.mockImplementation(() => false);
+    const resourcesConfig = {
+      source_builds: {
+        web: { context: 'web_dir' },
+      },
+    };
+    const { composeBuild } = await getBuildModule();
+
+    await composeBuild(
+      resourcesConfig,
+      'mock-token',
+      'mock-project',
+      'us-central1',
+      '/folder',
+      () => {}
+    );
+
+    assert.strictEqual(context.buildsClient.submitBuild.mock.callCount(), 1);
+  });
 });

package/test/local/cloud-api/run.test.js

@@ -0,0 +1,129 @@
+/*
+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.
+*/
+
+import assert from 'node:assert/strict';
+import { describe, it, mock } from 'node:test';
+import esmock from 'esmock';
+
+describe('Cloud Run API Helpers', () => {
+  const projectId = 'test-project';
+  const location = 'europe-west1';
+  const serviceId = 'test-service';
+  const accessToken = 'test-token';
+  const resource = `projects/${projectId}/locations/${location}/services/${serviceId}`;
+
+  it('setServicePublicAccess should set IAM policy for allUsers', async () => {
+    const getIamPolicyMock = mock.fn(async () => [{ bindings: [] }]);
+    const setIamPolicyMock = mock.fn(async () => ({}));
+    const runClientMock = {
+      getIamPolicy: getIamPolicyMock,
+      setIamPolicy: setIamPolicyMock,
+      servicePath: mock.fn(() => resource),
+    };
+
+    const getRunClientMock = mock.fn(async () => runClientMock);
+    const logAndProgressMock = mock.fn();
+    const callWithRetryMock = mock.fn((fn) => fn());
+
+    const { setServicePublicAccess } = await esmock(
+      '../../../lib/cloud-api/run.js',
+      {
+        '../../../lib/clients.js': {
+          getRunClient: getRunClientMock,
+        },
+        '../../../lib/cloud-api/helpers.js': {
+          callWithRetry: callWithRetryMock,
+        },
+        '../../../lib/util/helpers.js': {
+          logAndProgress: logAndProgressMock,
+        },
+      }
+    );
+
+    await setServicePublicAccess(
+      projectId,
+      location,
+      serviceId,
+      accessToken,
+      logAndProgressMock
+    );
+
+    assert.equal(getRunClientMock.mock.callCount(), 1);
+    assert.deepEqual(getRunClientMock.mock.calls[0].arguments, [
+      projectId,
+      accessToken,
+    ]);
+
+    assert.equal(getIamPolicyMock.mock.callCount(), 1);
+    assert.equal(setIamPolicyMock.mock.callCount(), 1);
+    const setIamPolicyRequest = setIamPolicyMock.mock.calls[0].arguments[0];
+    assert.equal(setIamPolicyRequest.resource, resource);
+    assert.deepEqual(setIamPolicyRequest.policy.bindings[0], {
+      role: 'roles/run.invoker',
+      members: ['allUsers'],
+    });
+
+    assert.ok(
+      logAndProgressMock.mock.calls.some((call) =>
+        call.arguments[0].includes(
+          `Setting public access for service ${serviceId}`
+        )
+      )
+    );
+  });
+
+  it('setServicePublicAccess should throw if setIamPolicy fails', async () => {
+    const error = new Error('IAM Update Failed');
+    const getIamPolicyMock = mock.fn(async () => [{ bindings: [] }]);
+    const setIamPolicyMock = mock.fn(async () => {
+      throw error;
+    });
+    const runClientMock = {
+      getIamPolicy: getIamPolicyMock,
+      setIamPolicy: setIamPolicyMock,
+      servicePath: mock.fn(() => resource),
+    };
+
+    const getRunClientMock = mock.fn(async () => runClientMock);
+    const logAndProgressMock = mock.fn();
+
+    const { setServicePublicAccess } = await esmock(
+      '../../../lib/cloud-api/run.js',
+      {
+        '../../../lib/clients.js': {
+          getRunClient: getRunClientMock,
+        },
+        '../../../lib/cloud-api/helpers.js': {
+          callWithRetry: (fn) => fn(),
+        },
+        '../../../lib/util/helpers.js': {
+          logAndProgress: logAndProgressMock,
+        },
+      }
+    );
+
+    await assert.rejects(
+      setServicePublicAccess(
+        projectId,
+        location,
+        serviceId,
+        accessToken,
+        logAndProgressMock
+      ),
+      error
+    );
+  });
+});