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

Fix manifest parsing bug

Browse Source
This commit is contained in:
Justin Hutchings
2022-10-04 13:37:13 -07:00
parent 16206b8051
commit 572bb2d77a
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dist/index.js generated vendored
View File

@@ -21870,21 +21870,24 @@ async function run() {
(0,_github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.submitSnapshot)(snapshot);
}
function getManifestFromSpdxFile(content, fileName) {
function getManifestFromSpdxFile(document, fileName) {
core.debug(`Processing ${fileName}`);
core.debug(`Content: ${content}`);
let manifest = new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Manifest(fileName);
content.packages?.forEach(pkg => {
let manifest = new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Manifest(document.name, fileName);
document.packages?.forEach(pkg => {
let packageName = pkg.packageName;
let packageVersion = pkg.packageVersion;
let purl = pkg.purl;
manifest.addPackage(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(packageName, packageVersion, purl));
snapshot.addManifest(manifest);
});
return manifest;
let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage");
if (relationships.length > 0) {
manifest.addIndirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(packageName, packageVersion, purl, new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.BuildTarget(rel.spdxElementId)));
} else {
manifest.addDirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(packageName, packageVersion, purl, new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.BuildTarget(rel.spdxElementId)));
}
});
return manifest;
}
function getManifestsFromSpdxFiles(files) {
core.debug(`Processing ${files.length} files`);
let manifests = [];

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

23
index.js
View File

@@ -33,21 +33,24 @@ async function run() {
submitSnapshot(snapshot);
}
function getManifestFromSpdxFile(content, fileName) {
function getManifestFromSpdxFile(document, fileName) {
core.debug(`Processing ${fileName}`);
core.debug(`Content: ${content}`);
let manifest = new Manifest(fileName);
content.packages?.forEach(pkg => {
let manifest = new Manifest(document.name, fileName);
document.packages?.forEach(pkg => {
let packageName = pkg.packageName;
let packageVersion = pkg.packageVersion;
let purl = pkg.purl;
manifest.addPackage(new Package(packageName, packageVersion, purl));
snapshot.addManifest(manifest);
});
return manifest;
let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage");
if (relationships.length > 0) {
manifest.addIndirectDependency(new Package(packageName, packageVersion, purl, new BuildTarget(rel.spdxElementId)));
} else {
manifest.addDirectDependency(new Package(packageName, packageVersion, purl, new BuildTarget(rel.spdxElementId)));
}
});
return manifest;
}
function getManifestsFromSpdxFiles(files) {
core.debug(`Processing ${files.length} files`);
let manifests = [];