cycode 3.10.1.dev3__py3-none-any.whl → 3.10.2.dev1__py3-none-any.whl

cycode/__init__.py

@@ -1 +1 @@
-__version__ = '3.10.1.dev3'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+__version__ = '3.10.2.dev1'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

cycode/cli/files_collector/sca/base_restore_dependencies.py

@@ -7,6 +7,9 @@ import typer
 from cycode.cli.models import Document
 from cycode.cli.utils.path_utils import get_file_content, get_file_dir, get_path_from_context, join_paths
 from cycode.cli.utils.shell_executor import shell
+from cycode.logger import get_logger
+
+logger = get_logger('SCA Restore')
 
 
 def build_dep_tree_path(path: str, generated_file_name: str) -> str:
@@ -19,6 +22,16 @@ def execute_commands(
     output_file_path: Optional[str] = None,
     working_directory: Optional[str] = None,
 ) -> Optional[str]:
+    logger.debug(
+        'Executing restore commands, %s',
+        {
+            'commands_count': len(commands),
+            'timeout_sec': timeout,
+            'working_directory': working_directory,
+            'output_file_path': output_file_path,
+        },
+    )
+
     try:
         outputs = []
 
@@ -32,7 +45,8 @@ def execute_commands(
         if output_file_path:
             with open(output_file_path, 'w', encoding='UTF-8') as output_file:
                 output_file.writelines(joined_output)
-    except Exception:
+    except Exception as e:
+        logger.debug('Unexpected error during command execution', exc_info=e)
         return None
 
     return joined_output
@@ -75,8 +89,21 @@ class BaseRestoreDependencies(ABC):
             )
             if output is None:  # one of the commands failed
                 return None
+        else:
+            logger.debug(
+                'Lock file already exists, skipping restore commands, %s',
+                {'restore_file_path': restore_file_path},
+            )
 
         restore_file_content = get_file_content(restore_file_path)
+        logger.debug(
+            'Restore file loaded, %s',
+            {
+                'restore_file_path': restore_file_path,
+                'content_size': len(restore_file_content) if restore_file_content else 0,
+                'content_empty': not restore_file_content,
+            },
+        )
         return Document(relative_restore_file_path, restore_file_content, self.is_git_diff)
 
     def get_working_directory(self, document: Document) -> Optional[str]:

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

@@ -4,8 +4,10 @@ from typing import Optional
 import typer
 
 from cycode.cli.files_collector.sca.base_restore_dependencies import BaseRestoreDependencies
-from cycode.cli.logger import logger
 from cycode.cli.models import Document
+from cycode.logger import get_logger
+
+logger = get_logger('Go Restore Dependencies')
 
 GO_PROJECT_FILE_EXTENSIONS = ['.mod', '.sum']
 GO_RESTORE_FILE_NAME = 'go.mod.graph'

cycode/cli/files_collector/sca/sca_file_collector.py

@@ -106,11 +106,17 @@ def _try_restore_dependencies(
 
     restore_dependencies_document = restore_dependencies.restore(document)
     if restore_dependencies_document is None:
-        logger.warning('Error occurred while trying to generate dependencies tree, %s', {'filename': document.path})
+        logger.warning(
+            'Error occurred while trying to generate dependencies tree, %s',
+            {'filename': document.path, 'handler': type(restore_dependencies).__name__},
+        )
         return None
 
     if restore_dependencies_document.content is None:
-        logger.warning('Error occurred while trying to generate dependencies tree, %s', {'filename': document.path})
+        logger.warning(
+            'Error occurred while trying to generate dependencies tree, %s',
+            {'filename': document.path, 'handler': type(restore_dependencies).__name__},
+        )
         restore_dependencies_document.content = ''
     else:
         is_monitor_action = ctx.obj.get('monitor', False)
@@ -124,6 +130,13 @@ def _try_restore_dependencies(
 
 def _get_restore_handlers(ctx: typer.Context, is_git_diff: bool) -> list[BaseRestoreDependencies]:
     build_dep_tree_timeout = int(os.getenv('CYCODE_BUILD_DEP_TREE_TIMEOUT_SECONDS', BUILD_DEP_TREE_TIMEOUT))
+    logger.debug(
+        'SCA restore handler timeout, %s',
+        {
+            'timeout_sec': build_dep_tree_timeout,
+            'source': 'env' if os.getenv('CYCODE_BUILD_DEP_TREE_TIMEOUT_SECONDS') else 'default',
+        },
+    )
     return [
         RestoreGradleDependencies(ctx, is_git_diff, build_dep_tree_timeout),
         RestoreMavenDependencies(ctx, is_git_diff, build_dep_tree_timeout),

cycode/cli/utils/shell_executor.py

@@ -1,4 +1,5 @@
 import subprocess
+import time
 from typing import Optional, Union
 
 import click
@@ -21,15 +22,27 @@ def shell(
     logger.debug('Executing shell command: %s', command)
 
     try:
+        start = time.monotonic()
         result = subprocess.run(  # noqa: S603
             command, cwd=working_directory, timeout=timeout, check=True, capture_output=True
         )
-        logger.debug('Shell command executed successfully')
+        duration_sec = round(time.monotonic() - start, 2)
+        stdout = result.stdout.decode('UTF-8').strip()
+        stderr = result.stderr.decode('UTF-8').strip()
 
-        return result.stdout.decode('UTF-8').strip()
+        logger.debug(
+            'Shell command executed successfully, %s',
+            {'duration_sec': duration_sec, 'stdout': stdout if stdout else '', 'stderr': stderr if stderr else ''},
+        )
+
+        return stdout
     except subprocess.CalledProcessError as e:
         if not silent_exc_info:
             logger.debug('Error occurred while running shell command', exc_info=e)
+            if e.stdout:
+                logger.debug('Shell command stdout: %s', e.stdout.decode('UTF-8').strip())
+            if e.stderr:
+                logger.debug('Shell command stderr: %s', e.stderr.decode('UTF-8').strip())
     except subprocess.TimeoutExpired as e:
         logger.debug('Command timed out', exc_info=e)
         raise typer.Abort(f'Command "{command}" timed out') from e

{cycode-3.10.1.dev3.dist-info → cycode-3.10.2.dev1.dist-info}/METADATA

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

{cycode-3.10.1.dev3.dist-info → cycode-3.10.2.dev1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cycode/__init__.py,sha256=vAAZe6uHmMgzfuFS07mdMtflsmVnaJ8kyzukXDITFD0,115
+cycode/__init__.py,sha256=90HcfqmT0_usCPxHlppFCbiu6IWXpbxpFH8ViXVNyS4,115
 cycode/__main__.py,sha256=Z3bD5yrA7yPvAChcADQrqCaZd0ChGI1gdiwALwbWJ6U,104
 cycode/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/app.py,sha256=euQuMmLSM7Flq-mIPrie1ogdk09t1l6R_B6PQE_ib8w,6348
@@ -102,9 +102,9 @@ cycode/cli/files_collector/models/in_memory_zip.py,sha256=a56bTdOgg7E3PpWRh0ixVX
 cycode/cli/files_collector/path_documents.py,sha256=LLmuHf2h6glXwmf44pMnFq1-3HipQXFByfn8lWEO2sA,4782
 cycode/cli/files_collector/repository_documents.py,sha256=53QQsfCzXXSV6F3EcInaN8G6aCwEVzceWiYwasG8CgM,860
 cycode/cli/files_collector/sca/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cycode/cli/files_collector/sca/base_restore_dependencies.py,sha256=JFZomuJ3DWhxzaOai1meLgHS3y39IQHOY_49OO3LBjM,4148
+cycode/cli/files_collector/sca/base_restore_dependencies.py,sha256=bm3lCaZ9g80iLm7VA5dIza-RLOJfM_JXxHurWuqD-Q8,5067
 cycode/cli/files_collector/sca/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cycode/cli/files_collector/sca/go/restore_go_dependencies.py,sha256=LEck4XPFl9DQ-LcR8-2ZBRfYeKP1XwgATMiuAogfmlE,1848
+cycode/cli/files_collector/sca/go/restore_go_dependencies.py,sha256=_VSSOzTHPnVHhJl7E4NVYUcu9w_qnPmOS3yPLONpyvQ,1896
 cycode/cli/files_collector/sca/maven/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/files_collector/sca/maven/restore_gradle_dependencies.py,sha256=hwsdJby0_7i3s6YmCU-tB6B3TfsfbyQyeTVwEy6c6SA,2699
 cycode/cli/files_collector/sca/maven/restore_maven_dependencies.py,sha256=-kCvjVIDGI_eX-l6I0M0OPI6OOhPGyga0e02FQgiFwM,3320
@@ -116,7 +116,7 @@ cycode/cli/files_collector/sca/ruby/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 cycode/cli/files_collector/sca/ruby/restore_ruby_dependencies.py,sha256=Vqswcxte9YjGnvIm9oZ8r91jNyhuiYDf1mouaTaLg3U,694
 cycode/cli/files_collector/sca/sbt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/files_collector/sca/sbt/restore_sbt_dependencies.py,sha256=cfBUR4iQcfplX_O2QPjYh2wSyBteze8wZcT_dG9d1d4,709
-cycode/cli/files_collector/sca/sca_file_collector.py,sha256=lM7lGNd7AyhyA4-NnS4CbVihSZF0X-Vj04OxqJnsODM,7912
+cycode/cli/files_collector/sca/sca_file_collector.py,sha256=fsxguIdpBHGFZ_HIBCCY2uGAMgOydBW74h86coURIB4,8315
 cycode/cli/files_collector/walk_ignore.py,sha256=nvOM6oDmT2SxSI4pU-bLlc9LwTgkfTd2egse69ixf3g,2464
 cycode/cli/files_collector/zip_documents.py,sha256=WTNLp4yHY6zeVYkE2QTOO8K93cJEA9I-BmD39sRdo5k,1837
 cycode/cli/logger.py,sha256=mlaYEQGYd582fTCc3SC3cFMj0PKTB6EsaI12Q4VL1z8,65
@@ -157,7 +157,7 @@ cycode/cli/utils/path_utils.py,sha256=OmAOtZwvPmYqqhBnB4jI6hkSnCkGpSOibY7PtP213C
 cycode/cli/utils/progress_bar.py,sha256=bKBWHHdZsVkdDdWMJLfgLGR0cBYeB44P_DpRM8pvWqU,9528
 cycode/cli/utils/scan_batch.py,sha256=jIG3jPYBptcwPHcTze0goFs4etCAOyKahdhUNPBsufw,5106
 cycode/cli/utils/scan_utils.py,sha256=j3nkm7KxO1nCjPDppdTWzmo7gNw1XfRUlhfeY66xGNw,2100
-cycode/cli/utils/shell_executor.py,sha256=CuHeXoYM6VaYtDernWtf49_s1EfuU8nWxj4MPIAciww,1290
+cycode/cli/utils/shell_executor.py,sha256=VkzzQPZCmTkFvDjhgJrkv-Icej3U1wLW9LLN6k6OahA,1848
 cycode/cli/utils/string_utils.py,sha256=0kvu_apAfHjwd7dUhZl8k1pr57aCiO1MhzBYnA2keK4,2434
 cycode/cli/utils/task_timer.py,sha256=wxfM2TtJGjc1F17CIja_Qmt6zd4a1qdMwuz0ltgTDAg,2722
 cycode/cli/utils/url_utils.py,sha256=2ZhRCbQsKnvAl5MBugQ5CrwuALP8uivsCI6chlqxahM,2304
@@ -185,8 +185,8 @@ cycode/cyclient/report_client.py,sha256=Scq30NeJPzgXv0hPLO1U05AdE9i_2iu6cIrSKpEJ
 cycode/cyclient/scan_client.py,sha256=uTBEjgfaCVuJREo73p_zkIVA23NQfdJ1d1-bzc7nSKk,12682
 cycode/cyclient/scan_config_base.py,sha256=mXsPZGYCtp85rv5GIige40yQZXuRcEKUW-VQJ0vgFzk,1201
 cycode/logger.py,sha256=xAzpkWLZhixO4egRcYn4HXM9lIfx5wHdpkHxNc5jrX8,2225
-cycode-3.10.1.dev3.dist-info/METADATA,sha256=KFvBjEj-TI39dNW2OvoYXyAU7zzP4UNcE9iKVsCnxgk,79688
-cycode-3.10.1.dev3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-cycode-3.10.1.dev3.dist-info/entry_points.txt,sha256=iDcVJM8ByLElVgvBgtYxDjw1kT7O8Mo0LcWZIT5L3Ig,45
-cycode-3.10.1.dev3.dist-info/licenses/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
-cycode-3.10.1.dev3.dist-info/RECORD,,
+cycode-3.10.2.dev1.dist-info/METADATA,sha256=_mlzUsuS3HjQ-_wiT-ACp0mnLjwgUDZxxvDBseayvNI,79688
+cycode-3.10.2.dev1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+cycode-3.10.2.dev1.dist-info/entry_points.txt,sha256=iDcVJM8ByLElVgvBgtYxDjw1kT7O8Mo0LcWZIT5L3Ig,45
+cycode-3.10.2.dev1.dist-info/licenses/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
+cycode-3.10.2.dev1.dist-info/RECORD,,