feat: print configuration at the start of agent container

Author: ayuskauskas

agent/skyhook-agent/src/skyhook_agent/controller.py

@@ -339,11 +339,7 @@ def summarize_check_results(results: list[bool], step_data: dict[Mode, list[Step
 
     return False
 
-def do_interrupt(interrupt_data: str, root_mount: str, copy_dir: str, on_host: bool) -> bool:
-    """
-    Run an interrupt if there hasn't been an interrupt already for the skyhook ID.
-    """
-    
+def make_config_data_from_resource_id() -> dict:
     SKYHOOK_RESOURCE_ID, _ = _get_env_config()
 
     # Interrupts don't really have config data we can read from the Package as it is run standalone.
@@ -354,6 +350,16 @@ def do_interrupt(interrupt_data: str, root_mount: str, copy_dir: str, on_host: b
         "package_name": package,
         "package_version": version,
     }
+    return config_data
+
+def do_interrupt(interrupt_data: str, root_mount: str, copy_dir: str, on_host: bool) -> bool:
+    """
+    Run an interrupt if there hasn't been an interrupt already for the skyhook ID.
+    """
+    
+    SKYHOOK_RESOURCE_ID, _ = _get_env_config()
+
+    config_data = make_config_data_from_resource_id()
 
     interrupt = interrupts.inflate(interrupt_data)
 
@@ -514,11 +520,36 @@ def cli(sys_argv: list[str]=sys.argv):
         # new way with interrupt data
         mode, root_mount, copy_dir, interrupt_data = args
 
-    if os.getenv("COPY_RESOLV", "true").lower() == "true":
+    copy_resolv = os.getenv("COPY_RESOLV", "true").lower() == "true"
+    if copy_resolv:
         shutil.copyfile("/etc/resolv.conf", f"{root_mount}/etc/resolv.conf")
 
     always_run_step = os.getenv("OVERLAY_ALWAYS_RUN_STEP", "false").lower() == "true"
 
+    # Print all of the configuration flags as a separate line
+    print("-" * 20)
+    print(str.center("CLI CONFIGURATION", 20, "-"))
+    print(f"mode: {mode}")
+    print(f"root_mount: {root_mount}")
+    print(f"copy_dir: {copy_dir}")
+    print(f"interrupt_data: {interrupt_data}")
+    print(f"always_run_step: {always_run_step}")
+    print(str.center("ENV CONFIGURATION", 20, "-"))
+    print(f"COPY_RESOLV: {copy_resolv}")
+    print(f"OVERLAY_ALWAYS_RUN_STEP: {always_run_step}")
+    SKYHOOK_RESOURCE_ID, SKYHOOK_DATA_DIR = _get_env_config()
+    print(f"SKYHOOK_RESOURCE_ID: {SKYHOOK_RESOURCE_ID}")
+    print(f"SKYHOOK_DATA_DIR: {SKYHOOK_DATA_DIR}")
+    print(f"SKYHOOK_AGENT_BUFFER_LIMIT: {buff_size}")
+    print(str.center("Directory CONFIGURATION", 20, "-"))
+    # print flag dir and log dir
+    config_data = make_config_data_from_resource_id()
+    print(f"flag_dir: {get_flag_dir(root_mount)}/{config_data['package_name']}/{config_data['package_version']}")
+    log_dir = '/'.join(get_log_file(root_mount, 'step',copy_dir, config_data, timestamp='timestamp').split('/')[:-1])
+    print(f"log_dir: {log_dir}")
+    print(f"history_file: {get_history_dir(root_mount)}/{config_data['package_name']}.json")
+    print("-" * 20)
+
     return main(mode, root_mount, copy_dir, interrupt_data, always_run_step)
 
 

agent/skyhook-agent/tests/test_controller.py

@@ -1212,34 +1212,36 @@ def test_interrupt_makes_config_from_skyhook_resource_id(self, run_mock, datetim
     @mock.patch("skyhook_agent.controller.main")
     def test_interrupt_mode_reads_extra_argument(self, main_mock):
         argv = ["controller.py", str(Mode.INTERRUPT), "root_mount", "copy_dir", "interrupt_data"]
-        with set_env(COPY_RESOLV="false"):
+        with set_env(COPY_RESOLV="false", SKYHOOK_RESOURCE_ID="customer-25633c77-11ac-471a-9928-bc6969cead5f-2_tuning_2.0.2"):
             controller.cli(argv)
 
         main_mock.assert_called_once_with(str(Mode.INTERRUPT), "root_mount", "copy_dir", "interrupt_data", False)
 
     @mock.patch("skyhook_agent.controller.main")
     def test_cli_overlay_always_run_step_is_correct(self, main_mock):
-        with set_env(OVERLAY_ALWAYS_RUN_STEP="true", COPY_RESOLV="false"):
+        with set_env(OVERLAY_ALWAYS_RUN_STEP="true", COPY_RESOLV="false", 
+                    SKYHOOK_RESOURCE_ID="customer-25633c77-11ac-471a-9928-bc6969cead5f-2_tuning_2.0.2"):
             controller.cli(["controller.py", str(Mode.APPLY), "root_mount", "copy_dir"])
 
         main_mock.assert_called_once_with(str(Mode.APPLY), "root_mount", "copy_dir", None, True)
         main_mock.reset_mock()
 
-        with set_env(OVERLAY_ALWAYS_RUN_STEP="false", COPY_RESOLV="false"):
+        with set_env(OVERLAY_ALWAYS_RUN_STEP="false", COPY_RESOLV="false",
+                    SKYHOOK_RESOURCE_ID="customer-25633c77-11ac-471a-9928-bc6969cead5f-2_tuning_2.0.2"):
             controller.cli(["controller.py", str(Mode.APPLY), "root_mount", "copy_dir"])
         main_mock.assert_called_once_with(str(Mode.APPLY), "root_mount", "copy_dir", None, False)
 
     @mock.patch("skyhook_agent.controller.main")
     @mock.patch("skyhook_agent.controller.shutil")
     def test_cli_COPY_RESOLV(self, shutil_mock, main_mock):
         argv = ["controller.py", str(Mode.APPLY), "root_mount", "copy_dir"]
-        with set_env(COPY_RESOLV="true"):
+        with set_env(COPY_RESOLV="true", SKYHOOK_RESOURCE_ID="customer-25633c77-11ac-471a-9928-bc6969cead5f-2_tuning_2.0.2"):
             controller.cli(argv)
 
         shutil_mock.copyfile.assert_called_once()
         shutil_mock.copyfile.reset_mock()
 
-        with set_env(COPY_RESOLV="false"):
+        with set_env(COPY_RESOLV="false", SKYHOOK_RESOURCE_ID="customer-25633c77-11ac-471a-9928-bc6969cead5f-2_tuning_2.0.2"):
             controller.cli(argv)
 
         shutil_mock.copyfile.assert_not_called()