CM-17670 - Fix Gradle dependencies location in monitor mode (#49)

* Fix gradle dependencies location in monitor mode

* Minor refactoring

* Minor CR Changes

Author: avishaiamiel

cli/code_scanner.py

@@ -43,6 +43,7 @@ def scan_repository(context: click.Context, path, branch, monitor):
     """ Scan git repository including its history """
     try:
         logger.debug('Starting repository scan process, %s', {'path': path, 'branch': branch})
+        context.obj["monitor"] = monitor
         scan_type = context.obj["scan_type"]
         if monitor and scan_type != SCA_SCAN_TYPE:
             raise click.ClickException(f"Monitor flag is currently supported for SCA scan type only")
@@ -53,6 +54,7 @@ def scan_repository(context: click.Context, path, branch, monitor):
             for obj
             in get_git_repository_tree_file_entries(path, branch)]
         documents_to_scan = exclude_irrelevant_documents_to_scan(context, documents_to_scan)
+        perform_pre_scan_documents_actions(context, scan_type, documents_to_scan, False)
         logger.debug('Found all relevant files for scanning %s', {'path': path, 'branch': branch})
         return scan_documents(context, documents_to_scan, is_git_diff=False,
                               scan_parameters=get_scan_parameters(path, monitor))
@@ -136,13 +138,15 @@ def pre_commit_scan(context: click.Context, ignored_args: List[str]):
 
 
 def scan_disk_files(context: click.Context, paths: List[str]):
+    scan_type = context.obj['scan_type']
     is_git_diff = False
     documents: List[Document] = []
     for path in paths:
         with open(path, "r", encoding="utf-8") as f:
             content = f.read()
             documents.append(Document(path, content, is_git_diff))
 
+    perform_pre_scan_documents_actions(context, scan_type, documents, is_git_diff)
     return scan_documents(context, documents, is_git_diff=is_git_diff)
 
 
@@ -159,7 +163,6 @@ def scan_documents(context: click.Context, documents_to_scan: List[Document],
     zipped_documents = InMemoryZip()
 
     try:
-        perform_pre_scan_documents_actions(scan_type, documents_to_scan, is_git_diff)
         zipped_documents = zip_documents_to_scan(scan_type, zipped_documents, documents_to_scan)
         scan_result = perform_scan(cycode_client, zipped_documents, scan_type, scan_id, is_git_diff, is_commit_range,
                                    scan_parameters)
@@ -188,9 +191,10 @@ def scan_documents(context: click.Context, documents_to_scan: List[Document],
                         all_detections_count, len(documents_to_scan), zip_file_size, scan_command_type, error_message)
 
 
-def perform_pre_scan_documents_actions(scan_type: str, documents_to_scan: List[Document], is_git_diff: bool = False):
-    if scan_type == 'sca':
-        sca_code_scanner.run_pre_scan_actions(documents_to_scan, is_git_diff)
+def perform_pre_scan_documents_actions(context: click.Context, scan_type: str, documents_to_scan: List[Document],
+                                       is_git_diff: bool = False):
+    if scan_type == SCA_SCAN_TYPE:
+        sca_code_scanner.run_pre_scan_actions(context, documents_to_scan, is_git_diff)
 
 
 def zip_documents_to_scan(scan_type: str, zip: InMemoryZip, documents: List[Document]):

cli/helpers/sca_code_scanner.py

@@ -1,5 +1,6 @@
-from cli.utils.shell_executor import shell
+import click
 from typing import List, Optional
+from cli.utils.shell_executor import shell
 from cli.models import Document
 from cli.utils.path_utils import get_file_dir, join_paths
 from cyclient import logger
@@ -10,11 +11,14 @@
 BUILD_GRADLE_DEP_TREE_TIMEOUT = 180
 
 
-def run_pre_scan_actions(documents_to_scan: List[Document], is_git_diff: bool = False):
+def run_pre_scan_actions(context: click.Context, documents_to_scan: List[Document], is_git_diff: bool = False):
+    is_monitor_action = context.obj.get('monitor')
+    project_path = context.params.get('path')
     documents_to_add: List[Document] = []
     for document in documents_to_scan:
         if is_gradle_project(document):
-            gradle_dependencies_tree = try_generate_dependencies_tree(document.path)
+            gradle_dependencies_tree = try_generate_dependencies_tree(
+                get_manifest_file_path(document, is_monitor_action, project_path))
             if gradle_dependencies_tree is None:
                 logger.warning('Error occurred while trying to generate gradle dependencies tree. %s',
                                {'filename': document.path})
@@ -27,6 +31,10 @@ def run_pre_scan_actions(documents_to_scan: List[Document], is_git_diff: bool =
     documents_to_scan.extend(documents_to_add)
 
 
+def get_manifest_file_path(document, is_monitor_action, project_path):
+    return join_paths(project_path, document.path) if is_monitor_action else document.path
+
+
 def try_generate_dependencies_tree(filename: str) -> Optional[str]:
     command = ['gradle', 'dependencies', '-b', filename, '-q', '--console', 'plain']
     try: