Base images SBOM script: support SPDX #201
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
|
Note: you really want to go commit by commit when reviewing this. The ones that really matter are:
The rest is formatting, refactoring etc. |
|
Based on #163 |
* disable flake8 line-length check (it's useless, we have 'black' for formatting checks) * drop unnecessary '# noqa' comments Signed-off-by: Adam Cmiel <[email protected]>
This script will need some changes soon, those will be far easier to do with type checking enabled. Signed-off-by: Adam Cmiel <[email protected]>
Just move the code from main to a function and slightly simplify. This is preparation for SPDX support. Signed-off-by: Adam Cmiel <[email protected]>
Takes a list of base images in SPDX format, adds them to .packages, updates .relationships correspondingly. Signed-off-by: Adam Cmiel <[email protected]>
Auto-detect the format of the input SBOM. Call the right SBOM-update function based on the format. Signed-off-by: Adam Cmiel <[email protected]>
Also fix some minor formatting issues Signed-off-by: Adam Cmiel <[email protected]>
Don't break up single lines into multiple lines Signed-off-by: Adam Cmiel <[email protected]>
It's not a valid part of CycloneDX. Remove it from the example data. Signed-off-by: Adam Cmiel <[email protected]>
Consolidate the test_main_* functions into a single parameterized test. Completely equivalent to the previous tests, just with less duplication. Signed-off-by: Adam Cmiel <[email protected]>
Signed-off-by: Adam Cmiel <[email protected]>
Previously, the container image used python3.9 while tests ran on python(unknown but > 3.9). Upgrade container to python3.12 and set tests to run on 3.12 explicitly. Signed-off-by: Adam Cmiel <[email protected]>
chmeliik
force-pushed
the
baseimage-sbom-script-spdx
branch
from
afa8a92 to
19e0101
Compare
|
Dropped the line-length change - I noticed all the other scripts use 120 as well. |
mmorhun
approved these changes
Dec 13, 2024
tkdchen
approved these changes
Dec 16, 2024
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.
https://issues.redhat.com/browse/STONEBLD-3044