fix: fix exit code regression

src/base-commands/base-command.js

@@ -73,7 +73,11 @@ class BaseCommand extends Command {
         this.logger.error(error.message);
         this.logger.debug(error.stack);
       }
-      this.exit(error.exitCode || 1);
+      let code = 1;
+      if (error.exitCode) {
+        code = parseInt(error.exitCode.toString().substring(0, 2), 10);
+      }
+      this.exit(code);
     } else {
       // System errors
       let url = '';

src/services/cli-http-client.js

@@ -159,7 +159,7 @@ class CliRequestClient {
     const moreInfoMessage = more_info ? `See ${more_info} for more info.` : '';
     const error = {
       message: `Error code ${code || 'N/A'} from Twilio: ${message || 'No message provided'}. ${moreInfoMessage}`,
-      code: code.toString().substring(0, 2),
+      code,
       details,
     };
 

test/base-commands/base-command.test.js

@@ -59,6 +59,19 @@ describe('base-commands', () => {
         expect(ctx.stderr).to.contain('oy!');
       });
 
+    test
+      .twilioCliEnv()
+      .stdout()
+      .do(async (ctx) => {
+        ctx.testCmd = new BaseCommand(['-o', 'json'], ctx.fakeConfig);
+        await ctx.testCmd.run();
+        await ctx.testCmd.catch(new TwilioCliError('oh no', 2003, { errors: [{ message: 'oh no' }] }));
+      })
+      .exit(20)
+      .it('can correctly cut exit code', (ctx) => {
+        expect(ctx.stdout).to.contain(`"message": "oh no"`);
+      });
+
     test
       .twilioCliEnv()
       .stdout()

test/base-commands/twilio-client-command.test.js

@@ -184,14 +184,14 @@ describe('base-commands', () => {
       });
 
     setUpTest([], { commandClass: Throwing20003ClientCommand })
-      .exit(20003)
+      .exit(20)
       .it('should catch access denied errors and enhance the message', (ctx) => {
         expect(ctx.stderr).to.contain('Access Denied');
         expect(ctx.stderr).to.contain('Standard API Keys');
       });
 
     setUpTest([], { commandClass: Throwing20003ClientCommand, envRegion: 'region' })
-      .exit(20003)
+      .exit(20)
       .it('should catch access denied errors but not enhance the message when using env var auth', (ctx) => {
         expect(ctx.stderr).to.contain('Access Denied');
         expect(ctx.stderr).to.not.contain('Standard API Keys');

test/services/cli-http-client.test.js

@@ -125,17 +125,5 @@ describe('services', () => {
         });
         expect(response.statusCode).to.equal(200);
       });
-
-    test.it('correct exit code', () => {
-      const client = new CliRequestClient('bleh', logger);
-      const response = {
-        code: 20404,
-        message: 'error',
-        moreInfo: '',
-        details: '',
-      };
-      const { message, code } = client.formatErrorMessage(response);
-      expect(code).to.equal('20');
-    });
   });
 });