call validator when executing trigger/action

sekoia_automation/action.py

@@ -97,6 +97,7 @@ def error_message(self) -> str | None:
 
     def execute(self) -> None:
         try:
+            self.validate_module_configuration()
             self._ensure_data_path_set()
             self.set_task_as_running()
             self._results = self.run(self.arguments)

sekoia_automation/module.py

@@ -490,54 +490,15 @@ def stop_monitoring(self):
         Stops the background monitoring operations
         """
 
-        def validate(self):
-        # Check if "validate_module_configuration" is in the docker parameters
-        main_py_path = self.__module_path / "main.py"
-        with open(main_py_path) as file:
-            content = file.read()
-
-        tree = ast.parse(content)
-
-        docker_params = []
-        node: Any
-        for node in ast.walk(tree):
-            if (
-                hasattr(node, "func")
-                and isinstance(node.func, ast.Attribute)
-                and node.func.attr == "register"
-            ):
-                docker_param: str | None = None
-                if len(node.args) > 1 and isinstance(node.args[1], ast.Constant):
-                    # provided as positional arg
-                    docker_param = node.args[1].s
-
-                elif len(node.keywords) > 0:
-                    # provided as keyword arg
-                    docker_param = node.keywords[0].value.s
-
-                docker_params.append(docker_param)
-
-        if "validate_module_configuration" not in docker_params:
-            return
-
-        # Call the actual validation procedure
-        status = self.do_validation()
+    @abstractmethod
+    def validator(self) -> bool:
+        """To define in subclasses. Validates the configuration of the module.
 
-        # Return result of validation to Symphony
-        data = {"validation_status": status}
-        validation_callback_url = self.load_config(
-            self.VALIDATION_CALLBACK_URL_FILE_NAME
-        )
-        response = requests.request(
-            "POST",
-            validation_callback_url,
-            json=data,
-            headers={"Authorization": f"Bearer {self.token}"},
-            timeout=30,
-        )
-        response.raise_for_status()
+        Returns:
+            bool: True if the module is valid, False otherwise
+        """
 
-    def validate(self):
+    def validate_module_configuration(self):
         # Check if "validate_module_configuration" is in the docker parameters
         main_py_path = self.__module_path / "main.py"
         with open(main_py_path) as file:
@@ -568,7 +529,7 @@ def validate(self):
             return
 
         # Call the actual validation procedure
-        status = self.do_validation()
+        status = self.validator()
 
         # Return result of validation to Symphony
         data = {"validation_status": status}
@@ -583,4 +544,3 @@ def validate(self):
             timeout=30,
         )
         response.raise_for_status()
-

sekoia_automation/trigger.py

@@ -176,6 +176,7 @@ def execute(self) -> None:
         self._secrets = self._get_secrets_from_server()
         self.module.set_secrets(self._secrets)
         self._logs_timer.start()
+        self.validate_module_configuration()
         try:
             while not self._stop_event.is_set():
                 try:

tests/test_trigger.py

@@ -75,6 +75,15 @@ def test_logs_url():
     mock.assert_called_with(trigger.LOGS_URL_FILE_NAME)
 
 
+def test_validation_callback_url():
+    trigger = DummyTrigger()
+    with patch.object(
+        Module, "load_config", return_value="validation_callback"
+    ) as mock:
+        assert trigger.validation_callback_url == "validation_callback"
+    mock.assert_called_with(trigger.VALIDATION_CALLBACK_URL_FILE_NAME)
+
+
 def test_trigger_configuration():
     trigger = DummyTrigger()
     with (