addressed reviews

Author: alexandraBara

nodescraper/cli/cli.py

@@ -426,8 +426,9 @@ def main(arg_input: Optional[list[str]] = None):
         )
 
         if parsed_args.skip_sudo:
-            for pcfg in plugin_config_inst_list:
-                pcfg.global_args.setdefault("collection_args", {})["skip_sudo"] = True
+            plugin_config_inst_list[-1].global_args.setdefault("collection_args", {})[
+                "skip_sudo"
+            ] = True
 
         log_system_info(log_path, system_info, logger)
     except Exception as e:

nodescraper/plugins/inband/dimm/dimm_collector.py

@@ -46,11 +46,6 @@ def collect_data(
         if args is None:
             args = DimmCollectorArgs()
 
-        if args.skip_sudo:
-            self.result.message = "Skipping sudo plugin"
-            self.result.status = ExecutionStatus.NOT_RAN
-            return self.result, None
-
         dimm_str = None
         if self.system_info.os_family == OSFamily.WINDOWS:
             res = self._run_sut_cmd("wmic memorychip get Capacity")
@@ -70,6 +65,10 @@ def collect_data(
                 for capacity, count in capacities.items():
                     dimm_str += f"{count} x {capacity / 1024 / 1024:.2f}GB "
         else:
+            if args.skip_sudo:
+                self.result.message = "Skipping sudo plugin"
+                self.result.status = ExecutionStatus.NOT_RAN
+                return self.result, None
             res = self._run_sut_cmd(
                 """sh -c 'dmidecode -t 17 | tr -s " " | grep -v "Volatile\\|None\\|Module" | grep Size' 2>/dev/null""",
                 sudo=True,

nodescraper/plugins/inband/storage/storage_collector.py

@@ -46,10 +46,6 @@ def collect_data(
         if args is None:
             args = StorageCollectorArgs()
 
-        if args.skip_sudo:
-            self.result.message = "Skipping sudo plugin"
-            self.result.status = ExecutionStatus.NOT_RAN
-            return self.result, None
         storage_data = {}
         if self.system_info.os_family == OSFamily.WINDOWS:
             res = self._run_sut_cmd(
@@ -66,6 +62,10 @@ def collect_data(
                             percent=round((int(size) - int(free_space)) / int(size) * 100, 2),
                         )
         else:
+            if args.skip_sudo:
+                self.result.message = "Skipping sudo plugin"
+                self.result.status = ExecutionStatus.NOT_RAN
+                return self.result, None
             res = self._run_sut_cmd("""sh -c 'df -lH -B1 | grep -v 'boot''""", sudo=True)
             if res.exit_code == 0:
                 for line in res.stdout.splitlines()[1:]: