Fix bugs related to Frodo Exiting

src/app.ts

@@ -40,6 +40,9 @@ import { getVersions } from './utils/Version';
 const { initConnectionProfiles } = frodo.conn;
 const { initTokenCache } = frodo.cache;
 
+// Override SIGINT (ctrl+c) to exit the program immediately. Exit code 130 is normally associated with SIGINT.
+process.on('SIGINT', () => process.exit(130));
+
 (async () => {
   try {
     // override default library output handlers with our own

src/cli/admin/admin-federation-export.ts

@@ -94,7 +94,7 @@ export default function setup() {
               'Unrecognized combination of options or no options...',
               'error'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/admin/admin-federation-import.ts

@@ -110,7 +110,7 @@ export default function setup() {
         // unrecognized combination of options or no options
         else {
           printMessage('Unrecognized combination of options or no options...');
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/agent/agent-delete.ts

@@ -53,7 +53,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-export.ts

@@ -97,7 +97,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-gateway-delete.ts

@@ -59,7 +59,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-gateway-export.ts

@@ -87,7 +87,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-gateway-import.ts

@@ -86,7 +86,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-import.ts

@@ -98,7 +98,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-java-delete.ts

@@ -53,7 +53,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-java-export.ts

@@ -81,7 +81,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-java-import.ts

@@ -82,7 +82,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-web-delete.ts

@@ -53,7 +53,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-web-export.ts

@@ -81,7 +81,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/agent/agent-web-import.ts

@@ -82,7 +82,7 @@ export default function setup() {
             verboseMessage(
               'Unrecognized combination of options or no options...'
             );
-            program.help();
+            program.outputHelp();
             process.exitCode = 1;
           }
         }

src/cli/app/app-delete.ts

@@ -73,7 +73,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/app/app-export.ts

@@ -122,7 +122,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/app/app-import.ts

@@ -136,7 +136,7 @@ export default function setup() {
         // unrecognized combination of options or no options
         else {
           printMessage('Unrecognized combination of options or no options...');
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authn/authn-describe.ts

@@ -48,7 +48,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-policy-delete.ts

@@ -63,7 +63,7 @@ export default function setup() {
         // unrecognized combination of options or no options
         else {
           printMessage('Unrecognized combination of options or no options...');
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-policy-describe.ts

@@ -40,7 +40,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-policy-export.ts

@@ -146,7 +146,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-policy-import.ts

@@ -113,7 +113,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-policy-list.ts

@@ -47,7 +47,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-set-delete.ts

@@ -43,7 +43,7 @@ export default function setup() {
         // unrecognized combination of options or no options
         else {
           printMessage('Unrecognized combination of options or no options...');
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-set-describe.ts

@@ -40,7 +40,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-set-export.ts

@@ -105,7 +105,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-set-import.ts

@@ -105,7 +105,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-type-delete.ts

@@ -64,7 +64,7 @@ export default function setup() {
         // unrecognized combination of options or no options
         else {
           printMessage('Unrecognized combination of options or no options...');
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-type-describe.ts

@@ -47,7 +47,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-type-export.ts

@@ -101,7 +101,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/authz/authz-type-import.ts

@@ -103,7 +103,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/config/config-export.ts

@@ -173,7 +173,7 @@ export default function setup() {
             '-D or --directory required when using -A or --all-separate',
             'error'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
         // --all-separate -A
@@ -203,7 +203,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/config/config-import.ts

@@ -109,7 +109,7 @@ export default function setup() {
         // Require --file -f for all function
         if (options.all && !options.file) {
           printMessage('-f or --file required when using -a or --all', 'error');
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
         // --all -a
@@ -131,7 +131,7 @@ export default function setup() {
             '-D or --directory required when using -A or --all-separate',
             'error'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
         // --all-separate -A
@@ -169,7 +169,7 @@ export default function setup() {
           verboseMessage(
             'Unrecognized combination of options or no options...'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/email/email-template-export.ts

@@ -106,7 +106,7 @@ export default function setup() {
             'Unrecognized combination of options or no options...',
             'error'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/email/email-template-import.ts

@@ -115,7 +115,7 @@ export default function setup() {
             'Unrecognized combination of options or no options...',
             'error'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/esv/esv-secret-describe.ts

@@ -64,7 +64,7 @@ export default function setup() {
             'Unrecognized combination of options or no options...',
             'error'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/esv/esv-secret-import.ts

@@ -146,7 +146,7 @@ export default function setup() {
         // unrecognized combination of options or no options
         else {
           printMessage('Unrecognized combination of options or no options...');
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/esv/esv-variable-delete.ts

@@ -68,7 +68,7 @@ export default function setup() {
         // unrecognized combination of options or no options
         else {
           printMessage('Unrecognized combination of options or no options...');
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/esv/esv-variable-describe.ts

@@ -64,7 +64,7 @@ export default function setup() {
             'Unrecognized combination of options or no options...',
             'error'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }

src/cli/esv/esv-variable-export.ts

@@ -104,7 +104,7 @@ export default function setup() {
             'Unrecognized combination of options or no options...',
             'error'
           );
-          program.help();
+          program.outputHelp();
           process.exitCode = 1;
         }
       }