fix: mypy

Author: bclindner

src/mobster/cmd/generate/base.py

@@ -9,7 +9,6 @@
 from spdx_tools.spdx.writer.write_anything import write_file
 
 from mobster.cmd.base import Command
-from mobster.cmd.generate.oci_image.sbomgen import SBOMMetadata
 
 LOGGER = logging.getLogger(__name__)
 
@@ -21,7 +20,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
         self._content: Any = None
-        self._metadata: SBOMMetadata | None = None
+        self._metadata: Any = None
 
     @property
     def content(self) -> Any:

src/mobster/cmd/generate/oci_image/sbomgen.py

@@ -1,6 +1,7 @@
 """Dataclasses for parsing SBOM metadata files provided by sbomgen."""
 
 from dataclasses import dataclass
+from typing import Any, Self
 
 from mobster.error import SBOMError
 
@@ -13,7 +14,7 @@ class ImageData:
     digest: str
 
     @classmethod
-    def from_dict(cls, data: dict):
+    def from_dict(cls, data: dict[str, str]) -> Self:
         """Create a new ImageData from a dict."""
         try:
             pullspec = data["pullspec"]
@@ -37,7 +38,7 @@ class SBOMMetadata:
     extra_images: list[ImageData]
 
     @classmethod
-    def from_dict(cls, data: dict):
+    def from_dict(cls, data: dict[str, Any]) -> Self:
         """
         Create a new SBOMMetadata from a dict.
         (This also attempts to map any contained ImageData with

tests/cmd/generate/oci_image/test_module_init.py

@@ -299,7 +299,7 @@ async def test_GenerateOciImageCommand__handle_bom_inputs(
     mock_load_hermeto_sbom.return_value = mock_hermeto_data
     mock_merge.return_value = mock_merged_data
 
-    def mock_metadata():
+    def mock_metadata() -> None:
         command._metadata = SBOMMetadata(
             image=ImageData(pullspec="foo", digest="bar"),
             base_images=[],

tests/integration/img_utils.py

@@ -20,7 +20,7 @@ def make_metadata_yaml(
         "base_images": [],
     }
     if parent_img:
-        metadata["base_images"].append(
+        metadata["base_images"].push(  # type: ignore[attr-defined]
             {
                 "pullspec": f"{parent_img.repository}:{parent_img.tag}",
                 "digest": parent_img.digest,

tests/integration/test_tekton.py

@@ -302,6 +302,7 @@ def get_sbom_from_test_case(case: GenerateOciImageTestCase, image_digest: str) -
     Load an SBOM from a GenerateOciImageTestCase, replaces digests with
     specified and return it parsed to bytes.
     """
+    assert case.args.metadata_path is not None
     with open(case.expected_sbom_path) as fp, open(case.args.metadata_path) as md_fp:
         metadata = yaml.load(md_fp, Loader=yaml.Loader)
         digest_from_metadata = metadata["image"]["digest"]