addressed reviewzs

Author: alexandraBara

nodescraper/plugins/inband/kernel_module/analyzer_args.py

@@ -24,7 +24,6 @@
 #
 ###############################################################################
 import re
-from typing import ClassVar
 
 from nodescraper.models import AnalyzerArgs
 from nodescraper.plugins.inband.kernel_module.kernel_module_data import (
@@ -34,11 +33,7 @@
 
 class KernelModuleAnalyzerArgs(AnalyzerArgs):
     kernel_modules: dict[str, dict] = {}
-
-    DEFAULT_REGEX_FILTER: ClassVar[list[str]] = ["amd"]
-    DEFAULT_REGEX_MATCH: ClassVar[bool] = True
-    regex_filter: list[str] = DEFAULT_REGEX_FILTER
-    regex_match: bool = DEFAULT_REGEX_MATCH
+    regex_filter: list[str] = ["amd"]
 
     @classmethod
     def build_from_model(cls, datamodel: KernelModuleDataModel) -> "KernelModuleAnalyzerArgs":
@@ -51,7 +46,7 @@ def build_from_model(cls, datamodel: KernelModuleDataModel) -> "KernelModuleAnal
             KernelModuleAnalyzerArgs: instance of analyzer args class
         """
 
-        pattern_regex = re.compile("|".join(cls.DEFAULT_REGEX_FILTER), re.IGNORECASE)
+        pattern_regex = re.compile("amd", re.IGNORECASE)
         filtered_mods = {
             name: data
             for name, data in datamodel.kernel_modules.items()
@@ -60,6 +55,5 @@ def build_from_model(cls, datamodel: KernelModuleDataModel) -> "KernelModuleAnal
 
         return cls(
             kernel_modules=filtered_mods,
-            regex_filter=cls.DEFAULT_REGEX_FILTER,
-            regex_match=cls.DEFAULT_REGEX_MATCH,
+            regex_filter=[],
         )

nodescraper/plugins/inband/kernel_module/kernel_module_analyzer.py

@@ -130,10 +130,15 @@ def analyze_data(
         """
         if not args:
             args = KernelModuleAnalyzerArgs()
+        else:
+            if args.regex_filter and args.kernel_modules:
+                self.logger.warning(
+                    "Both regex_filter and kernel_modules provided in analyzer args. kernel_modules will be ignored"
+                )
 
         self.result.status = ExecutionStatus.OK
 
-        if args.regex_match:
+        if args.regex_filter:
             try:
                 filtered_modules, unmatched_pattern = self.filter_modules_by_pattern(
                     data.kernel_modules, args.regex_filter
@@ -197,6 +202,6 @@ def analyze_data(
                 self.result.status = ExecutionStatus.ERROR
                 return self.result
         else:
-            self.result.message = "Kernel modules and regex_match failed"
+            self.result.message = "Kernel modules and regex_filter failed"
             self.result.status = ExecutionStatus.ERROR
             return self.result