@google-cloud/cloud-run-mcp 1.0.0 → 1.2.0

package/test/{test-gcp-auth.js → need-gcp/gcp-auth-check.test.js}

@@ -9,7 +9,7 @@ You may obtain a copy of the License at
 
 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.
+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.
 */
@@ -17,18 +17,16 @@ limitations under the License.
 import assert from 'node:assert/strict';
 import { describe, it, mock, beforeEach, afterEach } from 'node:test';
 import { GoogleAuth } from 'google-auth-library';
-import { ensureGCPCredentials } from '../lib/gcp-auth-check.js';
+import { ensureGCPCredentials } from '../../lib/gcp-auth-check.js';
 
 describe('ensureGCPCredentials', () => {
   let originalConsoleLog;
   let originalConsoleError;
-  let originalProcessExit;
 
   let capturedConsoleOutput;
 
   let consoleLogMockFn;
   let consoleErrorMockFn;
-  let processExitMockFn;
 
   let getClientMock;
   let getAccessTokenMock;
@@ -37,7 +35,6 @@ describe('ensureGCPCredentials', () => {
     // Store original methods
     originalConsoleLog = console.log;
     originalConsoleError = console.error;
-    originalProcessExit = process.exit;
 
     capturedConsoleOutput = []; // Reset for each test
 
@@ -48,14 +45,10 @@ describe('ensureGCPCredentials', () => {
     consoleErrorMockFn = mock.fn((...args) => {
       capturedConsoleOutput.push(args.join(' '));
     });
-    processExitMockFn = mock.fn((code) => {
-      throw new Error(`Mocked process.exit called with code ${code}`);
-    });
 
     // Overwrite the global console and process methods
     console.log = consoleLogMockFn;
     console.error = consoleErrorMockFn;
-    process.exit = processExitMockFn;
 
     // Mock GoogleAuth.prototype.getClient and AuthClient.prototype.getAccessToken.
     const mockClient = {
@@ -73,18 +66,14 @@ describe('ensureGCPCredentials', () => {
     // Restore original methods
     console.log = originalConsoleLog;
     console.error = originalConsoleError;
-    process.exit = originalProcessExit;
 
     // Restore other mocks created with `mock.method`
     mock.restoreAll();
   });
 
-  it('should resolve successfully when ADC are found', async () => {
-    await assert.doesNotThrow(async () => {
-      await ensureGCPCredentials();
-    }, 'ensureGCPCredentials should resolve on success');
-
-    await Promise.resolve();
+  it('should return true when ADC are found', async () => {
+    const result = await ensureGCPCredentials();
+    assert.strictEqual(result, true, 'Should return true on success');
 
     assert.deepStrictEqual(
       capturedConsoleOutput,
@@ -95,11 +84,6 @@ describe('ensureGCPCredentials', () => {
       'Console output should indicate successful ADC discovery'
     );
 
-    assert.strictEqual(
-      processExitMockFn.mock.callCount(),
-      0,
-      'process.exit should not be called on success'
-    );
     assert.strictEqual(
       consoleErrorMockFn.mock.callCount(),
       1,
@@ -123,23 +107,15 @@ describe('ensureGCPCredentials', () => {
     );
   });
 
-  it('should log error and exit when ADC are not found (generic error)', async () => {
+  it('should return false and log error when ADC are not found (generic error)', async () => {
     const errorMessage = 'Failed to find credentials.';
     const errorWithStack = new Error(errorMessage);
     getClientMock.mock.mockImplementation(async () => {
       throw errorWithStack;
     });
 
-    try {
-      await ensureGCPCredentials();
-    } catch (err) {
-      assert.ok(
-        err.message.includes('Mocked process.exit called with code 1'),
-        'Error message from mocked process.exit should be caught'
-      );
-    }
-    // Add `await Promise.resolve()` here too for consistency, if needed
-    await Promise.resolve();
+    const result = await ensureGCPCredentials();
+    assert.strictEqual(result, false, 'Should return false on failure');
 
     const expectedOutput = [
       'Checking for Google Cloud Application Default Credentials...',
@@ -157,20 +133,9 @@ describe('ensureGCPCredentials', () => {
       expectedOutput,
       'Console output should match generic error messages'
     );
-
-    assert.strictEqual(
-      processExitMockFn.mock.callCount(),
-      1,
-      'process.exit should be called once'
-    );
-    assert.strictEqual(
-      processExitMockFn.mock.calls[0].arguments[0],
-      1,
-      'process.exit should be called with code 1'
-    );
   });
 
-  it('should log HTTP error and exit when google-auth-library throws an HTTP error', async () => {
+  it('should return false and log HTTP error when google-auth-library throws an HTTP error', async () => {
     const httpErrorMessage = 'Request failed with status code 401';
     const httpError = new Error(httpErrorMessage);
     httpError.response = { status: 401 };
@@ -180,15 +145,8 @@ describe('ensureGCPCredentials', () => {
       throw httpError;
     });
 
-    try {
-      await ensureGCPCredentials();
-    } catch (err) {
-      assert.ok(
-        err.message.includes('Mocked process.exit called with code 1'),
-        'Error message from mocked process.exit should be caught'
-      );
-    }
-    await Promise.resolve();
+    const result = await ensureGCPCredentials();
+    assert.strictEqual(result, false, 'Should return false on failure');
 
     const expectedOutput = [
       'Checking for Google Cloud Application Default Credentials...',
@@ -206,20 +164,9 @@ describe('ensureGCPCredentials', () => {
       expectedOutput,
       'Console output should match HTTP error messages'
     );
-
-    assert.strictEqual(
-      processExitMockFn.mock.callCount(),
-      1,
-      'process.exit should be called once'
-    );
-    assert.strictEqual(
-      processExitMockFn.mock.calls[0].arguments[0],
-      1,
-      'process.exit should be called with code 1'
-    );
   });
 
-  it('should log TypeError and exit when google-auth-library throws a TypeError', async () => {
+  it('should return false and log TypeError when google-auth-library throws a TypeError', async () => {
     const typeErrorMessage = 'Unexpected token in JSON at position 0';
     const typeError = new TypeError(typeErrorMessage);
     const errorWithStack = typeError;
@@ -228,15 +175,8 @@ describe('ensureGCPCredentials', () => {
       throw typeError;
     });
 
-    try {
-      await ensureGCPCredentials();
-    } catch (err) {
-      assert.ok(
-        err.message.includes('Mocked process.exit called with code 1'),
-        'Error message from mocked process.exit should be caught'
-      );
-    }
-    await Promise.resolve();
+    const result = await ensureGCPCredentials();
+    assert.strictEqual(result, false, 'Should return false on failure');
 
     const expectedOutput = [
       'Checking for Google Cloud Application Default Credentials...',
@@ -254,20 +194,9 @@ describe('ensureGCPCredentials', () => {
       expectedOutput,
       'Console output should match TypeError messages'
     );
-
-    assert.strictEqual(
-      processExitMockFn.mock.callCount(),
-      1,
-      'process.exit should be called once'
-    );
-    assert.strictEqual(
-      processExitMockFn.mock.calls[0].arguments[0],
-      1,
-      'process.exit should be called with code 1'
-    );
   });
 
-  it('should log general unexpected error and exit for other errors', async () => {
+  it('should return false and log general unexpected error for other errors', async () => {
     const unknownErrorMessage = 'Something unexpected happened.';
     const unknownError = new Error(unknownErrorMessage);
     const errorWithStack = unknownError;
@@ -276,15 +205,8 @@ describe('ensureGCPCredentials', () => {
       throw unknownError;
     });
 
-    try {
-      await ensureGCPCredentials();
-    } catch (err) {
-      assert.ok(
-        err.message.includes('Mocked process.exit called with code 1'),
-        'Error message from mocked process.exit should be caught'
-      );
-    }
-    await Promise.resolve();
+    const result = await ensureGCPCredentials();
+    assert.strictEqual(result, false, 'Should return false on failure');
 
     const expectedOutput = [
       'Checking for Google Cloud Application Default Credentials...',
@@ -302,16 +224,5 @@ describe('ensureGCPCredentials', () => {
       expectedOutput,
       'Console output should match general error messages'
     );
-
-    assert.strictEqual(
-      processExitMockFn.mock.callCount(),
-      1,
-      'process.exit should be called once'
-    );
-    assert.strictEqual(
-      processExitMockFn.mock.calls[0].arguments[0],
-      1,
-      'process.exit should be called with code 1'
-    );
   });
 });

package/test/{test-create-project.js → need-gcp/gcp-projects.test.js}

@@ -16,7 +16,7 @@ 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 { createProjectAndAttachBilling } from '../../lib/gcp-projects.js';
 
 /**
  * Prompts the user for an optional project ID or allows them to proceed with auto-generation.