fix: normalize jsonnet import callback byte paths

Agent-Logs-Url: https://github.com/eclipse-csi/otterdog/sessions/fa876869-cace-485b-859f-f347247e0aee

Co-authored-by: mbarbero <452625+mbarbero@users.noreply.github.com>

Author: Copilot

otterdog/utils.py

@@ -416,10 +416,12 @@ def __exit__(self, *exc: Any) -> None:
             self._token = None
 
 
-def _make_jsonnet_import_callback(allowed_root: str) -> Callable[[str, str], tuple[str, str | None]]:
+def _make_jsonnet_import_callback(allowed_root: str) -> Callable[[str | bytes, str | bytes], tuple[str, str | None]]:
     real_root = os.path.realpath(allowed_root)
 
-    def callback(base: str, rel: str) -> tuple[str, str | None]:
+    def callback(base: str | bytes, rel: str | bytes) -> tuple[str, str | None]:
+        base = os.fsdecode(base)
+        rel = os.fsdecode(rel)
         candidate = rel if os.path.isabs(rel) else os.path.join(base, rel)
         # resolve symlinks and ".." traversal before the containment check
         resolved = os.path.realpath(candidate)

tests/test_utils.py

@@ -145,6 +145,19 @@ def test_jsonnet_import_callback_returns_files_inside_root(tmp_path: Path):
     assert content2 == "{ x: 1 }"
 
 
+def test_jsonnet_import_callback_accepts_byte_paths(tmp_path: Path):
+    (tmp_path / "vendor").mkdir()
+    inside = tmp_path / "vendor" / "lib.libsonnet"
+    inside.write_bytes(b"{ x: 1 }")
+
+    callback = _make_jsonnet_import_callback(str(tmp_path))
+    resolved, content = callback(os.fsencode(tmp_path / "vendor"), b"lib.libsonnet")
+
+    assert isinstance(resolved, str)
+    assert resolved == os.path.realpath(str(inside))
+    assert content == "{ x: 1 }"
+
+
 def test_jsonnet_import_callback_rejects_absolute_outside_root(tmp_path: Path):
     callback = _make_jsonnet_import_callback(str(tmp_path))