Merge pull request #56 from JupiterOne/INT-11375

Int 11375

src/util/cmdbHierarchyUtils.ts

@@ -69,7 +69,10 @@ async function getParentClass(
       return newParent.name;
     }
   } catch (error) {
-    logger.error({ error }, 'Could not find super class');
+    logger.error(
+      { err: error, result: dictionariesPaginatedResponse.result },
+      'Could not find super class',
+    );
     throw error;
   }
 }

src/validateInvocation.ts

@@ -23,26 +23,33 @@ export default async function validateInvocation(
   const client = new ServiceNowClient(config, context.logger);
   await client.validate();
   //Validate CMDB configuration.
-  if (config.cmdb_parent) {
-    const cmdb_parents = getParsedCMDBClassList(config.cmdb_parent);
-    if (cmdb_parents.length > 10) {
-      throw new IntegrationValidationError(
-        `This integration only supports up to 10 CMDB classes per instance. Please update config to specify 10 or fewer.`,
+  let response;
+  try {
+    if (config.cmdb_parent) {
+      const cmdb_parents = getParsedCMDBClassList(config.cmdb_parent);
+      if (cmdb_parents.length > 10) {
+        throw new IntegrationValidationError(
+          `This integration only supports up to 10 CMDB classes per instance. Please update config to specify 10 or fewer.`,
+        );
+      }
+      response = await validateMultipleClasses(
+        client,
+        cmdb_parents,
+        context.logger,
       );
     }
-    const response = await validateMultipleClasses(
-      client,
-      cmdb_parents,
-      context.logger,
+  } catch (error) {
+    throw new IntegrationValidationError(
+      `Invalid configuration of cmdb. Error: ${error.message}`,
     );
+  }
 
-    if (response.invalidClasses.length > 0) {
-      throw new IntegrationValidationError(
-        'CMDB classes are incorrect. ' +
-          'The class(es): ' +
-          response.invalidClasses.join(', ') +
-          " don't exist in your ServiceNow account. ",
-      );
-    }
+  if (response?.invalidClasses?.length > 0) {
+    throw new IntegrationValidationError(
+      'CMDB classes are incorrect. ' +
+        'The class(es): ' +
+        response.invalidClasses.join(', ') +
+        " don't exist in your ServiceNow account. ",
+    );
   }
 }