Reduce validation errors

Signed-off-by: Prabhu Subramanian <[email protected]>
CycloneDX · Jan 20, 2025 · 5b4c4bd · 5b4c4bd
1 parent daabb52
commit 5b4c4bd
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
@@ -5009,6 +5009,35 @@ export async function parsePyLockData(lockData, lockFile, pyProjectFile) {
           ) {
             dependentPkg.properties.push(pprop);
             addedValue[pprop.value] = true;
+          } else if (pprop.name === "internal:is_workspace") {
+            dependentPkg.properties.push({
+              name: "internal:workspaceRef",
+              value: parentPkg["bom-ref"],
+            });
+            dependentPkg.properties.push({
+              name: "internal:workspaceSrcFile",
+              value: workspaceRefPyProjMap[parentPkg["bom-ref"]],
+            });
+            addedValue[parentPkg["bom-ref"]] = true;
+            addedValue[workspaceRefPyProjMap[parentPkg["bom-ref"]]] = true;
+            const childDeps = depsMap[dependentPkg["bom-ref"]];
+            for (const childRef of childDeps) {
+              if (!childRef.startsWith("pkg:")) {
+                continue;
+              }
+              const childPkg = pkgBomRefMap[childRef];
+              if (childPkg) {
+                childPkg.properties = childPkg.properties || [];
+                childPkg.properties.push({
+                  name: "internal:workspaceRef",
+                  value: parentPkg["bom-ref"],
+                });
+                childPkg.properties.push({
+                  name: "internal:workspaceSrcFile",
+                  value: workspaceRefPyProjMap[parentPkg["bom-ref"]],
+                });
+              }
+            }
           }
         }
       }

diff --git a/lib/helpers/validator.js b/lib/helpers/validator.js
@@ -298,7 +298,8 @@ export function validateProps(bomJson) {
         if (
           ["library", "framework"].includes(comp.type) &&
           isWorkspaceMode &&
-          !workspacePropFound
+          !workspacePropFound &&
+          comp?.scope !== "optional"
         ) {
           warningsList.push(
             `${comp["bom-ref"]} lacks workspace-related properties.`,

diff --git a/types/lib/helpers/utils.d.ts.map b/types/lib/helpers/utils.d.ts.map
diff --git a/types/lib/helpers/validator.d.ts.map b/types/lib/helpers/validator.d.ts.map