fix(cli): always exit with exit code 1 after error occurs during command

packages/cli/esbuild.mjs

@@ -2,7 +2,7 @@
 /* eslint no-console: "off" */
 
 import esbuild from 'esbuild';
-import { writeFileSync } from 'fs';
+import { writeFileSync } from 'node:fs';
 
 const options = {
   entryPoints: ['./src/index.ts'],
@@ -26,10 +26,7 @@ const options = {
     'commander',
     'dotenv',
     'fast-glob',
-    'fs',
     'node-fetch',
-    'path',
-    'readline',
     'tar',
   ],
   banner: { js: '#!/usr/bin/env node' },

packages/cli/src/auth.test.ts

@@ -1,16 +1,16 @@
 import { ContentType, MedplumClient } from '@medplum/core';
 import { MockClient } from '@medplum/mock';
-import cp from 'child_process';
-import fs from 'fs';
-import http from 'http';
+import cp from 'node:child_process';
+import fs from 'node:fs';
+import http from 'node:http';
 import { main } from '.';
 import { FileSystemStorage } from './storage';
 import { createMedplumClient } from './util/client';
 
-jest.mock('child_process');
-jest.mock('http');
+jest.mock('node:child_process');
+jest.mock('node:http');
 jest.mock('./util/client');
-jest.mock('fs', () => ({
+jest.mock('node:fs', () => ({
   existsSync: jest.fn(),
   mkdirSync: jest.fn(),
   readFileSync: jest.fn(),
@@ -26,6 +26,14 @@ jest.mock('fs', () => ({
 describe('CLI auth', () => {
   const env = process.env;
   let medplum: MedplumClient;
+  let processError: jest.SpyInstance;
+
+  beforeAll(() => {
+    process.exit = jest.fn<never, any>().mockImplementation(function exit(exitCode: number) {
+      throw new Error(`Process exited with exit code ${exitCode}`);
+    }) as unknown as typeof process.exit;
+    processError = jest.spyOn(process.stderr, 'write').mockImplementation(jest.fn());
+  });
 
   beforeEach(() => {
     jest.resetModules();
@@ -34,7 +42,6 @@ describe('CLI auth', () => {
     medplum = new MockClient();
     console.log = jest.fn();
     console.error = jest.fn();
-    process.exit = jest.fn<never, any>();
 
     (createMedplumClient as unknown as jest.Mock).mockImplementation(async () => medplum);
   });
@@ -87,14 +94,20 @@ describe('CLI auth', () => {
   });
 
   test('Login unsupported auth type', async () => {
-    await main(['node', 'index.js', 'login', '--auth-type', 'foo']);
-    expect(console.error).toHaveBeenCalledWith(expect.stringContaining('Error: Allowed choices are'));
+    await expect(main(['node', 'index.js', 'login', '--auth-type', 'foo'])).rejects.toThrow(
+      'Process exited with exit code 1'
+    );
+    expect(processError).toHaveBeenCalledWith(
+      expect.stringContaining(
+        "error: option '--auth-type <authType>' argument 'foo' is invalid. Allowed choices are basic, client-credentials, authorization-code, jwt-bearer, token-exchange, jwt-assertion"
+      )
+    );
   });
 
   test('Login basic auth', async () => {
     expect(medplum.getActiveLogin()).toBeUndefined();
     await main(['node', 'index.js', 'login', '--auth-type', 'basic']);
-    expect(console.error).not.toHaveBeenCalled();
+    expect(processError).not.toHaveBeenCalled();
   });
 
   test('Login client credentials', async () => {
@@ -110,7 +123,7 @@ describe('CLI auth', () => {
       '--client-secret',
       'abc',
     ]);
-    expect(console.error).not.toHaveBeenCalled();
+    expect(processError).not.toHaveBeenCalled();
   });
 
   test('Load credentials from disk', async () => {

packages/cli/src/auth.ts

@@ -5,9 +5,9 @@ import {
   MedplumClient,
   normalizeErrorString,
 } from '@medplum/core';
-import { exec } from 'child_process';
-import { createServer } from 'http';
-import { platform } from 'os';
+import { exec } from 'node:child_process';
+import { createServer } from 'node:http';
+import { platform } from 'node:os';
 import { createMedplumClient } from './util/client';
 import { createMedplumCommand } from './util/command';
 import { jwtAssertionLogin, jwtBearerLogin, Profile, saveProfile } from './utils';

packages/cli/src/aws/describe.test.ts

@@ -8,7 +8,14 @@ import { mockClient } from 'aws-sdk-client-mock';
 import { main } from '../index';
 
 describe('describe command', () => {
+  let processError: jest.SpyInstance;
+
   beforeAll(() => {
+    process.exit = jest.fn<never, any>().mockImplementation(function exit(exitCode: number) {
+      throw new Error(`Process exited with exit code ${exitCode}`);
+    }) as unknown as typeof process.exit;
+    processError = jest.spyOn(process.stderr, 'write').mockImplementation(jest.fn());
+
     const cfMock = mockClient(CloudFormationClient);
 
     cfMock.on(ListStacksCommand).resolves({
@@ -87,6 +94,10 @@ describe('describe command', () => {
     });
   });
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   test('Describe command', async () => {
     console.log = jest.fn();
     await main(['node', 'index.js', 'aws', 'describe', 'dev']);
@@ -95,7 +106,10 @@ describe('describe command', () => {
 
   test('Describe not found', async () => {
     console.log = jest.fn();
-    await main(['node', 'index.js', 'aws', 'describe', 'not-found']);
+    await expect(main(['node', 'index.js', 'aws', 'describe', 'not-found'])).rejects.toThrow(
+      'Process exited with exit code 1'
+    );
     expect(console.log).toHaveBeenCalledWith('Stack not found: not-found');
+    expect(processError).toHaveBeenCalledWith(expect.stringContaining('Error: Stack not found: not-found'));
   });
 });

packages/cli/src/aws/describe.ts

@@ -8,7 +8,7 @@ export async function describeStacksCommand(tag: string): Promise<void> {
   const details = await getStackByTag(tag);
   if (!details) {
     await printStackNotFound(tag);
-    return;
+    throw new Error(`Stack not found: ${tag}`);
   }
   printStackDetails(details);
 }

packages/cli/src/aws/init.test.ts

@@ -6,14 +6,14 @@ import { S3Client } from '@aws-sdk/client-s3';
 import { GetParameterCommand, PutParameterCommand, SSMClient } from '@aws-sdk/client-ssm';
 import { GetCallerIdentityCommand, STSClient } from '@aws-sdk/client-sts';
 import { mockClient } from 'aws-sdk-client-mock';
-import { randomUUID } from 'crypto';
-import { readFileSync, unlinkSync, writeFileSync } from 'fs';
 import fetch from 'node-fetch';
-import readline from 'readline';
+import { randomUUID } from 'node:crypto';
+import { readFileSync, unlinkSync, writeFileSync } from 'node:fs';
+import readline from 'node:readline';
 import { main } from '../index';
 import { mockReadline } from './test.utils';
 
-jest.mock('readline');
+jest.mock('node:readline');
 jest.mock('node-fetch');
 
 describe('init command', () => {

packages/cli/src/aws/init.ts

@@ -8,8 +8,8 @@ import {
 import { CloudFrontClient, CreatePublicKeyCommand } from '@aws-sdk/client-cloudfront';
 import { GetCallerIdentityCommand, STSClient } from '@aws-sdk/client-sts';
 import { MedplumInfraConfig, normalizeErrorString } from '@medplum/core';
-import { generateKeyPairSync, randomUUID } from 'crypto';
-import { existsSync } from 'fs';
+import { generateKeyPairSync, randomUUID } from 'node:crypto';
+import { existsSync } from 'node:fs';
 import { getConfigFileName, writeConfig } from '../utils';
 import { ask, checkOk, choose, chooseInt, closeTerminal, header, initTerminal, print, yesOrNo } from './terminal';
 import { getServerVersions, writeParameters } from './utils';

packages/cli/src/aws/terminal.ts

@@ -1,4 +1,4 @@
-import readline from 'readline';
+import readline from 'node:readline';
 
 let terminal: readline.Interface;
 

packages/cli/src/aws/test.utils.ts

@@ -1,4 +1,4 @@
-import readline from 'readline';
+import readline from 'node:readline';
 
 export function mockReadline(...answers: string[]): readline.Interface {
   const result = { write: jest.fn(), question: jest.fn(), close: jest.fn() };

packages/cli/src/aws/update-app.test.ts

@@ -15,17 +15,17 @@ import {
 import { PutObjectCommand, S3Client, S3ClientResolvedConfig } from '@aws-sdk/client-s3';
 import { AwsStub, mockClient } from 'aws-sdk-client-mock';
 import fastGlob from 'fast-glob';
-import fs from 'fs';
 import fetch from 'node-fetch';
-import { Readable, Writable } from 'stream';
+import fs from 'node:fs';
+import { Readable, Writable } from 'node:stream';
 import tar from 'tar';
 import { main } from '../index';
 
 jest.mock('fast-glob', () => ({
   sync: jest.fn(() => []),
 }));
 
-jest.mock('fs', () => ({
+jest.mock('node:fs', () => ({
   createReadStream: jest.fn(),
   existsSync: jest.fn(),
   mkdtempSync: jest.fn(() => '/tmp/'),
@@ -54,7 +54,17 @@ let s3Mock: AwsStub<ServiceInputTypes, ServiceOutputTypes, S3ClientResolvedConfi
 let cloudFrontMock: AwsStub<ServiceInputTypes, ServiceOutputTypes, CloudFrontClientResolvedConfig>;
 
 describe('update-app command', () => {
+  let processError: jest.SpyInstance;
+
+  beforeAll(() => {
+    process.exit = jest.fn<never, any>().mockImplementation(function exit(exitCode: number) {
+      throw new Error(`Process exited with exit code ${exitCode}`);
+    }) as unknown as typeof process.exit;
+    processError = jest.spyOn(process.stderr, 'write').mockImplementation(jest.fn());
+  });
+
   beforeEach(() => {
+    jest.clearAllMocks();
     cfMock = mockClient(CloudFormationClient);
 
     cfMock.on(ListStacksCommand).resolves({
@@ -343,16 +353,22 @@ describe('update-app command', () => {
     (fs.existsSync as jest.Mock).mockReturnValueOnce(false);
 
     console.log = jest.fn();
-    await main(['node', 'index.js', 'aws', 'update-app', 'not-found']);
+    await expect(main(['node', 'index.js', 'aws', 'update-app', 'not-found'])).rejects.toThrow(
+      'Process exited with exit code 1'
+    );
     expect(console.log).toHaveBeenCalledWith('Config not found: not-found (medplum.not-found.config.json)');
+    expect(processError).toHaveBeenCalledWith('Error: Config not found: not-found\n');
   });
 
   test('Update app config custom filename not found', async () => {
     (fs.existsSync as jest.Mock).mockReturnValueOnce(false);
 
     console.log = jest.fn();
-    await main(['node', 'index.js', 'aws', 'update-app', 'not-found', '--file', 'foo.json']);
+    await expect(main(['node', 'index.js', 'aws', 'update-app', 'not-found', '--file', 'foo.json'])).rejects.toThrow(
+      'Process exited with exit code 1'
+    );
     expect(console.log).toHaveBeenCalledWith('Config not found: not-found (foo.json)');
+    expect(processError).toHaveBeenCalledWith('Error: Config not found: not-found\n');
   });
 
   test('Update app stack not found', async () => {
@@ -361,8 +377,11 @@ describe('update-app command', () => {
     (fs.readFileSync as jest.Mock).mockReturnValueOnce('{}');
 
     console.log = jest.fn();
-    await main(['node', 'index.js', 'aws', 'update-app', 'not-found']);
+    await expect(main(['node', 'index.js', 'aws', 'update-app', 'not-found'])).rejects.toThrow(
+      'Process exited with exit code 1'
+    );
     expect(console.log).toHaveBeenCalledWith('Stack not found: not-found');
+    expect(processError).toHaveBeenCalledWith('Error: Stack not found: not-found\n');
   });
 
   test('Update app stack incomplete', async () => {
@@ -371,7 +390,9 @@ describe('update-app command', () => {
     (fs.readFileSync as jest.Mock).mockReturnValueOnce('{}');
 
     console.log = jest.fn();
-    await main(['node', 'index.js', 'aws', 'update-app', 'incomplete']);
-    expect(console.log).toHaveBeenCalledWith('App bucket not found');
+    await expect(main(['node', 'index.js', 'aws', 'update-app', 'incomplete'])).rejects.toThrow(
+      'Process exited with exit code 1'
+    );
+    expect(processError).toHaveBeenCalledWith('Error: App bucket not found for stack incomplete\n');
   });
 });

packages/cli/src/aws/update-app.ts

@@ -1,11 +1,11 @@
 import { PutObjectCommand } from '@aws-sdk/client-s3';
 import { ContentType } from '@medplum/core';
 import fastGlob from 'fast-glob';
-import { createReadStream, mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'fs';
 import fetch from 'node-fetch';
-import { tmpdir } from 'os';
-import { join, sep } from 'path';
-import { pipeline } from 'stream/promises';
+import { createReadStream, mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join, sep } from 'node:path';
+import { pipeline } from 'node:stream/promises';
 import { readConfig, safeTarExtractor } from '../utils';
 import { createInvalidation, getStackByTag, printConfigNotFound, printStackNotFound, s3Client } from './utils';
 
@@ -23,18 +23,17 @@ export interface UpdateAppOptions {
 export async function updateAppCommand(tag: string, options: UpdateAppOptions): Promise<void> {
   const config = readConfig(tag, options);
   if (!config) {
-    await printConfigNotFound(tag, options);
-    return;
+    printConfigNotFound(tag, options);
+    throw new Error(`Config not found: ${tag}`);
   }
   const details = await getStackByTag(tag);
   if (!details) {
     await printStackNotFound(tag);
-    return;
+    throw new Error(`Stack not found: ${tag}`);
   }
   const appBucket = details.appBucket;
   if (!appBucket) {
-    console.log('App bucket not found');
-    return;
+    throw new Error(`App bucket not found for stack ${tag}`);
   }
 
   const version = options?.toVersion ?? 'latest';