Ruff: Add TD007 and N803 (#12002)

* Ruff: Add TD007 and N803

* review

Author: manuel-sommer

dojo/tools/nexpose/parser.py

@@ -101,25 +101,25 @@ def parse_html_type(self, node):
 
         return ret
 
-    def parse_tests_type(self, node, vulnsDefinitions):
+    def parse_tests_type(self, node, vulns_definitions):
         """
         Parse XML element of type TestsType
 
-        @return vulns A list of vulnerabilities according to vulnsDefinitions
+        @return vulns A list of vulnerabilities according to vulns_definitions
         """
         vulns = []
 
         for tests in node.findall("tests"):
             for test in tests.findall("test"):
-                if test.get("id") in vulnsDefinitions and (
+                if test.get("id") in vulns_definitions and (
                     test.get("status")
                     in {
                         "vulnerable-exploited",
                         "vulnerable-version",
                         "vulnerable-potential",
                     }
                 ):
-                    vuln = vulnsDefinitions[test.get("id").lower()]
+                    vuln = vulns_definitions[test.get("id").lower()]
                     for desc in list(test):
                         if "pluginOutput" in vuln:
                             vuln[

dojo/tools/ort/parser.py

@@ -40,12 +40,12 @@ def parse_json(self, json_output):
 
         return tree
 
-    def get_items(self, evaluatedModel, test):
+    def get_items(self, evaluated_model, test):
         items = {}
-        packages = evaluatedModel["packages"]
-        dependency_trees = evaluatedModel["dependency_trees"]
-        rule_violations = evaluatedModel["rule_violations"]
-        licenses = evaluatedModel["licenses"]
+        packages = evaluated_model["packages"]
+        dependency_trees = evaluated_model["dependency_trees"]
+        rule_violations = evaluated_model["rule_violations"]
+        licenses = evaluated_model["licenses"]
         rule_violations_unresolved = get_unresolved_rule_violations(
             rule_violations,
         )

dojo/tools/sarif/parser.py

@@ -219,9 +219,9 @@ def get_snippet(location):
     return snippet
 
 
-def get_codeFlowsDescription(codeFlows):
+def get_codeFlowsDescription(code_flows):
     description = ""
-    for codeFlow in codeFlows:
+    for codeFlow in code_flows:
         for threadFlow in codeFlow.get("threadFlows", []):
             if "locations" not in threadFlow:
                 continue

dojo/tools/wizcli_common_parsers/parsers.py

@@ -133,10 +133,10 @@ def parse_rule_matches(rule_matches, test):
         return findings
 
     @staticmethod
-    def parse_os_packages(osPackages, test):
+    def parse_os_packages(os_packages, test):
         findings = []
-        if osPackages:
-            for osPackage in osPackages:
+        if os_packages:
+            for osPackage in os_packages:
                 pkg_name = osPackage.get("name", "N/A")
                 pkg_version = osPackage.get("version", "N/A")
                 vulnerabilities = osPackage.get("vulnerabilities", [])

ruff.toml

@@ -37,7 +37,7 @@ select = [
    "W",
    "C90",
    "I",
-   "N804", "N811", "N814", "N818",
+   "N803", "N804", "N811", "N814", "N818",
    "D2", "D3", "D402", "D403", "D405", "D406", "D407", "D408", "D409", "D410", "D411", "D412", "D413", "D414", "D416",
    "UP",
    "YTT",
@@ -69,7 +69,7 @@ select = [
    "INT",
    "ARG003", "ARG004", "ARG005",
    "PTH2", "PTH10", "PTH11", "PTH120", "PTH121", "PTH122", "PTH124",
-   "TD001", "TD004", "TD005",
+   "TD001", "TD004", "TD005", "TD007",
    "FIX",
    "PD",
    "PGH",

unittests/dojo_test_case.py

@@ -508,7 +508,7 @@ def get_results_by_id(self, results: list, object_id: int) -> dict | None:
     def import_scan_with_params(self, filename, scan_type="ZAP Scan", engagement=1, minimum_severity="Low", *, active=True, verified=False,
                                 push_to_jira=None, endpoint_to_add=None, tags=None, close_old_findings=False, group_by=None, engagement_name=None,
                                 product_name=None, product_type_name=None, auto_create_context=None, expected_http_status_code=201, test_title=None,
-                                scan_date=None, service=None, forceActive=True, forceVerified=True):
+                                scan_date=None, service=None, force_active=True, force_verified=True):
 
         with open(get_unit_tests_path() / filename, encoding="utf-8") as testfile:
             payload = {

unittests/test_import_reimport.py

@@ -366,7 +366,7 @@ def test_import_veracode_reimport_veracode_active_verified_mitigated(self):
         logger.debug("reimporting exact same original veracode mitigated xml report again")
 
         import_veracode_many_findings = self.import_scan_with_params(self.veracode_mitigated_findings, scan_type=self.scan_type_veracode,
-                                                                     verified=True, forceActive=True, forceVerified=True)
+                                                                     verified=True, force_active=True, force_verified=True)
 
         test_id = import_veracode_many_findings["test"]
 
@@ -1808,16 +1808,16 @@ def reimport_scan_ui(self, test, payload):
 
     def import_scan_with_params_ui(self, filename, scan_type="ZAP Scan", engagement=1, minimum_severity="Low", *, active=True, verified=False,
                                    push_to_jira=None, endpoint_to_add=None, tags=None, close_old_findings=False, scan_date=None, service=None,
-                                   forceActive=False, forceVerified=False):
+                                   force_active=False, force_verified=False):
 
         activePayload = "not_specified"
-        if forceActive:
+        if force_active:
             activePayload = "force_to_true"
         elif not active:
             activePayload = "force_to_false"
 
         verifiedPayload = "not_specified"
-        if forceVerified:
+        if force_verified:
             verifiedPayload = "force_to_true"
         elif not verified:
             verifiedPayload = "force_to_false"

unittests/tools/test_checkmarx_cxflow_sast_parser.py

@@ -7,8 +7,8 @@
 
 class TestCheckmarxCxflowSast(DojoTestCase):
 
-    def init(self, reportFilename):
-        my_file_handle = open(reportFilename, encoding="utf-8")
+    def init(self, report_filename):
+        my_file_handle = open(report_filename, encoding="utf-8")
         product = Product()
         engagement = Engagement()
         test = Test()

unittests/tools/test_checkmarx_parser.py

@@ -11,8 +11,8 @@ class TestCheckmarxParser(DojoTestCase):
     # comment out to get full diff with big reports
     # maxDiff = None
 
-    def init(self, reportFilename):
-        my_file_handle = open(reportFilename, encoding="utf-8")
+    def init(self, report_filename):
+        my_file_handle = open(report_filename, encoding="utf-8")
         product = Product()
         engagement = Engagement()
         test = Test()

unittests/tools/test_sonarqube_parser.py

@@ -7,8 +7,8 @@ class TestSonarQubeParser(DojoTestCase):
     # comment out to get full diff with big reports
     # maxDiff = None
 
-    def init(self, reportFilename):
-        my_file_handle = open(reportFilename, encoding="utf-8")
+    def init(self, report_filename):
+        my_file_handle = open(report_filename, encoding="utf-8")
         product = Product()
         engagement = Engagement()
         test = Test()