Change pytest plugin to use the same importer as other components

Fixes #166

Author: ogenstad

changelog/166.fixed.md

@@ -0,0 +1 @@
+Fix relative imports for the pytest plugin, note that the relative imports can't be at the top level of the repository alongside .infrahub.yml. They have to be located within a subfolder.

infrahub_sdk/_importer.py

@@ -16,6 +16,13 @@
 def import_module(
     module_path: Path, import_root: Optional[str] = None, relative_path: Optional[str] = None
 ) -> ModuleType:
+    """Imports a python module.
+
+    Args:
+        module_path (Path): Absolute path of the module to import.
+        import_root (Optional[str]): Absolute string path to the current repository.
+        relative_path (Optional[str]): Relative string path between module_path and import_root.
+    """
     import_root = import_root or str(module_path.parent)
 
     file_on_disk = module_path

infrahub_sdk/pytest_plugin/items/base.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import difflib
+from pathlib import Path
 from typing import TYPE_CHECKING, Any, Optional, Union
 
 import pytest
@@ -11,11 +12,11 @@
 from ..models import InfrahubInputOutputTest
 
 if TYPE_CHECKING:
-    from pathlib import Path
-
     from ...schema.repository import InfrahubRepositoryConfigElement
     from ..models import InfrahubTest
 
+_infrahub_config_path_attribute = "infrahub_config_path"
+
 
 class InfrahubItem(pytest.Item):
     def __init__(
@@ -74,3 +75,16 @@ def repr_failure(self, excinfo: pytest.ExceptionInfo, style: Optional[str] = Non
 
     def reportinfo(self) -> tuple[Union[Path, str], Optional[int], str]:
         return self.path, 0, f"resource: {self.name}"
+
+    @property
+    def repository_base(self) -> str:
+        """Return the path to the root of the repository
+
+        This will be an absolute path if --infrahub-config-path is an absolut path as happens when
+        tests are started from within Infrahub server.
+        """
+        config_path: Path = getattr(self.session, _infrahub_config_path_attribute)
+        if config_path.is_absolute():
+            return str(config_path.parent)
+
+        return str(Path.cwd())

infrahub_sdk/pytest_plugin/items/check.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 import asyncio
+from pathlib import Path
 from typing import TYPE_CHECKING, Any, Optional
 
 import ujson
 from httpx import HTTPStatusError
 
-from ...checks import get_check_class_instance
 from ..exceptions import CheckDefinitionError, CheckResultError
 from ..models import InfrahubTestExpectedResult
 from .base import InfrahubItem
@@ -33,9 +33,12 @@ def __init__(
         self.check_instance: InfrahubCheck
 
     def instantiate_check(self) -> None:
-        self.check_instance = get_check_class_instance(
-            check_config=self.resource_config,  # type: ignore[arg-type]
-            search_path=self.session.infrahub_config_path.parent,  # type: ignore[attr-defined]
+        relative_path = (
+            str(self.resource_config.file_path.parent) if self.resource_config.file_path.parent != Path() else None  # type: ignore[attr-defined]
+        )
+
+        self.check_instance = self.resource_config.load_class(  # type: ignore[attr-defined]
+            import_root=self.repository_base, relative_path=relative_path
         )
 
     def run_check(self, variables: dict[str, Any]) -> Any:

infrahub_sdk/pytest_plugin/items/python_transform.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 import asyncio
+from pathlib import Path
 from typing import TYPE_CHECKING, Any, Optional
 
 import ujson
 from httpx import HTTPStatusError
 
-from ...transforms import get_transform_class_instance
 from ..exceptions import OutputMatchError, PythonTransformDefinitionError
 from ..models import InfrahubTestExpectedResult
 from .base import InfrahubItem
@@ -33,9 +33,11 @@ def __init__(
         self.transform_instance: InfrahubTransform
 
     def instantiate_transform(self) -> None:
-        self.transform_instance = get_transform_class_instance(
-            transform_config=self.resource_config,  # type: ignore[arg-type]
-            search_path=self.session.infrahub_config_path.parent,  # type: ignore[attr-defined]
+        relative_path = (
+            str(self.resource_config.file_path.parent) if self.resource_config.file_path.parent != Path() else None  # type: ignore[attr-defined]
+        )
+        self.transform_instance = self.resource_config.load_class(  # type: ignore[attr-defined]
+            import_root=self.repository_base, relative_path=relative_path
         )
 
     def run_transform(self, variables: dict[str, Any]) -> Any: