Skip to content

fix(ISV-5982): link to arch-specific images #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jedinym merged 2 commits into from
Jun 6, 2025
Merged

fix(ISV-5982): link to arch-specific images #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59e3c40
test(ISV-5982): use correct testing data
jedinym Jun 2, 2025
afc2b99
fix(ISV-5982): use child digest in index SBOM purls
jedinym Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/mobster/cmd/generate/oci_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,19 @@ def get_child_packages(
continue

arch = manifest.get("platform", {}).get("architecture")

LOGGER.info("Found child image with architecture: %s", arch)

# assign actual image architecture once image SBOMs contain
# the architecture in their purls
arch_image = Image(
arch=arch,
digest=self.cli_args.index_image_digest,
digest=manifest["digest"],
tag=index_image.tag,
repository=index_image.repository,
arch=None,
)
spdx_id = arch_image.propose_spdx_id()
package = spdx.get_package(
arch_image,
spdx_id,
arch_image, spdx_id, package_name=f"{arch_image.name}_{arch}"
)
relationship = self.get_child_image_relationship(spdx_id)

Expand Down
6 changes: 4 additions & 2 deletions src/mobster/sbom/spdx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def get_creation_info(sbom_name: str) -> CreationInfo:
)


def get_package(image: Image, spdx_id: str) -> Package:
def get_package(image: Image, spdx_id: str, package_name: str | None = None) -> Package:
"""
Transform the parsed image object into SPDX package object.

Expand All @@ -53,10 +53,12 @@ def get_package(image: Image, spdx_id: str) -> Package:
Returns:
Package: A package object representing the OCI image.
"""
if not package_name:
package_name = image.name if not image.arch else f"{image.name}_{image.arch}"

package = Package(
spdx_id=spdx_id,
name=image.name if not image.arch else f"{image.name}_{image.arch}",
name=package_name,
version=image.tag,
download_location=SpdxNoAssertion(),
supplier=Actor(ActorType.ORGANIZATION, "Red Hat"),
Expand Down
2 changes: 1 addition & 1 deletion tests/data/index_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"manifests": [
{
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"digest": "sha256:4b4976d86eefeedab6884c9d2923206c6c3c2e2471206f97fd9d7aaaecbc04ac",
"digest": "sha256:e692418e4cbaf90ca69d05a66403747baa33ee08806650b51fab815ad7fc331f",
"size": 659,
"platform": {
"architecture": "amd64",
Expand Down
32 changes: 16 additions & 16 deletions tests/data/index_manifest_sbom.spdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@
"versionInfo": "latest"
},
{
"SPDXID": "SPDXRef-image-ubi-eed2511e5b2f6c7891d79466ef64ed13e9e29e8fe536709666084922e3ff2ff6",
"SPDXID": "SPDXRef-image-ubi-bbbda2a1b066f44bbf56e9c0af7f080356e1f200fb4b3671da0ed6041b4b5a6b",
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "4b4976d86eefeedab6884c9d2923206c6c3c2e2471206f97fd9d7aaaecbc04ac"
"checksumValue": "e692418e4cbaf90ca69d05a66403747baa33ee08806650b51fab815ad7fc331f"
}
],
"downloadLocation": "NOASSERTION",
"externalRefs": [
{
"referenceCategory": "PACKAGE_MANAGER",
"referenceLocator": "pkg:oci/ubi@sha256:4b4976d86eefeedab6884c9d2923206c6c3c2e2471206f97fd9d7aaaecbc04ac?arch=amd64&repository_url=registry.redhat.io/ubi10-beta/ubi",
"referenceLocator": "pkg:oci/ubi@sha256:e692418e4cbaf90ca69d05a66403747baa33ee08806650b51fab815ad7fc331f?repository_url=registry.redhat.io/ubi10-beta/ubi",
"referenceType": "purl"
}
],
Expand All @@ -58,18 +58,18 @@
"versionInfo": "latest"
},
{
"SPDXID": "SPDXRef-image-ubi-2ded713f6a4f846c080a42f73f1e1af6f5b4a7653825480f0e0f1d86dec89375",
"SPDXID": "SPDXRef-image-ubi-de3525a3ab798362b54ba8450f5fb3a7ee87cd5fadc8eaf7e4536478d5c82a63",
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "4b4976d86eefeedab6884c9d2923206c6c3c2e2471206f97fd9d7aaaecbc04ac"
"checksumValue": "c85623b2a5822b6e101efb05424919da653e7c15e2e3e150871c48957087d65a"
}
],
"downloadLocation": "NOASSERTION",
"externalRefs": [
{
"referenceCategory": "PACKAGE_MANAGER",
"referenceLocator": "pkg:oci/ubi@sha256:4b4976d86eefeedab6884c9d2923206c6c3c2e2471206f97fd9d7aaaecbc04ac?arch=arm64&repository_url=registry.redhat.io/ubi10-beta/ubi",
"referenceLocator": "pkg:oci/ubi@sha256:c85623b2a5822b6e101efb05424919da653e7c15e2e3e150871c48957087d65a?repository_url=registry.redhat.io/ubi10-beta/ubi",
"referenceType": "purl"
}
],
Expand All @@ -80,18 +80,18 @@
"versionInfo": "latest"
},
{
"SPDXID": "SPDXRef-image-ubi-e568fd454597f2450f75978641c020c50874cf4760e986a1cd9f4a1b3fbc2c4c",
"SPDXID": "SPDXRef-image-ubi-d75f9381292039ba5081f69b5fda162dc04c243aaa9c647147d72af4b3354ff9",
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "4b4976d86eefeedab6884c9d2923206c6c3c2e2471206f97fd9d7aaaecbc04ac"
"checksumValue": "874debf2354befc6ce90ccee2cbdab4abe2bf437aa6f4ab7649f7aeb4d57373a"
}
],
"downloadLocation": "NOASSERTION",
"externalRefs": [
{
"referenceCategory": "PACKAGE_MANAGER",
"referenceLocator": "pkg:oci/ubi@sha256:4b4976d86eefeedab6884c9d2923206c6c3c2e2471206f97fd9d7aaaecbc04ac?arch=s390x&repository_url=registry.redhat.io/ubi10-beta/ubi",
"referenceLocator": "pkg:oci/ubi@sha256:874debf2354befc6ce90ccee2cbdab4abe2bf437aa6f4ab7649f7aeb4d57373a?repository_url=registry.redhat.io/ubi10-beta/ubi",
"referenceType": "purl"
}
],
Expand All @@ -102,18 +102,18 @@
"versionInfo": "latest"
},
{
"SPDXID": "SPDXRef-image-ubi-b7c40d971296f5b6197d0a0833e91f4172720d37db4089ebb1159a9bbe68b52e",
"SPDXID": "SPDXRef-image-ubi-4b9921b7d73887e8f655dc51f8efbe4c76ea010f758dea73dfac7044aa0cc44b",
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "4b4976d86eefeedab6884c9d2923206c6c3c2e2471206f97fd9d7aaaecbc04ac"
"checksumValue": "c8799d5d851ddd76729ebb7227818f8c0030c4443c9e8542a75ff393fc90ce12"
}
],
"downloadLocation": "NOASSERTION",
"externalRefs": [
{
"referenceCategory": "PACKAGE_MANAGER",
"referenceLocator": "pkg:oci/ubi@sha256:4b4976d86eefeedab6884c9d2923206c6c3c2e2471206f97fd9d7aaaecbc04ac?arch=ppc64le&repository_url=registry.redhat.io/ubi10-beta/ubi",
"referenceLocator": "pkg:oci/ubi@sha256:c8799d5d851ddd76729ebb7227818f8c0030c4443c9e8542a75ff393fc90ce12?repository_url=registry.redhat.io/ubi10-beta/ubi",
"referenceType": "purl"
}
],
Expand All @@ -131,22 +131,22 @@
"relationshipType": "DESCRIBES"
},
{
"spdxElementId": "SPDXRef-image-ubi-eed2511e5b2f6c7891d79466ef64ed13e9e29e8fe536709666084922e3ff2ff6",
"spdxElementId": "SPDXRef-image-ubi-bbbda2a1b066f44bbf56e9c0af7f080356e1f200fb4b3671da0ed6041b4b5a6b",
"relatedSpdxElement": "SPDXRef-image-index",
"relationshipType": "VARIANT_OF"
},
{
"spdxElementId": "SPDXRef-image-ubi-2ded713f6a4f846c080a42f73f1e1af6f5b4a7653825480f0e0f1d86dec89375",
"spdxElementId": "SPDXRef-image-ubi-de3525a3ab798362b54ba8450f5fb3a7ee87cd5fadc8eaf7e4536478d5c82a63",
"relatedSpdxElement": "SPDXRef-image-index",
"relationshipType": "VARIANT_OF"
},
{
"spdxElementId": "SPDXRef-image-ubi-e568fd454597f2450f75978641c020c50874cf4760e986a1cd9f4a1b3fbc2c4c",
"spdxElementId": "SPDXRef-image-ubi-d75f9381292039ba5081f69b5fda162dc04c243aaa9c647147d72af4b3354ff9",
"relatedSpdxElement": "SPDXRef-image-index",
"relationshipType": "VARIANT_OF"
},
{
"spdxElementId": "SPDXRef-image-ubi-b7c40d971296f5b6197d0a0833e91f4172720d37db4089ebb1159a9bbe68b52e",
"spdxElementId": "SPDXRef-image-ubi-4b9921b7d73887e8f655dc51f8efbe4c76ea010f758dea73dfac7044aa0cc44b",
"relatedSpdxElement": "SPDXRef-image-index",
"relationshipType": "VARIANT_OF"
}
Expand Down