File filtering management with relative paths

oxsecurity · Sep 15, 2022 · 6f25336 · 6f25336
1 parent afcdcaa
commit 6f25336
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/megalinter/Linter.py b/megalinter/Linter.py
@@ -788,6 +788,7 @@ def collect_files(self, all_files):
             file_contains_regex=self.file_contains_regex,
             files_sub_directory=self.files_sub_directory,
             lint_all_other_linters_files=self.lint_all_other_linters_files,
+            workspace=self.workspace
         )
         self.files_number = len(self.files)
         logging.debug(

diff --git a/megalinter/MegaLinter.py b/megalinter/MegaLinter.py
@@ -617,6 +617,7 @@ def collect_files(self):
             file_extensions=self.file_extensions,
             ignored_files=ignored_files,
             ignore_generated_files=self.ignore_generated_files,
+            workspace=self.workspace
         )
 
         logging.info(

diff --git a/megalinter/utils.py b/megalinter/utils.py
@@ -72,6 +72,7 @@ def filter_files(
     file_contains_regex: Optional[Sequence[str]] = None,
     files_sub_directory: Optional[str] = None,
     lint_all_other_linters_files: bool = False,
+    workspace: Optional[str] = '',
     prefix: Optional[str] = None,
 ) -> Sequence[str]:
     file_extensions = set(file_extensions)
@@ -98,6 +99,7 @@ def filter_files(
 
     for file in all_files:
         file_with_prefix_and_sub_dir = os.path.normpath(file)
+        file_absolute = os.path.join(workspace, file_with_prefix_and_sub_dir)
         file = file_with_prefix_and_sub_dir
 
         if prefix or files_sub_directory:
@@ -142,16 +144,16 @@ def filter_files(
         # Skip according to end of file name
         if file_names_not_ends_with and file.endswith(tuple(file_names_not_ends_with)):
             continue
-        # Skip according to file name regex
+        # Skip according to file content regex
         if file_contains_regex and not file_contains(
-            file_with_prefix_and_sub_dir, file_contains_regex_object
+            file_absolute, file_contains_regex_object
         ):
             continue
         # Skip according to IGNORE_GENERATED_FILES
         if (
             ignore_generated_files is not None
             and ignore_generated_files is True
-            and file_is_generated(file_with_prefix_and_sub_dir)
+            and file_is_generated(file_absolute)
         ):
             continue