Fixed transformation tests and issues

SigmaHQ · Oct 25, 2024 · 039de54 · 039de54
1 parent bbee6f6
commit 039de54
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 44 deletions.
diff --git a/sigma/processing/pipeline.py b/sigma/processing/pipeline.py
@@ -19,9 +19,9 @@
 from sigma.correlations import SigmaCorrelationRule
 from sigma.processing.finalization import Finalizer, finalizers
 from sigma.processing.tracking import FieldMappingTracking
-from sigma.processing import transformations
+from sigma.processing.transformations import transformations
 from sigma.rule import SigmaDetectionItem, SigmaRule
-from sigma.processing.transformations import Transformation
+from sigma.processing.transformations.base import Transformation
 from sigma.processing.postprocessing import query_postprocessing_transformations
 from sigma.processing.conditions import (
     rule_conditions,

diff --git a/tests/test_processing_pipeline.py b/tests/test_processing_pipeline.py
@@ -1,9 +1,12 @@
 import pytest
 from dataclasses import dataclass
-import re
-from textwrap import dedent
 from sigma.processing.finalization import ConcatenateQueriesFinalizer, JSONFinalizer
-from sigma.processing.pipeline import ProcessingPipeline, ProcessingItem, QueryPostprocessingItem
+from sigma.processing.pipeline import (
+    ProcessingPipeline,
+    ProcessingItem,
+    QueryPostprocessingItem,
+)
+from sigma.processing.transformations import transformations
 from sigma.processing.conditions import (
     DetectionItemProcessingItemAppliedCondition,
     IncludeFieldCondition,
@@ -22,7 +25,6 @@
     AddFieldnamePrefixTransformation,
     FieldFunctionTransformation,
 )
-from sigma.processing import transformations
 from sigma.rule import SigmaRule, SigmaDetectionItem
 from sigma.exceptions import SigmaConfigurationError, SigmaTypeError
 from sigma.types import SigmaString

diff --git a/tests/test_processing_transformations.py b/tests/test_processing_transformations.py
@@ -1,54 +1,61 @@
-from dataclasses import dataclass
-from copy import deepcopy
 import inspect
-from sigma.conditions import ConditionOR, SigmaCondition
+from copy import deepcopy
+from dataclasses import dataclass
+
 import pytest
+
+import sigma.processing.transformations as transformations_module
+from sigma.conditions import ConditionOR, SigmaCondition
 from sigma.correlations import (
     SigmaCorrelationFieldAlias,
     SigmaCorrelationFieldAliases,
     SigmaCorrelationRule,
     SigmaRuleReference,
 )
-from sigma.processing.transformations import (
-    AddFieldTransformation,
-    ConvertTypeTransformation,
-    NestedProcessingTransformation,
-    RemoveFieldTransformation,
-    SetCustomAttributeTransformation,
-    SetFieldTransformation,
-    SetValueTransformation,
+from sigma.exceptions import (
+    SigmaConfigurationError,
+    SigmaRegularExpressionError,
+    SigmaTransformationError,
+    SigmaValueError,
 )
-import sigma.processing.transformations as transformations_module
+from sigma.modifiers import SigmaExpandModifier
+from sigma.processing.conditions import (
+    FieldNameProcessingItemAppliedCondition,
+    IncludeFieldCondition,
+    RuleContainsDetectionItemCondition,
+    RuleProcessingItemAppliedCondition,
+)
+from sigma.processing.pipeline import ProcessingItem, ProcessingPipeline
 from sigma.processing.transformations import (
     AddConditionTransformation,
-    RegexTransformation,
+    AddFieldnamePrefixTransformation,
+    AddFieldnameSuffixTransformation,
+    AddFieldTransformation,
     ChangeLogsourceTransformation,
-    ConditionTransformation,
+    ConvertTypeTransformation,
     DetectionItemFailureTransformation,
     DropDetectionItemTransformation,
-    MapStringTransformation,
-    RuleFailureTransformation,
     FieldMappingTransformation,
     FieldPrefixMappingTransformation,
-    AddFieldnameSuffixTransformation,
-    AddFieldnamePrefixTransformation,
+    HashesFieldsDetectionItemTransformation,
+    MapStringTransformation,
+    NestedProcessingTransformation,
+    QueryExpressionPlaceholderTransformation,
+    RegexTransformation,
+    RemoveFieldTransformation,
+    ReplaceStringTransformation,
+    RuleFailureTransformation,
+    SetCustomAttributeTransformation,
+    SetFieldTransformation,
     SetStateTransformation,
+    SetValueTransformation,
     Transformation,
-    WildcardPlaceholderTransformation,
     ValueListPlaceholderTransformation,
-    QueryExpressionPlaceholderTransformation,
-    ReplaceStringTransformation,
-    HashesFieldsDetectionItemTransformation,
-)
-from sigma.processing.pipeline import ProcessingPipeline, ProcessingItem
-from sigma.processing.conditions import (
-    FieldNameProcessingItemAppliedCondition,
-    IncludeFieldCondition,
-    RuleContainsDetectionItemCondition,
-    RuleProcessingItemAppliedCondition,
+    WildcardPlaceholderTransformation,
+    transformations,
 )
-from sigma.processing import transformations
-from sigma.rule import SigmaLogSource, SigmaRule, SigmaDetection, SigmaDetectionItem
+from sigma.processing.transformations.base import ConditionTransformation
+from sigma.rule import SigmaDetection, SigmaDetectionItem, SigmaLogSource, SigmaRule
 from sigma.types import (
     Placeholder,
     SigmaBool,
@@ -60,13 +67,6 @@
     SigmaString,
     SpecialChars,
 )
-from sigma.modifiers import SigmaExpandModifier
-from sigma.exceptions import (
-    SigmaConfigurationError,
-    SigmaRegularExpressionError,
-    SigmaTransformationError,
-    SigmaValueError,
-)
 from tests.test_processing_pipeline import (
     RuleConditionFalse,
     RuleConditionTrue,