UncoderIO · nazargesyk · Nov 17, 2023 · Nov 17, 2023
diff --git a/siem-converter/app/converter/backends/__init__.py b/siem-converter/app/converter/backends/__init__.py
diff --git a/siem-converter/app/converter/backends/elasticsearch/parsers/elasticsearch.py b/siem-converter/app/converter/backends/elasticsearch/parsers/elasticsearch.py
diff --git a/siem-converter/app/converter/backends/elasticsearch/tokenizer.py b/siem-converter/app/converter/backends/elasticsearch/tokenizer.py
diff --git a/siem-converter/app/converter/backends/opensearch/mapping.py b/siem-converter/app/converter/backends/opensearch/mapping.py
diff --git a/siem-converter/app/converter/converter.py b/siem-converter/app/converter/converter.py
@@ -1,6 +1,6 @@
 import logging
 
-from app.converter.backends.roota.parsers.roota import RootAParser
+from app.converter.platforms.roota.parsers.roota import RootAParser
 from app.converter.core.exceptions.core import UnsupportedPlatform
 from app.converter.core.operator_types.output import SiemContainer
 from app.converter.managers import RenderManager, ParserManager, render_manager, parser_manager

diff --git a/siem-converter/app/converter/core/render.py b/siem-converter/app/converter/core/render.py
@@ -99,7 +99,7 @@ def generate_prefix(self, log_source_signature: LogSourceSignature) -> str:
             return f"{str(log_source_signature)} {self.and_token}"
         return ""
 
-    def generate_functions(self, functions: list):
+    def generate_functions(self, functions: list) -> str:
         return ""
 
     def map_field(self, field: Field, source_mapping: SourceMapping) -> List[str]:
@@ -147,7 +147,7 @@ def finalize_query(self,
                        meta_info: MetaInfoContainer,
                        source_mapping: SourceMapping = None,
                        not_supported_functions: list = None) -> str:
-        query = self.query_pattern.format(prefix=prefix, query=query, functions=functions)
+        query = self.query_pattern.format(prefix=prefix, query=query, functions=functions).strip()
         if not_supported_functions:
             rendered_not_supported = self.render_not_supported_functions(not_supported_functions)
             return query + rendered_not_supported

diff --git a/siem-converter/app/converter/managers.py b/siem-converter/app/converter/managers.py
@@ -1,8 +1,8 @@
 from abc import ABC
 
-from app.converter.backends import __ALL_PARSERS as PARSERS
-from app.converter.backends import __ALL_RENDERS as RENDERS
-from app.converter.backends import __ALL_RENDERS_CTI as RENDERS_CTI
+from app.converter.platforms import __ALL_PARSERS as PARSERS
+from app.converter.platforms import __ALL_RENDERS as RENDERS
+from app.converter.platforms import __ALL_RENDERS_CTI as RENDERS_CTI
 from app.converter.core.exceptions.core import UnsupportedRootAParser
 from app.models.translation import ConvertorPlatform