Tidy up SPDX parsing #3358
Merged
Tidy up SPDX parsing #3358
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
It seems like the SPDX parser can produce reuslts that contain nils in unexpected places. This patch introduces more defensive checks to skip over nil values, or to explicitly populate them if they haven't been provided exactly. Signed-off-by: Justin Chadwell <me@jedevc.com>
The new SPDX JSON parsers are significantly simpler, and use a simple json.Unmarshal, which reduces the ability of the tooling to panic. Additionally, it easily handles the case of a single file being owned by multiple packages, which otherwise resulted in nil values in the Package.Files slices. Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
tonistiigi
approved these changes
Dec 6, 2022
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.
🛠️ Fixes #3344.
This PR provides 3 upgrades to the SPDX parser:
nilpointer as in Daemon panics when exporting sbom #3344.json.Unmarshal. This means we can drop ourpanic/recoverylogic, and additionally prevents mishandling of a single file being owned by multiple packages, which is the underlying issue that causes Daemon panics when exporting sbom #3344.