Skip to content

Commit b3e0bed

Browse files
committed
fix: linter fixes
1 parent 9b286b2 commit b3e0bed

File tree

3 files changed

+35
-28
lines changed

3 files changed

+35
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
extend_sbom_with_base_images,
2525
get_digest_for_image_ref,
2626
)
27+
from mobster.cmd.generate.oci_image.buildprobe import SBOMMetadata
2728
from mobster.cmd.generate.oci_image.contextual_sbom.builder import (
2829
BuilderContextualizationError,
2930
BuilderPkgMetadata,
@@ -40,7 +41,6 @@
4041
from mobster.cmd.generate.oci_image.hermeto_sbom_filter import (
4142
filter_hermeto_sbom_by_arch,
4243
)
43-
from mobster.cmd.generate.oci_image.buildprobe import SBOMMetadata
4444
from mobster.cmd.generate.oci_image.spdx_utils import (
4545
DocumentIndexOCI,
4646
normalize_and_load_sbom,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import json
44
import logging
55
from datetime import datetime, timezone
6-
from pathlib import Path
76
from typing import Any
87

98
from cyclonedx.model import Property
@@ -58,7 +57,6 @@ async def get_digest_for_image_ref(image_ref: str, arch: Any = None) -> str | No
5857
return None
5958

6059

61-
6260
async def get_objects_for_base_images(
6361
base_images_refs: list[str | None],
6462
) -> dict[str, Image]:
Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,58 @@
1+
import pytest
2+
13
from mobster.cmd.generate.oci_image.buildprobe import ImageData, SBOMMetadata
24
from mobster.error import SBOMError
3-
import pytest
45

5-
def test_imagedata_ok():
6+
7+
def test_imagedata_ok() -> None:
68
pullspec = "quay.io/asdf:123"
79
digest = "sha256:1234567890123456789012345678901212345678901234567890123456789012"
8-
imagedata = ImageData.from_dict({
9-
"pullspec": pullspec,
10-
"digest": digest,
11-
})
10+
imagedata = ImageData.from_dict(
11+
{
12+
"pullspec": pullspec,
13+
"digest": digest,
14+
}
15+
)
1216
assert imagedata.pullspec == pullspec
1317
assert imagedata.digest == digest
1418

15-
def test_imagedata_bad():
19+
20+
def test_imagedata_bad() -> None:
1621
with pytest.raises(SBOMError):
1722
ImageData.from_dict({})
1823

19-
def test_sbommetadata_ok():
24+
25+
def test_sbommetadata_ok() -> None:
2026
pullspec = "quay.io/asdf:123"
2127
digest = "sha256:1234567890123456789012345678901212345678901234567890123456789012"
22-
sbom_metadata = SBOMMetadata.from_dict({
23-
"image": {
24-
"pullspec": pullspec,
25-
"digest": digest,
26-
},
27-
"base_images": [
28-
{
28+
sbom_metadata = SBOMMetadata.from_dict(
29+
{
30+
"image": {
2931
"pullspec": pullspec,
3032
"digest": digest,
31-
}
32-
],
33-
"extra_images": [
34-
{
35-
"pullspec": pullspec,
36-
"digest": digest,
37-
}
38-
]
39-
})
33+
},
34+
"base_images": [
35+
{
36+
"pullspec": pullspec,
37+
"digest": digest,
38+
}
39+
],
40+
"extra_images": [
41+
{
42+
"pullspec": pullspec,
43+
"digest": digest,
44+
}
45+
],
46+
}
47+
)
4048
assert sbom_metadata.image.pullspec == pullspec
4149
assert sbom_metadata.image.digest == digest
4250
assert sbom_metadata.base_images[0].pullspec == pullspec
4351
assert sbom_metadata.base_images[0].digest == digest
4452
assert sbom_metadata.extra_images[0].pullspec == pullspec
4553
assert sbom_metadata.extra_images[0].digest == digest
4654

47-
def test_sbommetadata_bad():
55+
56+
def test_sbommetadata_bad() -> None:
4857
with pytest.raises(SBOMError):
4958
SBOMMetadata.from_dict({})

0 commit comments

Comments
 (0)