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

package/test/need-gcp/gcp-projects.test.js

@@ -14,64 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import readline from 'readline/promises';
-import { stdin as input, stdout as output } from 'process';
-import { createProjectAndAttachBilling } from '../../lib/gcp-projects.js';
+import { test } from 'node:test';
+import { setupProject } from './test-helpers.js';
 
-/**
- * Prompts the user for an optional project ID or allows them to proceed with auto-generation.
- * Checks for a project ID from command line arguments first.
- * @returns {Promise<string|undefined>} The Google Cloud project ID or undefined if auto-generation is chosen.
- */
-async function getOptionalProjectId() {
-  let projectIdInput = process.argv[2]; // Get the third element (index 2) which is the first argument
-
-  if (projectIdInput && projectIdInput.trim() !== '') {
-    console.log(
-      `Using Project ID from command line argument: ${projectIdInput.trim()}`
-    );
-    return projectIdInput.trim();
-  }
-
-  const rl = readline.createInterface({ input, output });
-  projectIdInput = await rl.question(
-    'Enter a specific Project ID to use (or press Enter to auto-generate): '
-  );
-  rl.close();
-
-  if (projectIdInput && projectIdInput.trim() !== '') {
-    console.log(
-      `Attempting to create project with specified ID: ${projectIdInput.trim()}`
-    );
-    return projectIdInput.trim();
-  }
-  console.log('No Project ID specified. An ID will be auto-generated.');
-  return undefined;
-}
-
-async function main() {
-  try {
-    const optionalProjectId = await getOptionalProjectId();
-    console.log('Attempting to create a new project and attach billing...');
-    const newProjectResult =
-      await createProjectAndAttachBilling(optionalProjectId);
-
-    if (newProjectResult && newProjectResult.projectId) {
-      console.log(
-        `Successfully created project: ${newProjectResult.projectId}`
-      );
-      console.log(newProjectResult.billingMessage);
-      console.log('\nProject creation test completed successfully.');
-    } else {
-      console.error(
-        'Failed to create a new project or retrieve project details.'
-      );
-      process.exit(1);
-    }
-  } catch (error) {
-    console.error('Error during project creation test:', error.message);
-    process.exit(1);
-  }
-}
-
-main();
+test('should create a new project and attach billing', async (t) => {
+  console.log('Attempting to create a new project and attach billing...');
+  await setupProject(t);
+});

package/test/need-gcp/test-helpers.js

@@ -0,0 +1,175 @@
+/*
+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';
+import {
+  createProjectAndAttachBilling,
+  deleteProject,
+  generateProjectId,
+} from '../../lib/cloud-api/projects.js';
+import {
+  callWithRetry,
+  ensureApisEnabled,
+} from '../../lib/cloud-api/helpers.js';
+
+/**
+ * Gets project number from project ID.
+ * @param {string} projectId
+ * @returns {Promise<string>} project number
+ */
+export async function getProjectNumber(projectId) {
+  const { ProjectsClient } = await import('@google-cloud/resource-manager');
+  const client = new ProjectsClient();
+  try {
+    const [project] = await client.getProject({
+      name: `projects/${projectId}`,
+    });
+    // project.name is in format projects/123456
+    return project.name.split('/')[1];
+  } catch (error) {
+    console.error(
+      `Error getting project number for project ${projectId}:`,
+      error.message
+    );
+    throw error;
+  }
+}
+
+/**
+ * Adds an IAM policy binding to a project.
+ * @param {string} projectId The project ID.
+ * @param {string} member The member to add, e.g., 'user:foo@example.com'.
+ * @param {string} role The role to grant, e.g., 'roles/viewer'.
+ */
+export async function addIamPolicyBinding(projectId, member, role) {
+  const { ProjectsClient } = await import('@google-cloud/resource-manager');
+  const client = new ProjectsClient();
+
+  console.log(
+    `Adding IAM binding for ${member} with role ${role} to project ${projectId}`
+  );
+
+  try {
+    const [policy] = await client.getIamPolicy({
+      resource: `projects/${projectId}`,
+    });
+
+    console.log('Current IAM Policy:', JSON.stringify(policy, null, 2));
+
+    // Check if the binding already exists
+    const binding = policy.bindings.find((b) => b.role === role);
+    if (binding) {
+      if (!binding.members.includes(member)) {
+        binding.members.push(member);
+      }
+    } else {
+      policy.bindings.push({
+        role: role,
+        members: [member],
+      });
+    }
+
+    console.log('Updated IAM Policy:', JSON.stringify(policy, null, 2));
+
+    // Set the updated policy
+    await client.setIamPolicy({
+      resource: `projects/${projectId}`,
+      policy: policy,
+    });
+
+    console.log(
+      `Successfully added IAM binding for ${member} with role ${
+        role
+      } to project ${projectId}`
+    );
+  } catch (error) {
+    console.error(
+      `Error adding IAM policy binding to project ${projectId}:`,
+      error.message
+    );
+    throw error;
+  }
+}
+
+/**
+ * Create project, attach billing.
+ * @returns {Promise<string>} projectId
+ */
+export async function setupProject() {
+  const projectId = 'test-' + generateProjectId();
+  console.log(`Generated project ID: ${projectId}`);
+  const parent = process.env.GCP_PARENT || process.argv[2];
+  const newProjectResult = await createProjectAndAttachBilling(
+    projectId,
+    parent
+  );
+  assert(newProjectResult, 'newProjectResult should not be null');
+  assert(
+    newProjectResult.projectId,
+    'newProjectResult.projectId should not be null'
+  );
+  assert(
+    newProjectResult.billingMessage,
+    'newProjectResult.billingMessage should not be null'
+  );
+  assert(
+    newProjectResult.billingMessage.startsWith(
+      `Project ${newProjectResult.projectId} created successfully.`
+    ),
+    'newProjectResult.billingMessage should start with success message'
+  );
+  console.log(`Successfully created project: ${newProjectResult.projectId}`);
+  console.log(newProjectResult.billingMessage);
+
+  return projectId;
+}
+
+/**
+ * Delete project
+ * @param {string} projectId
+ */
+export async function cleanupProject(projectId) {
+  try {
+    await deleteProject(projectId);
+    console.log(`Successfully deleted project: ${projectId}`);
+  } catch (e) {
+    console.error(`Failed to delete project ${projectId}:`, e.message);
+  }
+}
+
+/**
+ * Enable APIs and set IAM permissions for source deployments.
+ * Note: This function is only needed for Cloud Build since it uses the compute
+ * default service account. The compute service account needs the editor role to
+ * deploy to Cloud Run, which is usually granted by default, but in this case we
+ * ensure it due to restrictions in some organizations.
+ * @param {string} projectId
+ */
+export async function setSourceDeployProjectPermissions(projectId) {
+  const { ServiceUsageClient } = await import('@google-cloud/service-usage');
+  const serviceUsageClient = new ServiceUsageClient({ projectId });
+  const context = {
+    serviceUsageClient: serviceUsageClient,
+  };
+  await ensureApisEnabled(context, projectId, ['run.googleapis.com']);
+  console.log('Adding editor role to Compute SA...');
+  const projectNumber = await getProjectNumber(projectId);
+  const member = `serviceAccount:${projectNumber}-compute@developer.gserviceaccount.com`;
+  await callWithRetry(
+    () => addIamPolicyBinding(projectId, member, 'roles/editor'),
+    `addIamPolicyBinding roles/editor to ${member}`
+  );
+  console.log('Compute SA editor role added.');
+}

package/test/need-gcp/workflows/deployment-workflows.test.js

@@ -0,0 +1,100 @@
+/*
+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 fs from 'fs/promises';
+import assert from 'node:assert';
+import { test, describe, before, after } from 'node:test';
+import path from 'path';
+
+import { deploy, deployImage } from '../../../lib/deployment/deployer.js';
+import {
+  cleanupProject,
+  setSourceDeployProjectPermissions,
+  setupProject,
+} from '../test-helpers.js';
+
+describe('Deployment workflows', () => {
+  let projectId;
+
+  before(async () => {
+    try {
+      projectId = await setupProject();
+      await setSourceDeployProjectPermissions(projectId);
+    } catch (err) {
+      console.error('Error during project creation and setup:', err);
+      throw err;
+    }
+  });
+
+  test('Scenario-1: Starting deployment of hello image...', async () => {
+    const configImageDeploy = {
+      projectId: projectId,
+      serviceName: 'hello-scenario',
+      region: 'europe-west1',
+      imageUrl: 'gcr.io/cloudrun/hello',
+    };
+    await deployImage(configImageDeploy);
+
+    console.log('Scenario-1: Deployment completed.');
+  });
+
+  test('Scenario-2: Starting deployment with invalid files...', async () => {
+    const configFailingBuild = {
+      projectId: projectId,
+      serviceName: 'example-failing-app',
+      region: 'europe-west1',
+      files: [
+        {
+          filename: 'main.txt',
+          content:
+            'This is not a valid application source file and should cause a build failure.',
+        },
+      ],
+    };
+    await assert.rejects(
+      deploy(configFailingBuild),
+      { message: /ERROR: failed to detect: no buildpacks participating/ },
+      'Deployment should have failed with a buildpack detection error'
+    );
+  });
+
+  test('Scenario-3: Starting deployment of Go app with file content...', async () => {
+    const mainGoContent = await fs.readFile(
+      path.resolve('example-sources-to-deploy/main.go'),
+      'utf-8'
+    );
+    const goModContent = await fs.readFile(
+      path.resolve('example-sources-to-deploy/go.mod'),
+      'utf-8'
+    );
+    const configGoWithContent = {
+      projectId: projectId,
+      serviceName: 'example-go-app-content',
+      region: 'europe-west1',
+      files: [
+        { filename: 'main.go', content: mainGoContent },
+        { filename: 'go.mod', content: goModContent },
+      ],
+    };
+    await deploy(configGoWithContent);
+    console.log('Scenario-3: Deployment completed.');
+  });
+
+  after(async () => {
+    // Clean up: delete the project created for tests
+    cleanupProject(projectId);
+  });
+});