refactor(BA-2841): Extract spec instantiation into fixtures in ImageCreatorAdapter tests

- Add 4 scenario-specific spec fixtures
- Simplify test functions to use fixtures instead of inline spec creation

Author: fregataa

src/ai/backend/manager/container_registry/base.py

@@ -22,10 +22,8 @@
 import yarl
 
 from ai.backend.common.bgtask.reporter import ProgressReporter
-from ai.backend.common.data.permission.types import GLOBAL_SCOPE_ID, EntityType, ScopeType
 from ai.backend.common.docker import (
     ImageRef,
-    LabelName,
     arch_name_aliases,
     validate_image_labels,
 )
@@ -50,9 +48,9 @@
 from ai.backend.manager.models.image import ImageIdentifier, ImageRow
 from ai.backend.manager.models.utils import ExtendedAsyncSAEngine
 from ai.backend.manager.repositories.base.rbac.entity_creator import (
-    RBACEntityCreator,
     execute_rbac_entity_creator,
 )
+from ai.backend.manager.repositories.image.adapter import ImageCreatorAdapter
 from ai.backend.manager.repositories.image.creators import ImageRowCreatorSpec
 
 log = BraceStyleAdapter(logging.getLogger(__spec__.name))
@@ -110,6 +108,7 @@ def __init__(
         }
         self.credentials = {}
         self.ssl_verify = ssl_verify
+        self._creator_adapter = ImageCreatorAdapter()
 
     @actxmgr
     async def prepare_client_session(self) -> AsyncIterator[tuple[yarl.URL, aiohttp.ClientSession]]:
@@ -207,16 +206,7 @@ async def commit_rescan_result(self) -> list[ImageData]:
                             await reporter.update(1, message=progress_msg)
                         continue
 
-                    labels = update["labels"]
-                    owner_labels = labels.get(LabelName.CUSTOMIZED_OWNER)
-                    if owner_labels is not None:
-                        scope_type = ScopeType.USER
-                        _, _, scope_id = owner_labels.partition(":")
-                    else:
-                        scope_type = ScopeType.GLOBAL
-                        scope_id = GLOBAL_SCOPE_ID
-
-                    rbac_creator = RBACEntityCreator(
+                    rbac_creator = self._creator_adapter.build(
                         spec=ImageRowCreatorSpec(
                             name=parsed_img.canonical,
                             project=self.registry_info.project,
@@ -232,10 +222,7 @@ async def commit_rescan_result(self) -> list[ImageData]:
                             accelerators=update.get("accels"),
                             labels=update["labels"],
                             status=ImageStatus.ALIVE,
-                        ),
-                        scope_type=scope_type,
-                        scope_id=scope_id,
-                        entity_type=EntityType.IMAGE,
+                        )
                     )
                     result = await execute_rbac_entity_creator(session, rbac_creator)
                     scanned_images.append(result.row.to_dataclass())

src/ai/backend/manager/repositories/image/adapter.py

@@ -4,6 +4,7 @@
 
 from ai.backend.common.data.permission.types import GLOBAL_SCOPE_ID, EntityType, ScopeType
 from ai.backend.common.docker import LabelName
+from ai.backend.manager.models.image.row import ImageRow
 from ai.backend.manager.repositories.base.rbac.adapter import CreatorAdapter
 from ai.backend.manager.repositories.base.rbac.entity_creator import RBACEntityCreator
 from ai.backend.manager.repositories.image.creators import ImageRowCreatorSpec
@@ -18,7 +19,7 @@ class ImageCreatorAdapter(CreatorAdapter[ImageRowCreatorSpec]):
     """
 
     @override
-    def build(self, spec: ImageRowCreatorSpec) -> RBACEntityCreator:
+    def build(self, spec: ImageRowCreatorSpec) -> RBACEntityCreator[ImageRow]:
         labels: dict[str, Any] = spec.labels or {}
         owner_label = labels.get(LabelName.CUSTOMIZED_OWNER)
 

tests/unit/manager/repositories/image/test_adapter.py

@@ -34,19 +34,42 @@ def base_spec_kwargs(self) -> dict[str, Any]:
     def user_id(self) -> str:
         return str(uuid4())
 
+    @pytest.fixture
+    def spec_with_owner_label(
+        self, base_spec_kwargs: dict[str, Any], user_id: str
+    ) -> ImageRowCreatorSpec:
+        """Spec with owner label for USER scope."""
+        return ImageRowCreatorSpec(
+            **base_spec_kwargs,
+            labels={LabelName.CUSTOMIZED_OWNER: f"user:{user_id}"},
+        )
+
+    @pytest.fixture
+    def spec_without_owner_label(self, base_spec_kwargs: dict[str, Any]) -> ImageRowCreatorSpec:
+        """Spec with unrelated label for GLOBAL scope."""
+        return ImageRowCreatorSpec(
+            **base_spec_kwargs,
+            labels={"other_label": "value"},
+        )
+
+    @pytest.fixture
+    def spec_with_empty_labels(self, base_spec_kwargs: dict[str, Any]) -> ImageRowCreatorSpec:
+        """Spec with empty labels dict for GLOBAL scope."""
+        return ImageRowCreatorSpec(**base_spec_kwargs, labels={})
+
+    @pytest.fixture
+    def spec_with_none_labels(self, base_spec_kwargs: dict[str, Any]) -> ImageRowCreatorSpec:
+        """Spec with None labels for GLOBAL scope."""
+        return ImageRowCreatorSpec(**base_spec_kwargs, labels=None)
+
     def test_build_with_owner_label_returns_user_scope(
         self,
         adapter: ImageCreatorAdapter,
-        base_spec_kwargs: dict[str, Any],
+        spec_with_owner_label: ImageRowCreatorSpec,
         user_id: str,
     ) -> None:
         """Should return USER scope when owner label exists."""
-        spec = ImageRowCreatorSpec(
-            **base_spec_kwargs,
-            labels={LabelName.CUSTOMIZED_OWNER: f"user:{user_id}"},
-        )
-
-        creator = adapter.build(spec)
+        creator = adapter.build(spec_with_owner_label)
 
         assert creator.scope_type == ScopeType.USER
         assert creator.scope_id == user_id
@@ -55,15 +78,10 @@ def test_build_with_owner_label_returns_user_scope(
     def test_build_without_owner_label_returns_global_scope(
         self,
         adapter: ImageCreatorAdapter,
-        base_spec_kwargs: dict[str, Any],
+        spec_without_owner_label: ImageRowCreatorSpec,
     ) -> None:
         """Should return GLOBAL scope when owner label is missing."""
-        spec = ImageRowCreatorSpec(
-            **base_spec_kwargs,
-            labels={"other_label": "value"},
-        )
-
-        creator = adapter.build(spec)
+        creator = adapter.build(spec_without_owner_label)
 
         assert creator.scope_type == ScopeType.GLOBAL
         assert creator.scope_id == GLOBAL_SCOPE_ID
@@ -72,25 +90,21 @@ def test_build_without_owner_label_returns_global_scope(
     def test_build_with_empty_labels_returns_global_scope(
         self,
         adapter: ImageCreatorAdapter,
-        base_spec_kwargs: dict[str, Any],
+        spec_with_empty_labels: ImageRowCreatorSpec,
     ) -> None:
         """Should return GLOBAL scope when labels dict is empty."""
-        spec = ImageRowCreatorSpec(**base_spec_kwargs, labels={})
-
-        creator = adapter.build(spec)
+        creator = adapter.build(spec_with_empty_labels)
 
         assert creator.scope_type == ScopeType.GLOBAL
         assert creator.scope_id == GLOBAL_SCOPE_ID
 
     def test_build_with_none_labels_returns_global_scope(
         self,
         adapter: ImageCreatorAdapter,
-        base_spec_kwargs: dict[str, Any],
+        spec_with_none_labels: ImageRowCreatorSpec,
     ) -> None:
         """Should return GLOBAL scope when labels is None."""
-        spec = ImageRowCreatorSpec(**base_spec_kwargs, labels=None)
-
-        creator = adapter.build(spec)
+        creator = adapter.build(spec_with_none_labels)
 
         assert creator.scope_type == ScopeType.GLOBAL
         assert creator.scope_id == GLOBAL_SCOPE_ID