cycode 1.7.1.dev6__tar.gz → 1.7.1.dev8__tar.gz

{cycode-1.7.1.dev6 → cycode-1.7.1.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycode
-Version: 1.7.1.dev6
+Version: 1.7.1.dev8
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 Home-page: https://github.com/cycodehq/cycode-cli
 License: MIT

cycode-1.7.1.dev8/cycode/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.7.1.dev8'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

{cycode-1.7.1.dev6 → cycode-1.7.1.dev8}/cycode/cli/files_collector/sca/maven/base_restore_maven_dependencies.py

@@ -4,7 +4,7 @@ from typing import List, Optional
 import click
 
 from cycode.cli.models import Document
-from cycode.cli.utils.path_utils import get_file_dir, join_paths
+from cycode.cli.utils.path_utils import get_file_content, get_file_dir, join_paths
 from cycode.cli.utils.shell_executor import shell
 from cycode.cyclient import logger
 
@@ -39,6 +39,23 @@ class BaseRestoreMavenDependencies(ABC):
             else document.path
         )
 
+    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+        manifest_file_path = self.get_manifest_file_path(document)
+        restore_file_path = build_dep_tree_path(document.path, self.get_lock_file_name())
+
+        if self.verify_restore_file_already_exist(restore_file_path):
+            restore_file_content = get_file_content(restore_file_path)
+        else:
+            restore_file_content = execute_command(
+                self.get_command(manifest_file_path), manifest_file_path, self.command_timeout
+            )
+
+        return Document(restore_file_path, restore_file_content, self.is_git_diff)
+
+    @abstractmethod
+    def verify_restore_file_already_exist(self, restore_file_path: str) -> bool:
+        pass
+
     @abstractmethod
     def is_project(self, document: Document) -> bool:
         pass
@@ -50,11 +67,3 @@ class BaseRestoreMavenDependencies(ABC):
     @abstractmethod
     def get_lock_file_name(self) -> str:
         pass
-
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
-        manifest_file_path = self.get_manifest_file_path(document)
-        return Document(
-            build_dep_tree_path(document.path, self.get_lock_file_name()),
-            execute_command(self.get_command(manifest_file_path), manifest_file_path, self.command_timeout),
-            self.is_git_diff,
-        )

{cycode-1.7.1.dev6 → cycode-1.7.1.dev8}/cycode/cli/files_collector/sca/maven/restore_gradle_dependencies.py

@@ -1,3 +1,4 @@
+import os
 from typing import List
 
 import click
@@ -22,3 +23,6 @@ class RestoreGradleDependencies(BaseRestoreMavenDependencies):
 
     def get_lock_file_name(self) -> str:
         return BUILD_GRADLE_DEP_TREE_FILE_NAME
+
+    def verify_restore_file_already_exist(self, restore_file_path: str) -> bool:
+        return os.path.isfile(restore_file_path)

{cycode-1.7.1.dev6 → cycode-1.7.1.dev8}/cycode/cli/files_collector/sca/maven/restore_maven_dependencies.py

@@ -29,6 +29,9 @@ class RestoreMavenDependencies(BaseRestoreMavenDependencies):
     def get_lock_file_name(self) -> str:
         return join_paths('target', MAVEN_CYCLONE_DEP_TREE_FILE_NAME)
 
+    def verify_restore_file_already_exist(self, restore_file_path: str) -> bool:
+        return False
+
     def try_restore_dependencies(self, document: Document) -> Optional[Document]:
         restore_dependencies_document = super().try_restore_dependencies(document)
         manifest_file_path = self.get_manifest_file_path(document)

{cycode-1.7.1.dev6 → cycode-1.7.1.dev8}/cycode/cyclient/scan_client.py

@@ -171,6 +171,13 @@ class ScanClient:
     def get_scan_detections_path(self, scan_type: str) -> str:
         return f'{self.scan_config.get_detections_prefix()}/{self.get_detections_service_controller_path(scan_type)}'
 
+    def get_scan_detections_list_path(self, scan_type: str) -> str:
+        suffix = ''
+        if scan_type == consts.SCA_SCAN_TYPE:
+            suffix = '/detections'
+
+        return f'{self.get_scan_detections_path(scan_type)}{suffix}'
+
     def get_scan_detections(self, scan_type: str, scan_id: str) -> List[dict]:
         params = {'scan_id': scan_id}
 
@@ -184,9 +191,8 @@ class ScanClient:
             params['page_size'] = page_size
             params['page_number'] = page_number
 
-            path = f'{self.get_scan_detections_path(scan_type)}/detections'
             response = self.scan_cycode_client.get(
-                url_path=path,
+                url_path=self.get_scan_detections_list_path(scan_type),
                 params=params,
                 hide_response_content_log=self._hide_response_log,
             ).json()
@@ -197,12 +203,12 @@ class ScanClient:
 
         return detections
 
-    def get_get_scan_detections_count_path(self, scan_type: str) -> str:
+    def get_scan_detections_count_path(self, scan_type: str) -> str:
         return f'{self.get_scan_detections_path(scan_type)}/count'
 
     def get_scan_detections_count(self, scan_type: str, scan_id: str) -> int:
         response = self.scan_cycode_client.get(
-            url_path=self.get_get_scan_detections_count_path(scan_type), params={'scan_id': scan_id}
+            url_path=self.get_scan_detections_count_path(scan_type), params={'scan_id': scan_id}
         )
         return response.json().get('count', 0)
 

{cycode-1.7.1.dev6 → cycode-1.7.1.dev8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycode"
-version = "1.7.1.dev6" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+version = "1.7.1.dev8" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
 description = "Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning."
 keywords=["secret-scan", "cycode", "devops", "token", "secret", "security", "cycode", "code"]
 authors = ["Cycode <support@cycode.com>"]

cycode-1.7.1.dev6/cycode/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.7.1.dev6'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag