Refactor: avoid code duplication by include/exclude filtering for tests input and output files

Signed-off-by: Simone Tollardo <[email protected]>

Author: tollsimy

src/send_kcidb.py

@@ -190,13 +190,13 @@ def _parse_checkout_node(self, origin, checkout_node):
             }
         }]
 
-    def _get_input_files(self, artifacts: dict, exclude_properties=None):
+    def _filter_artifacts(self, artifacts: dict, exclude_properties=None, 
+                          include_properties=None):
         input_files = []
         for name, url in artifacts.items():
-            if exclude_properties and name in exclude_properties:
+            if exclude_properties and any(prop in name for prop in exclude_properties):
                 continue
-            if not name.startswith('input_'):
-                # Skip output files
+            if include_properties and not any(prop in name for prop in include_properties):
                 continue
             # Replace "/" with "_" to match with the allowed pattern
             # for "name" property of "input_files" i.e. '^[^/]+$'
@@ -209,25 +209,6 @@ def _get_input_files(self, artifacts: dict, exclude_properties=None):
             )
         return input_files
 
-    def _get_output_files(self, artifacts: dict, exclude_properties=None):
-        output_files = []
-        for name, url in artifacts.items():
-            if exclude_properties and name in exclude_properties:
-                continue
-            if name.startswith('input_'):
-                # Skip input files
-                continue
-            # Replace "/" with "_" to match with the allowed pattern
-            # for "name" property of "output_files" i.e. '^[^/]+$'
-            name = name.replace("/", "_")
-            output_files.append(
-                {
-                    'name': name,
-                    'url': url
-                }
-            )
-        return output_files
-
     def _get_log_excerpt(self, log_url):
         """Parse compressed(gzip) or text log file and return last 16*1024 characters as it's
         the maximum allowed length for KCIDB `log_excerpt` field"""
@@ -558,13 +539,13 @@ def _parse_test_node(self, origin, test_node):
 
         artifacts = self._get_artifacts(test_node)
         if artifacts:
-            parsed_test_node['input_files'] = self._get_input_files(
+            parsed_test_node['input_files'] = self._filter_artifacts(
                 artifacts=artifacts,
-                exclude_properties=None
+                include_properties=('input_')
             )
-            parsed_test_node['output_files'] = self._get_output_files(
+            parsed_test_node['output_files'] = self._filter_artifacts(
                 artifacts=artifacts,
-                exclude_properties=('lava_log', 'test_log')
+                exclude_properties=('lava_log', 'test_log', 'input_')
             )
             if artifacts.get('lava_log'):
                 parsed_test_node['log_url'] = artifacts.get('lava_log')