Merge pull request #7 from amd/bugfix/dkms_analyzer

Bugfix: DKMS analysis args

Author: landrews-amd

nodescraper/cli/inputargtypes.py

@@ -104,7 +104,7 @@ def process_file_arg(self, file_path: str) -> TModelType:
             return self.model(**data)
         except ValidationError as e:
             raise argparse.ArgumentTypeError(
-                f"Validation errors when processing {file_path}: {e.errors()}"
+                f"Validation errors when processing {file_path}: {e.errors(include_url=False)}"
             ) from e
 
 

nodescraper/interfaces/dataanalyzertask.py

@@ -76,13 +76,12 @@ def wrapper(
                     if not analyze_arg_model:
                         raise ValueError("No model defined for analysis args")
                     args = analyze_arg_model(**args)  # type: ignore
-
                 func(analyzer, data, args)
             except ValidationError as exception:
                 analyzer._log_event(
                     category=EventCategory.RUNTIME,
                     description="Validation error during analysis",
-                    data=get_exception_traceback(exception),
+                    data={"errors": exception.errors(include_url=False)},
                     priority=EventPriority.CRITICAL,
                     console_log=True,
                 )

nodescraper/interfaces/datacollectortask.py

@@ -41,7 +41,7 @@
 from nodescraper.interfaces.task import SystemCompatibilityError, Task
 from nodescraper.models import DataModel, SystemInfo, TaskResult
 from nodescraper.typeutils import TypeUtils
-from nodescraper.utils import get_exception_details, get_exception_traceback
+from nodescraper.utils import get_exception_traceback
 
 from .connectionmanager import TConnection
 from .taskresulthook import TaskResultHook
@@ -76,7 +76,7 @@ def wrapper(
                 collector._log_event(
                     category=EventCategory.RUNTIME,
                     description="Pydantic validation error",
-                    data=get_exception_details(exception),
+                    data={"errors": exception.errors(include_url=False)},
                     priority=EventPriority.CRITICAL,
                     console_log=True,
                 )

nodescraper/models/taskresult.py

@@ -33,6 +33,15 @@
 
 from .event import Event
 
+STATUS_LOG_LEVEL_MAP = {
+    ExecutionStatus.UNSET: logging.INFO,
+    ExecutionStatus.NOT_RAN: logging.INFO,
+    ExecutionStatus.OK: logging.INFO,
+    ExecutionStatus.WARNING: logging.WARNING,
+    ExecutionStatus.ERROR: logging.ERROR,
+    ExecutionStatus.EXECUTION_FAILURE: logging.CRITICAL,
+}
+
 
 class TaskResult(BaseModel):
     """Object for result of a task"""
@@ -133,4 +142,9 @@ def finalize(self, logger: Optional[logging.Logger] = None) -> None:
             self.message += f" ({event_summary})"
 
         if logger:
-            logger.log(self.status.value, "(%s) %s", self.__class__.__name__, self.message)
+            logger.log(
+                STATUS_LOG_LEVEL_MAP.get(self.status, logging.INFO),
+                "(%s) %s",
+                self.parent,
+                self.message,
+            )

nodescraper/plugins/inband/bios/analyzer_args.py

@@ -30,6 +30,8 @@ class BiosAnalyzerArgs(BaseModel):
     exp_bios_version: list[str] = Field(default_factory=list)
     regex_match: bool = False
 
+    model_config = {"extra": "forbid"}
+
     @field_validator("exp_bios_version", mode="before")
     @classmethod
     def validate_exp_bios_version(cls, exp_bios_version: str | list) -> list:

nodescraper/plugins/inband/cmdline/analyzer_args.py

@@ -30,6 +30,8 @@ class CmdlineAnalyzerArgs(BaseModel):
     required_cmdline: str | list = Field(default_factory=list)
     banned_cmdline: str | list = Field(default_factory=list)
 
+    model_config = {"extra": "forbid"}
+
     @field_validator("required_cmdline", mode="before")
     @classmethod
     def validate_required_cmdline(cls, required_cmdline: str | list) -> list:

nodescraper/plugins/inband/dkms/analyzer_args.py

@@ -23,6 +23,8 @@
 # SOFTWARE.
 #
 ###############################################################################
+from typing import Any
+
 from pydantic import BaseModel, Field, field_validator
 
 
@@ -31,6 +33,12 @@ class DkmsAnalyzerArgs(BaseModel):
     dkms_version: str | list = Field(default_factory=list)
     regex_match: bool = False
 
+    model_config = {"extra": "forbid"}
+
+    def model_post_init(self, __context: Any) -> None:
+        if not self.dkms_status and not self.dkms_version:
+            raise ValueError("At least one of dkms_status or dkms_version must be provided")
+
     @field_validator("dkms_status", mode="before")
     @classmethod
     def validate_dkms_status(cls, dkms_status: str | list) -> list:

nodescraper/plugins/inband/dkms/dkms_analyzer.py

@@ -67,8 +67,8 @@ def analyze_data(
         error_state = False
 
         for check, accepted_values in check_map.items():
+            actual_value = getattr(data, check)
             for accepted_value in accepted_values:
-                actual_value = getattr(data, check)
                 if args.regex_match:
                     try:
                         regex_data = re.compile(accepted_value)

nodescraper/plugins/inband/dmesg/analyzer_args.py

@@ -31,3 +31,5 @@
 class DmesgAnalyzerArgs(TimeRangeAnalyisArgs):
     check_unknown_dmesg_errors: Optional[bool] = True
     exclude_category: Optional[set[str]] = None
+
+    model_config = {"extra": "forbid"}

nodescraper/plugins/inband/kernel/analyzer_args.py

@@ -30,6 +30,8 @@ class KernelAnalyzerArgs(BaseModel):
     exp_kernel: str | list = Field(default_factory=list)
     regex_match: bool = False
 
+    model_config = {"extra": "forbid"}
+
     @field_validator("exp_kernel", mode="before")
     @classmethod
     def validate_exp_kernel(cls, exp_kernel: str | list) -> list: