improve import of parser sdk

JohannesZahn · JohannesZahn · commit 58c484041900 · 2021-07-01T08:58:09.000+02:00
Signed-off-by: Johannes Zahn &lt;johannes.zahn@iteratec.com&gt;
diff --git a/parser-sdk/nodejs/parser-utils.js b/parser-sdk/nodejs/parser-utils.js
@@ -17,7 +17,7 @@ function addIdsAndDates(findings) {
 }
 
 // eslint-disable-next-line
-async function validate(jsonData) {
+async function validateAgainstJsonSchema(jsonData) {
   const jsonSchemaString = await readFile(
     __dirname + "/findings-schema.json",
     "utf8"
@@ -33,9 +33,9 @@ async function validate(jsonData) {
 // eslint-disable-next-line
 async function addSampleIdsAndDatesAndValidate(jsonData) {
   const extendedData = addIdsAndDates(jsonData);
-  validate(extendedData);
+  validateAgainstJsonSchema(extendedData);
 }
 
 module.exports.addIdsAndDates = addIdsAndDates;
-module.exports.validate = validate;
+module.exports.validate = validateAgainstJsonSchema;
 module.exports.validate_parser = addSampleIdsAndDatesAndValidate;
diff --git a/scanners/nmap/parser/parser.test.js b/scanners/nmap/parser/parser.test.js
@@ -4,7 +4,9 @@
 
 const fs = require("fs");
 const util = require("util");
-const { validate_parser } = require("../../../parser-sdk/nodejs/parser-utils.js");
+const {
+  validate_parser,
+} = require("@securecodebox/parser-sdk-nodejs/parser-utils");
 
 // eslint-disable-next-line security/detect-non-literal-fs-filename
 const readFile = util.promisify(fs.readFile);
@@ -19,6 +21,7 @@ test("should properly parse nmap xml file", async () => {
     }
   );
   const findings = await parse(xmlContent);
+  // validate findings
   await expect(validate_parser(findings)).resolves.toBeUndefined();
   expect(findings).toMatchInlineSnapshot(`
     Array [
diff --git a/scanners/package-lock.json b/scanners/package-lock.json
diff --git a/scanners/package.json b/scanners/package.json
@@ -36,6 +36,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
+    "@securecodebox/parser-sdk-nodejs": "file:../parser-sdk/nodejs",
     "jest": "^27.0.3"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`},`
`37`	`37`	`"license": "Apache-2.0",`
`38`	`38`	`"devDependencies": {`
	`39`	`+ "@securecodebox/parser-sdk-nodejs": "file:../parser-sdk/nodejs",`
`39`	`40`	`"jest": "^27.0.3"`
`40`	`41`	`}`
`41`	`42`	`}`