Merge branch 'mainline' into dependabot/github_actions/actions/checko…

…ut-4
OpenJobDescription · Oct 10, 2023 · 18e26d4 · 18e26d4
2 parents 04841af + 60a7d45
commit 18e26d4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ __pycache__/
 /build
 /dist
 _version.py
+.vscode
diff --git a/THIRD-PARTY-LICENSES.txt b/THIRD-PARTY-LICENSES.txt
@@ -1,4 +1,4 @@
-** Python-jsonschema; version 4.19 -- https://github.com/python-jsonschema/jsonschema
+** Python-jsonschema; version 4.17 -- https://github.com/python-jsonschema/jsonschema
 Copyright (c) 2013 Julian Berman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ requires-python = ">=3.9"
 
 dependencies = [
   "pyyaml ~= 6.0",
-  "jsonschema >= 4.19.0, == 4.*",
+  "jsonschema >= 4.17.0, == 4.*",
 ]
 
 [tool.hatch.build]

diff --git a/src/openjd/adaptor_runtime/_background/frontend_runner.py b/src/openjd/adaptor_runtime/_background/frontend_runner.py
@@ -57,13 +57,17 @@ def __init__(
         signal.signal(signal.SIGINT, self._sigint_handler)
         signal.signal(signal.SIGTERM, self._sigint_handler)
 
-    def init(self, adaptor_module: ModuleType, init_data: dict = {}) -> None:
+    def init(
+        self, adaptor_module: ModuleType, init_data: dict = {}, path_mapping_data: dict = {}
+    ) -> None:
         """
         Creates the backend process then sends a heartbeat request to verify that it has started
         successfully.
 
         Args:
             adaptor_module (ModuleType): The module of the adaptor running the runtime.
+            init_data (dict): Data to pass to the adaptor during initialization.
+            path_mapping_data (dict): Path mapping rules to make available to the adaptor while it's running.
         """
         if adaptor_module.__package__ is None:
             raise Exception(f"Adaptor module is not a package: {adaptor_module}")
@@ -85,6 +89,8 @@ def init(self, adaptor_module: ModuleType, init_data: dict = {}) -> None:
             self._connection_file_path,
             "--init-data",
             json.dumps(init_data),
+            "--path-mapping-rules",
+            json.dumps(path_mapping_data),
         ]
         try:
             process = subprocess.Popen(

diff --git a/src/openjd/adaptor_runtime/_entrypoint.py b/src/openjd/adaptor_runtime/_entrypoint.py
@@ -205,7 +205,7 @@ def start(self) -> None:
                             f"Adaptor module is not loaded: {self.adaptor_class.__module__}"
                         )
 
-                    frontend.init(adaptor_module, init_data)
+                    frontend.init(adaptor_module, init_data, path_mapping_data)
                     frontend.start()
                 elif subcommand == "run":
                     frontend.run(run_data)
@@ -241,6 +241,7 @@ def _build_argparser(self) -> ArgumentParser:
         path_mapping_rules = ArgumentParser(add_help=False)
         path_mapping_rules.add_argument(
             "--path-mapping-rules",
+            default="",
             required=False,
             type=_load_data,
             help=_CLI_HELP_TEXT["path_mapping_rules"],
@@ -266,7 +267,7 @@ def _build_argparser(self) -> ArgumentParser:
         )
 
         # "Hidden" command that actually runs the adaptor runtime in background mode
-        bg_subparser.add_parser("_serve", parents=[init_data, connection_file])
+        bg_subparser.add_parser("_serve", parents=[init_data, path_mapping_rules, connection_file])
 
         bg_subparser.add_parser("start", parents=[init_data, path_mapping_rules, connection_file])
         bg_subparser.add_parser("run", parents=[run_data, connection_file])

diff --git a/test/openjd/adaptor_runtime/unit/background/test_frontend_runner.py b/test/openjd/adaptor_runtime/unit/background/test_frontend_runner.py
@@ -1,5 +1,7 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
+from __future__ import annotations
+
 import http.client as http_client
 import json
 import re
@@ -80,10 +82,11 @@ def test_initializes_backend_process(
             adaptor_module.__package__ = "package"
             conn_file_path = "/path"
             init_data = {"init": "data"}
+            path_mapping_data: dict = {}
             runner = FrontendRunner(conn_file_path)
 
             # WHEN
-            runner.init(adaptor_module, init_data)
+            runner.init(adaptor_module, init_data, path_mapping_data)
 
             # THEN
             assert caplog.messages == [
@@ -104,6 +107,8 @@ def test_initializes_backend_process(
                     conn_file_path,
                     "--init-data",
                     json.dumps(init_data),
+                    "--path-mapping-rules",
+                    json.dumps(path_mapping_data),
                 ],
                 shell=False,
                 close_fds=True,

diff --git a/test/openjd/adaptor_runtime/unit/test_entrypoint.py b/test/openjd/adaptor_runtime/unit/test_entrypoint.py
@@ -415,7 +415,7 @@ def test_runs_background_start(
 
         # THEN
         _parse_args_mock.assert_called_once()
-        mock_magic_init.assert_called_once_with(mock_adaptor_module, {})
+        mock_magic_init.assert_called_once_with(mock_adaptor_module, {}, {})
         mock_magic_start.assert_called_once_with(conn_file)
         mock_start.assert_called_once_with()