fix(ISV-5784): improve typing

Signed-off-by: Martin Jediny <jedinym@proton.me>

Author: jedinym

sbom/sbomlib.py

@@ -359,8 +359,12 @@ def get_purl_arch(purl_str: str) -> Optional[str]:
     """
     Get the arch qualifier from a PackageURL.
     """
-    purl = PackageURL.from_string(purl_str).to_dict()
-    return purl["qualifiers"].get("arch")  # type: ignore
+    purl = PackageURL.from_string(purl_str)
+    if isinstance(purl.qualifiers, dict):
+        return purl.qualifiers.get("arch")
+
+    logger.warning("Parsed qualifiers from purl %s are not a dictionary.", purl_str)
+    return None
 
 
 def get_purl_digest(purl_str: str) -> str:
@@ -369,5 +373,5 @@ def get_purl_digest(purl_str: str) -> str:
     """
     purl = PackageURL.from_string(purl_str)
     if purl.version is None:
-        raise ValueError("SBOM contains invalid OCI Purl: %s", purl_str)
+        raise SBOMError("SBOM contains invalid OCI Purl: %s", purl_str)
     return purl.version

sbom/test_create_product_sbom.py

@@ -10,7 +10,7 @@
 from sbom.create_product_sbom import ReleaseNotes, create_sbom
 from sbom.sbomlib import Component, Image, IndexImage, Snapshot
 
-Digests = namedtuple("TestDigests", ["single_arch", "multi_arch"])
+Digests = namedtuple("Digests", ["single_arch", "multi_arch"])
 DIGESTS = Digests(
     single_arch="sha256:8f2e5e7f92d8e8d2e9b3e9c1a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0",
     multi_arch="sha256:e4d2f37a563fcfa4d3a1ab476ded714c56f75f916d30c3a33815d64d41f78534",