@cyclonedx/cdxgen 10.4.0 → 10.4.2

package/utils.test.js

@@ -98,11 +98,10 @@ test("SSRI test", () => {
     "2ca532a6bc655663344004ba102436d29031018eab236247678db1d8978627bf",
   );
   ss = parse(
-    "sha256-" +
-      Buffer.from(
-        "2ca532a6bc655663344004ba102436d29031018eab236247678db1d8978627bf",
-        "hex",
-      ).toString("base64"),
+    `sha256-${Buffer.from(
+      "2ca532a6bc655663344004ba102436d29031018eab236247678db1d8978627bf",
+      "hex",
+    ).toString("base64")}`,
   );
   expect(ss.sha256[0].digest).toStrictEqual(
     "LKUyprxlVmM0QAS6ECQ20pAxAY6rI2JHZ42x2JeGJ78=",
@@ -1526,7 +1525,7 @@ test("parse github actions workflow data", () => {
   let dep_list = parseGitHubWorkflowData(
     readFileSync("./.github/workflows/nodejs.yml", { encoding: "utf-8" }),
   );
-  expect(dep_list.length).toEqual(3);
+  expect(dep_list.length).toEqual(4);
   expect(dep_list[0]).toEqual({
     group: "actions",
     name: "checkout",
@@ -2221,8 +2220,8 @@ test("parsePkgLock v3", async () => {
     projectName: "cdxgen",
   });
   deps = parsedList.pkgList;
-  expect(deps.length).toEqual(1071);
-  expect(parsedList.dependenciesList.length).toEqual(1071);
+  expect(deps.length).toEqual(1005);
+  expect(parsedList.dependenciesList.length).toEqual(1005);
 });
 
 test("parseBowerJson", async () => {
@@ -3377,6 +3376,10 @@ test("parse container spec like files", () => {
   expect(dep_list[0]).toEqual({
     image: "gcr.io/google-samples/microservices-demo/adservice",
   });
+  dep_list = parseContainerSpecData(
+    readFileSync("./test/data/service.yaml", { encoding: "utf-8" }),
+  );
+  expect(dep_list.length).toEqual(0);
 });
 
 test("parse containerfiles / dockerfiles", () => {

package/validator.js

@@ -70,7 +70,7 @@ export const validateBom = (bomJson) => {
 export const validateMetadata = (bomJson) => {
   const errorList = [];
   const warningsList = [];
-  if (bomJson && bomJson.metadata) {
+  if (bomJson?.metadata) {
     if (
       !bomJson.metadata.component ||
       !Object.keys(bomJson.metadata.component).length
@@ -80,20 +80,17 @@ export const validateMetadata = (bomJson) => {
     if (bomJson.metadata.component) {
       // Do we have a purl and bom-ref for metadata.component
       if (!bomJson.metadata.component.purl) {
-        warningsList.push(`purl is missing for metadata.component`);
+        warningsList.push("purl is missing for metadata.component");
       }
       if (!bomJson.metadata.component["bom-ref"]) {
-        warningsList.push(`bom-ref is missing for metadata.component`);
+        warningsList.push("bom-ref is missing for metadata.component");
       }
       // Do we have a version for metadata.component
       if (!bomJson.metadata.component.version) {
-        warningsList.push(`Version is missing for metadata.component`);
+        warningsList.push("Version is missing for metadata.component");
       }
       // Is the same component getting repeated inside the components block
-      if (
-        bomJson.metadata.component.components &&
-        bomJson.metadata.component.components.length
-      ) {
+      if (bomJson.metadata.component.components?.length) {
         for (const comp of bomJson.metadata.component.components) {
           if (comp["bom-ref"] === bomJson.metadata.component["bom-ref"]) {
             warningsList.push(
@@ -112,7 +109,7 @@ export const validateMetadata = (bomJson) => {
     console.log("===== WARNINGS =====");
     console.log(warningsList);
   }
-  if (errorList.length != 0) {
+  if (errorList.length !== 0) {
     console.log(errorList);
     return false;
   }
@@ -127,10 +124,10 @@ export const validateMetadata = (bomJson) => {
 export const validatePurls = (bomJson) => {
   const errorList = [];
   const warningsList = [];
-  if (bomJson && bomJson.components) {
+  if (bomJson?.components) {
     for (const comp of bomJson.components) {
       if (comp.type === "cryptographic-asset") {
-        if (comp.purl && comp.purl.length) {
+        if (comp.purl?.length) {
           errorList.push(
             `purl should not be defined for cryptographic-asset ${comp.purl}`,
           );
@@ -181,7 +178,7 @@ export const validatePurls = (bomJson) => {
     console.log("===== WARNINGS =====");
     console.log(warningsList);
   }
-  if (errorList.length != 0) {
+  if (errorList.length !== 0) {
     console.log(errorList);
     return false;
   }
@@ -219,7 +216,7 @@ export const validateRefs = (bomJson) => {
   const errorList = [];
   const warningsList = [];
   const refMap = buildRefs(bomJson);
-  if (bomJson && bomJson.dependencies) {
+  if (bomJson?.dependencies) {
     for (const dep of bomJson.dependencies) {
       if (
         dep.ref.includes("%40") ||
@@ -251,7 +248,7 @@ export const validateRefs = (bomJson) => {
     console.log("===== WARNINGS =====");
     console.log(warningsList);
   }
-  if (errorList.length != 0) {
+  if (errorList.length !== 0) {
     console.log(errorList);
     return false;
   }