fix(spdx): add workaround for no src packages #4118
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
knqyf263
reviewed
Apr 25, 2023
| @@ -282,7 +282,7 @@ func (m *Marshaler) pkgToSpdxPackage(t, pkgDownloadLocation string, class types. | |||
| } | |||
|
|
|||
| var pkgSrcInfo string | |||
| if class == types.ClassOSPkg { | |||
| if class == types.ClassOSPkg && pkg.SrcName != "" { | |||
There was a problem hiding this comment.
Would you elaborate on that?
There was a problem hiding this comment.
Some packages don't have srcName.
e.g.
{
"ID": "gpg-pubkey@c87f5b1a-593863f8.",
"Name": "gpg-pubkey",
"Version": "c87f5b1a",
"Release": "593863f8",
"Arch": "None",
"Licenses": [
"pubkey"
],
"Layer": {}
},
In this case, spdx output empty SourceInfo.
##### Package: gpg-pubkey
PackageName: gpg-pubkey
SPDXID: SPDXRef-Package-6c5513710c857f3f
PackageVersion: c87f5b1a-593863f8
PackageDownloadLocation: NONE
FilesAnalyzed: false
PackageSourceInfo: built package from:
PackageLicenseConcluded: pubkey
PackageLicenseDeclared: pubkey
ExternalRef: PACKAGE-MANAGER purl pkg:rpm/amazon/gpg-pubkey@c87f5b1a-593863f8?arch=None&distro=amazon-2%20%28Karoo%29
PackageAttributionText: PkgID: gpg-pubkey@c87f5b1a-593863f8.
knqyf263
approved these changes
Apr 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The existing implementation already supported SPDX.
Fixed a bug in SourceInfo information in some packages as an implementation of SPDX.
And, support cyclonedx sbom for vm scan.
Related issues
Checklist