CM-17794 SCA CLI - Support Maven (#98)

Author: morsa4406

cli/helpers/maven/restore_maven_dependencies.py

@@ -1,3 +1,4 @@
+from os import path
 from typing import List, Optional
 
 import click
@@ -18,7 +19,7 @@ def __init__(self, context: click.Context, is_git_diff: bool,
         super().__init__(context, is_git_diff, command_timeout)
 
     def is_project(self, document: Document) -> bool:
-        return document.path.endswith(BUILD_MAVEN_FILE_NAME)
+        return path.basename(document.path).split('/')[-1] == BUILD_MAVEN_FILE_NAME
 
     def get_command(self, manifest_file_path: str) -> List[str]:
         return ['mvn', 'org.cyclonedx:cyclonedx-maven-plugin:2.7.4:makeAggregateBom', '-f', manifest_file_path]
@@ -34,7 +35,7 @@ def try_restore_dependencies(self, document: Document) -> Optional[Document]:
                                                                                 restore_dependencies_document)
         else:
             restore_dependencies_document.content = get_file_content(
-                join_paths(get_file_dir(manifest_file_path), restore_dependencies_document.path))
+                join_paths(get_file_dir(manifest_file_path), self.get_lock_file_name()))
 
         return restore_dependencies_document
 

cli/helpers/sca_code_scanner.py

@@ -1,5 +1,5 @@
 import os
-from typing import List, Optional
+from typing import List, Optional, Dict
 
 import click
 from git import Repo, GitCommandError
@@ -88,19 +88,23 @@ def try_restore_dependencies(context: click.Context, documents_to_add: List[Docu
             project_path = context.params.get('path')
             manifest_file_path = get_manifest_file_path(document, is_monitor_action, project_path)
             logger.debug(f"Succeeded to generate dependencies tree on path: {manifest_file_path}")
-        documents_to_add.append(restore_dependencies_document)
+
+        if restore_dependencies_document.path in documents_to_add:
+            logger.debug(f"Duplicate document on restore for path: {restore_dependencies_document.path}")
+        else:
+            documents_to_add[restore_dependencies_document.path] = restore_dependencies_document
 
 
 def add_dependencies_tree_document(context: click.Context, documents_to_scan: List[Document],
                                    is_git_diff: bool = False) -> None:
-    documents_to_add: List[Document] = []
+    documents_to_add: Dict[str, Document] = {}
     restore_dependencies_list = restore_handlers(context, is_git_diff)
 
     for restore_dependencies in restore_dependencies_list:
         for document in documents_to_scan:
             try_restore_dependencies(context, documents_to_add, restore_dependencies, document)
 
-    documents_to_scan.extend(documents_to_add)
+    documents_to_scan.extend(list(documents_to_add.values()))
 
 
 def restore_handlers(context, is_git_diff):