CM-40909 Add sum-mod extension check for restoring

Author: naftalicy

cycode/cli/files_collector/sca/base_restore_dependencies.py

@@ -31,8 +31,8 @@ def execute_commands(
         # Write all collected outputs to the file if dependencies_file_name is provided
         if dependencies_file_name:
             with open(dependencies_file_name, 'w') as output_file:  # Open once in 'w' mode to start fresh
-                for dependencies in all_dependencies:
-                    output_file.write(dependencies + '\n')
+                dependencies = '\n'.join(all_dependencies)
+                output_file.writelines(dependencies)
     except Exception as e:
         logger.debug('Failed to restore dependencies via shell command, %s', {'filename': file_name}, exc_info=e)
         return None
@@ -92,7 +92,7 @@ def is_project(self, document: Document) -> bool:
         pass
 
     @abstractmethod
-    def get_commands(self, manifest_file_path: str) -> List[str]:
+    def get_commands(self, manifest_file_path: str) -> List[List[str]]:
         pass
 
     @abstractmethod

cycode/cli/files_collector/sca/go/restore_go_dependencies.py

@@ -1,3 +1,4 @@
+import logging
 import os
 from typing import List, Optional
 
@@ -6,15 +7,30 @@
 from cycode.cli.files_collector.sca.base_restore_dependencies import BaseRestoreDependencies
 from cycode.cli.models import Document
 
-GO_PROJECT_FILE_EXTENSIONS = ['.mod']
+GO_PROJECT_FILE_EXTENSIONS = ['.mod', '.sum']
 GO_RESTORE_FILE_NAME = 'go.mod.graph'
 BUILD_GO_FILE_NAME = 'go.mod'
+BUILD_GO_LOCK_FILE_NAME = 'go.sum'
 
 
 class RestoreGoDependencies(BaseRestoreDependencies):
     def __init__(self, context: click.Context, is_git_diff: bool, command_timeout: int) -> None:
         super().__init__(context, is_git_diff, command_timeout, create_output_file_manually=True)
 
+    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+        manifest_exists = os.path.isfile(self.get_working_directory(document) + os.sep + BUILD_GO_FILE_NAME)
+        lock_exists = os.path.isfile(self.get_working_directory(document) + os.sep + BUILD_GO_LOCK_FILE_NAME)
+
+        if not manifest_exists or not lock_exists:
+            logging.info('No manifest go.mod file found' if not manifest_exists else 'No manifest go.sum file found')
+
+        manifest_files_exists = manifest_exists & lock_exists
+
+        if not manifest_files_exists:
+            return None
+
+        return super().try_restore_dependencies(document)
+
     def is_project(self, document: Document) -> bool:
         return any(document.path.endswith(ext) for ext in GO_PROJECT_FILE_EXTENSIONS)
 

cycode/cli/utils/shell_executor.py

@@ -1,5 +1,5 @@
 import subprocess
-from typing import List, Optional
+from typing import List, Optional, Union
 
 import click
 
@@ -9,7 +9,7 @@
 
 
 def shell(
-    command: List[List[str]],
+    command: Union[str, List[str]],
     timeout: int = _SUBPROCESS_DEFAULT_TIMEOUT_SEC,
     working_directory: Optional[str] = None,
 ) -> Optional[str]: