Convert from file load, fix tests, fix Key and Value vartypes

Author: Pablu23

logprep/processor/generic_resolver/rule.py

@@ -234,7 +234,8 @@ def _add_from_path(self, path: str):
 
         def _get_additions_from_path(self, path: str) -> dict:
             try:
-                additions = GetterFactory.from_string(path).get_dict()
+                additions = GetterFactory.from_string(path).get_collection()
+                additions = convert_ordered_mapping_or_keep_mapping(additions)
             except ValueError as error:
                 raise InvalidConfigurationError(
                     f"Error loading additions from '{path}': {error}"

logprep/util/converters.py

@@ -2,13 +2,13 @@
 
 from logprep.factory_error import InvalidConfigurationError
 
-KeyTypeT = TypeVar("KeyTypeT")
-ValueTypeT = TypeVar("ValueTypeT")
+Key = TypeVar("Key")
+Value = TypeVar("Value")
 
 
 def convert_ordered_mapping_or_keep_mapping(
-    dict_or_sequence: dict[KeyTypeT, ValueTypeT] | list[dict[KeyTypeT, ValueTypeT]],
-) -> dict[KeyTypeT, ValueTypeT]:
+    dict_or_sequence: dict[Key, Value] | list[dict[Key, Value]],
+) -> dict[Key, Value]:
     if isinstance(dict_or_sequence, dict):
         return dict_or_sequence
 
@@ -18,7 +18,7 @@ def convert_ordered_mapping_or_keep_mapping(
     return convert_ordered_mapping(dict_or_sequence)
 
 
-def convert_ordered_mapping(dicts: list[dict[KeyTypeT, ValueTypeT]]) -> dict[KeyTypeT, ValueTypeT]:
+def convert_ordered_mapping(dicts: list[dict[Key, Value]]) -> dict[Key, Value]:
     ordered_mapping = {}
     for element in dicts:
         keys = list(element.keys())

tests/unit/processor/generic_resolver/test_generic_resolver_rule.py

@@ -240,9 +240,8 @@ def test_rules_equality(self, rule_definition, other_rule_definition, is_equal):
                         },
                     },
                 },
-                InvalidConfigurationError,
-                r"Error loading additions from '.+resolve_mapping_list\.yml': "
-                r"Value is not a dictionary",
+                None,
+                "",
                 id="error_loading_not_dict_value",
             ),
         ],