CM-52199 - Fix --gradle-all-sub-projects and --no-restore scan options (#330)

Author: MarshalX

cycode/cli/consts.py

@@ -280,10 +280,6 @@
 # Result: A -> ... -> C
 SCA_SHORTCUT_DEPENDENCY_PATHS = 2
 
-SCA_SKIP_RESTORE_DEPENDENCIES_FLAG = 'no-restore'
-
-SCA_GRADLE_ALL_SUB_PROJECTS_FLAG = 'gradle-all-sub-projects'
-
 PLASTIC_VCS_DATA_SEPARATOR = ':::'
 PLASTIC_VSC_CLI_TIMEOUT = 10
 PLASTIC_VCS_REMOTE_URI_PREFIX = 'plastic::'

cycode/cli/files_collector/sca/maven/restore_gradle_dependencies.py

@@ -27,7 +27,7 @@ def __init__(
         self.projects = self.get_all_projects() if self.is_gradle_sub_projects() else projects
 
     def is_gradle_sub_projects(self) -> bool:
-        return self.ctx.params.get('gradle-all-sub-projects', False)
+        return self.ctx.params.get('gradle_all_sub_projects', False)
 
     def is_project(self, document: Document) -> bool:
         return document.path.endswith(BUILD_GRADLE_FILE_NAME) or document.path.endswith(BUILD_GRADLE_KTS_FILE_NAME)

cycode/cli/files_collector/sca/sca_file_collector.py

@@ -165,6 +165,6 @@ def _add_dependencies_tree_documents(
 def add_sca_dependencies_tree_documents_if_needed(
     ctx: typer.Context, scan_type: str, documents_to_scan: list[Document], is_git_diff: bool = False
 ) -> None:
-    no_restore = ctx.params.get('no-restore', False)
+    no_restore = ctx.params.get('no_restore', False)
     if scan_type == consts.SCA_SCAN_TYPE and not no_restore:
         _add_dependencies_tree_documents(ctx, documents_to_scan, is_git_diff)