[client] Remove type property on collectors config (#125)

Author: RomuDeuxfois

pyobas/daemons/collector_daemon.py

@@ -1,6 +1,8 @@
 import sched
 import time
+from argparse import ArgumentError
 
+from pyobas import Configuration
 from pyobas.daemons import BaseDaemon
 from pyobas.utils import PingAlive
 
@@ -17,6 +19,19 @@ class CollectorDaemon(BaseDaemon):
     time between each loop start is time_of_loop+period.
     """
 
+    def __init__(
+        self,
+        configuration: Configuration,
+        callback: callable = None,
+        logger=None,
+        api_client=None,
+        collector_type=None,
+    ):
+        super().__init__(configuration, callback, logger, api_client)
+        if collector_type is None:
+            raise ArgumentError("Must defined a value for collector type")
+        self.collector_type = collector_type
+
     def _setup(self):
         if self._configuration.get("collector_period") is None:
             self._configuration.set("collector_period", DEFAULT_PERIOD_SECONDS)
@@ -45,7 +60,7 @@ def _setup(self):
             config = {
                 "collector_id": self._configuration.get("collector_id"),
                 "collector_name": self._configuration.get("collector_name"),
-                "collector_type": self._configuration.get("collector_type"),
+                "collector_type": self.collector_type,
                 "collector_period": self._configuration.get("collector_period"),
                 "collector_security_platform": security_platform_id,
             }

pyobas/helpers.py

@@ -263,6 +263,7 @@ def __init__(
         self,
         config: OpenBASConfigHelper,
         icon,
+        collector_type=None,
         security_platform_type=None,
         connect_run_and_terminate: bool = False,
     ) -> None:
@@ -276,6 +277,7 @@ def __init__(
         self.__daemon = CollectorDaemon(
             configuration=config_obj,
             callback=None,
+            collector_type=collector_type,
         )
 
         self.__daemon.logger.warning(
@@ -292,7 +294,7 @@ def __init__(
         self.config = {
             "collector_id": config_obj.get("collector_id"),
             "collector_name": config_obj.get("collector_name"),
-            "collector_type": config_obj.get("collector_type"),
+            "collector_type": collector_type,
             "collector_period": config_obj.get("collector_period"),
         }
 

test/daemons/test_collector_daemon.py

@@ -28,7 +28,7 @@ def test_when_no_period_config_provided_set_default_period(
                 "collector_id": {"data": "fake id"},
             }
         )
-        collector = CollectorDaemon(config)
+        collector = CollectorDaemon(configuration=config, collector_type="test")
 
         collector._setup()