[ISV-5787] Remove child digests from externalRefs #269
Conversation
|
@jedinym please take a look. Thanks |
| _, val = self.digest.split(":") | ||
| return val | ||
|
|
||
| def purls(self, index_digest: Optional[str] = None) -> list[str]: |
There was a problem hiding this comment.
Nitpick: I think this argument should no longer be Optional with a default value.
| def purls(self, index_digest: Optional[str] = None) -> list[str]: | |
| def purls(self, index_digest: str) -> list[str]: |
There was a problem hiding this comment.
Good call on making it non-Optional. When I checkout the PR locally, my editor reports type errors which seem like potentially genuine bugs. Will comment inline
|
@BorekZnovustvoritel What is the process on getting this into usage? Do we need to merge and wait for the image to be built, then change the digest in build-definitions? |
Yes, I think so. Refer to this PR |
BorekZnovustvoritel
left a comment
BorekZnovustvoritel
left a comment
There was a problem hiding this comment.
LGTM, this should work fine.
sbom-utility-scripts/scripts/index-image-sbom-script/index_image_sbom_script.py
Outdated
Show resolved
Hide resolved
sbom-utility-scripts/scripts/index-image-sbom-script/index_image_sbom_script.py
Outdated
Show resolved
Hide resolved
mavaras
force-pushed
the
ISV-5787
branch
3 times, most recently
from
3189c1e to
e2531b6
Compare
sbom-utility-scripts/scripts/index-image-sbom-script/index_image_sbom_script.py
Outdated
Show resolved
Hide resolved
sbom-utility-scripts/scripts/index-image-sbom-script/index_image_sbom_script.py
Outdated
Show resolved
Hide resolved
| def purls(self) -> list[str]: | ||
| qualifiers = {"repository_url": self.repository} | ||
| if self.arch is not None: | ||
| qualifiers["arch"] = self.arch | ||
|
|
||
| purl = PackageURL( | ||
| type="oci", | ||
| name=self.name, | ||
| version=self.digest, | ||
| qualifiers=qualifiers, | ||
| ).to_string() | ||
|
|
||
| return [purl] |
There was a problem hiding this comment.
This function always returns a single value, let's ditch the list.
Tests updated. Passing locally |
Ah, I think it was the script code that needed an update, not the tests. Now, the test data has different digests in the purl for the |
- Updates build-time index SBOM creation script - Udpates tests accordingly
|
/ok-to-test |
|
LGTM |
|
/retest |
|
/ok-to-test |
|
quay.io is not too stable these days, huh /retest |
|
another 502 |
4 participants
The build-time index SBOM creation script does not create index image SBOMs as per guidelines (the externalRefs should only contain purls with versions pointing to the index image, not the child digests).