@contrast/core 1.32.1 → 1.32.2

package/lib/app-info.js

@@ -33,22 +33,12 @@ module.exports = function (core) {
   const { logger, config } = core;
   const { app_root, cmd_ignore_list, exclusive_entrypoint } = config.agent.node;
 
-  let cmd;
-  let entrypoint;
-  let pkgInfo;
-  let name;
-  let err;
-
-  try {
-    cmd = getCommand();
-    pkgInfo = getPackageInfo();
-    entrypoint = getEntrypoint();
-    name = getApplicationName();
-  } catch (_err) {
-    err = _err;
-  }
+  const cmd = getCommand();
+  const pkgInfo = getPackageInfo();
+  const entrypoint = getEntrypoint();
+  const name = getApplicationName();
 
-  return core.appInfo = !err ? {
+  core.appInfo = {
     // dedupe this? - it's already in systemInfo
     os: {
       type: os.type(),
@@ -72,9 +62,10 @@ module.exports = function (core) {
     serverEnvironment: config.server.environment,
     group: config.application.group,
     metadata: config.application.metadata,
-  } : {
-    _errors: [err]
   };
+  // by convention return the object
+  return core.appInfo;
+
 
   /**
    * Generates a command string based on ARGV and process.argv0, which will be used
@@ -87,25 +78,23 @@ module.exports = function (core) {
     const args = [process.argv0, ...process.argv].map((a) => path.basename(a));
     const cmd = Array.from(new Set(args)).join(' ');
     const message = 'application command matches cmd_ignore_list config option';
-    let err;
 
     if (cmd_ignore_list) {
+      let err;
       for (const ignoreCommand of cmd_ignore_list) {
-        if (err) break;
 
         if (ignoreCommand === 'npm*') {
           if (cmd.includes('npm ')) err = new IntentionalError(message);
         } else {
           if (cmd.includes(ignoreCommand)) err = new IntentionalError(message);
         }
+        if (err) {
+          logger.trace({ cmd_ignore_list, cmd }, message);
+          throw err;
+        }
       }
     }
 
-    if (err) {
-      logger.trace({ cmd_ignore_list, cmd }, message);
-      throw err;
-    }
-
     return cmd;
   }
 
@@ -205,7 +194,7 @@ module.exports = function (core) {
    * @throws {Error} if there is no name identified
    */
   function getApplicationName() {
-    name = config.application.name || pkgInfo.packageData.name;
+    const name = config.application.name || pkgInfo.packageData.name;
     if (!name) {
       throw new Error(
         'The application\'s name was not identified. ' +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/core",
-  "version": "1.32.1",
+  "version": "1.32.2",
   "description": "Preconfigured Contrast agent core services and models",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -16,7 +16,7 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.21.1",
+    "@contrast/common": "1.21.2",
     "@contrast/find-package-json": "^1.0.0",
     "@contrast/fn-inspect": "^4.0.0"
   }