actions/component-detection-dependency-submission-action
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to fix broken tests

Browse Source
This commit is contained in:
Justin Hutchings
2022-10-04 16:22:27 -07:00
parent 96880dc2ca
commit 277d8216c2
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Generated Vendored
+9 -7
View File
@@ -21880,14 +21880,16 @@ function getManifestFromSpdxFile(document, fileName) {
document.packages?.forEach(pkg => { document.packages?.forEach(pkg => {
let packageName = pkg.name; let packageName = pkg.name;
let packageVersion = pkg.packageVersion; let packageVersion = pkg.packageVersion;
let referenceLocator = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator;
let genericPurl = `pkg:generic/${packageName}@${packageVersion}`;
// SPDX 2.3 defines a purl field // SPDX 2.3 defines a purl field
let purl = pkg.purl; let purl;
if (pkg.purl != undefined) {
if (purl == null || purl == undefined) { purl = pkg.purl;
purl = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator; } else if (referenceLocator != undefined) {
} else if (purl == null || purl == undefined) { purl = referenceLocator;
purl = `pkg:generic/${packageName}@${packageVersion}`; } else {
purl = genericPurl;
} }
// Working around weird encoding issues from an SBOM generator // Working around weird encoding issues from an SBOM generator
dist/index.js.map
Generated Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
index.js
+9 -7
View File
@@ -43,14 +43,16 @@ function getManifestFromSpdxFile(document, fileName) {
document.packages?.forEach(pkg => { document.packages?.forEach(pkg => {
let packageName = pkg.name; let packageName = pkg.name;
let packageVersion = pkg.packageVersion; let packageVersion = pkg.packageVersion;
let referenceLocator = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator;
let genericPurl = `pkg:generic/${packageName}@${packageVersion}`;
// SPDX 2.3 defines a purl field // SPDX 2.3 defines a purl field
let purl = pkg.purl; let purl;
if (pkg.purl != undefined) {
if (purl == null || purl == undefined) { purl = pkg.purl;
purl = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator; } else if (referenceLocator != undefined) {
} else if (purl == null || purl == undefined) { purl = referenceLocator;
purl = `pkg:generic/${packageName}@${packageVersion}`; } else {
purl = genericPurl;
} }
// Working around weird encoding issues from an SBOM generator // Working around weird encoding issues from an SBOM generator