cycode 3.11.2.dev12__tar.gz → 3.11.3__tar.gz

{cycode-3.11.2.dev12 → cycode-3.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cycode
-Version: 3.11.2.dev12
+Version: 3.11.3
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 License-Expression: MIT
 License-File: LICENCE

cycode-3.11.3/cycode/__init__.py

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

{cycode-3.11.2.dev12 → cycode-3.11.3}/cycode/cli/files_collector/sca/base_restore_dependencies.py

@@ -92,7 +92,9 @@ class BaseRestoreDependencies(ABC):
             )
             if output is None:  # one of the commands failed
                 return None
+            file_was_generated = True
         else:
+            file_was_generated = False
             logger.debug(
                 'Lock file already exists, skipping restore commands, %s',
                 {'restore_file_path': restore_file_path},
@@ -107,6 +109,14 @@ class BaseRestoreDependencies(ABC):
                 'content_empty': not restore_file_content,
             },
         )
+
+        if file_was_generated:
+            try:
+                Path(restore_file_path).unlink(missing_ok=True)
+                logger.debug('Cleaned up generated restore file, %s', {'restore_file_path': restore_file_path})
+            except Exception as e:
+                logger.debug('Failed to clean up generated restore file', exc_info=e)
+
         return Document(relative_restore_file_path, restore_file_content, self.is_git_diff)
 
     def get_manifest_dir(self, document: Document) -> Optional[str]:

{cycode-3.11.2.dev12 → cycode-3.11.3}/cycode/cli/files_collector/sca/maven/restore_maven_dependencies.py

@@ -1,4 +1,5 @@
 from os import path
+from pathlib import Path
 from typing import Optional
 
 import typer
@@ -9,7 +10,10 @@ from cycode.cli.files_collector.sca.base_restore_dependencies import (
     execute_commands,
 )
 from cycode.cli.models import Document
-from cycode.cli.utils.path_utils import get_file_content, get_file_dir, join_paths
+from cycode.cli.utils.path_utils import get_file_content, join_paths
+from cycode.logger import get_logger
+
+logger = get_logger('Maven Restore Dependencies')
 
 BUILD_MAVEN_FILE_NAME = 'pom.xml'
 MAVEN_CYCLONE_DEP_TREE_FILE_NAME = 'bom.json'
@@ -42,15 +46,8 @@ class RestoreMavenDependencies(BaseRestoreDependencies):
         if document.content is None:
             return self.restore_from_secondary_command(document, manifest_file_path)
 
-        restore_dependencies_document = super().try_restore_dependencies(document)
-        if restore_dependencies_document is None:
-            return None
-
-        restore_dependencies_document.content = get_file_content(
-            join_paths(get_file_dir(manifest_file_path), self.get_lock_file_name())
-        )
-
-        return restore_dependencies_document
+        # super() reads the content and cleans up any generated file; no re-read needed
+        return super().try_restore_dependencies(document)
 
     def restore_from_secondary_command(self, document: Document, manifest_file_path: str) -> Optional[Document]:
         restore_content = execute_commands(
@@ -62,11 +59,17 @@ class RestoreMavenDependencies(BaseRestoreDependencies):
             return None
 
         restore_file_path = build_dep_tree_path(document.absolute_path, MAVEN_DEP_TREE_FILE_NAME)
+        content = get_file_content(restore_file_path)
+
+        try:
+            Path(restore_file_path).unlink(missing_ok=True)
+        except Exception as e:
+            logger.debug('Failed to clean up generated maven dep tree file', exc_info=e)
+
         return Document(
             path=build_dep_tree_path(document.path, MAVEN_DEP_TREE_FILE_NAME),
-            content=get_file_content(restore_file_path),
+            content=content,
             is_git_diff_format=self.is_git_diff,
-            absolute_path=restore_file_path,
         )
 
     def create_secondary_restore_commands(self, manifest_file_path: str) -> list[list[str]]:

{cycode-3.11.2.dev12 → cycode-3.11.3}/pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.14",
 ]
 dynamic = ["dependencies"]
-version = "3.11.2.dev12"
+version = "3.11.3"
 
 [project.scripts]
 cycode = "cycode.cli.app:app"

cycode-3.11.2.dev12/cycode/__init__.py

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