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

Fix bugs

Browse Source
This commit is contained in:
Justin Hutchings
2022-10-04 14:17:41 -07:00
parent 8b44225fed
commit e374e45897
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Generated Vendored
+5 -3
View File
@@ -21874,12 +21874,14 @@ function getManifestFromSpdxFile(document, fileName) {
core.debug(`getManifestFromSpdxFile processing ${fileName}`); core.debug(`getManifestFromSpdxFile processing ${fileName}`);
let manifest = new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Manifest(document.name, fileName); let manifest = new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Manifest(document.name, fileName);
//core.debug(`Processing ${JSON.stringify(document)}`);
core.debug(`Processing ${document.packages?.length}`); core.debug(`Processing ${document.packages?.length} packages`);
document.packages?.forEach(pkg => { document.packages?.forEach(pkg => {
let packageName = pkg.packageName; let packageName = pkg.packageName;
let packageVersion = pkg.packageVersion; let packageVersion = pkg.packageVersion;
let purl = pkg.purl; let purl = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator;
let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage"); let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage");
if (relationships != null && relationships.length > 0) { if (relationships != null && relationships.length > 0) {
manifest.addIndirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(purl)); manifest.addIndirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(purl));
dist/index.js.map
Generated Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
index.js
+5 -3
View File
@@ -37,12 +37,14 @@ function getManifestFromSpdxFile(document, fileName) {
core.debug(`getManifestFromSpdxFile processing ${fileName}`); core.debug(`getManifestFromSpdxFile processing ${fileName}`);
let manifest = new Manifest(document.name, fileName); let manifest = new Manifest(document.name, fileName);
//core.debug(`Processing ${JSON.stringify(document)}`);
core.debug(`Processing ${document.packages?.length}`); core.debug(`Processing ${document.packages?.length} packages`);
document.packages?.forEach(pkg => { document.packages?.forEach(pkg => {
let packageName = pkg.packageName; let packageName = pkg.packageName;
let packageVersion = pkg.packageVersion; let packageVersion = pkg.packageVersion;
let purl = pkg.purl; let purl = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator;
let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage"); let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage");
if (relationships != null && relationships.length > 0) { if (relationships != null && relationships.length > 0) {
manifest.addIndirectDependency(new Package(purl)); manifest.addIndirectDependency(new Package(purl));