cycode 1.7.2.dev1__py3-none-any.whl → 1.7.2.dev3__py3-none-any.whl

cycode/__init__.py

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

cycode/cli/commands/scan/code_scanner.py

@@ -140,11 +140,13 @@ def _get_scan_documents_thread_func(
     severity_threshold = context.obj['severity_threshold']
     command_scan_type = context.info_name
 
+    scan_parameters['aggregation_id'] = str(_generate_unique_id())
+
     def _scan_batch_thread_func(batch: List[Document]) -> Tuple[str, CliError, LocalScanResult]:
         local_scan_result = error = error_message = None
         detections_count = relevant_detections_count = zip_file_size = 0
 
-        scan_id = str(_get_scan_id())
+        scan_id = str(_generate_unique_id())
         scan_completed = False
 
         try:
@@ -269,6 +271,9 @@ def scan_documents(
     is_commit_range: bool = False,
     scan_parameters: Optional[dict] = None,
 ) -> None:
+    if not scan_parameters:
+        scan_parameters = get_default_scan_parameters(context)
+
     progress_bar = context.obj['progress_bar']
 
     if not documents_to_scan:
@@ -309,7 +314,7 @@ def scan_commit_range_documents(
 
     local_scan_result = error_message = None
     scan_completed = False
-    scan_id = str(_get_scan_id())
+    scan_id = str(_generate_unique_id())
 
     from_commit_zipped_documents = InMemoryZip()
     to_commit_zipped_documents = InMemoryZip()
@@ -570,12 +575,18 @@ def get_default_scan_parameters(context: click.Context) -> dict:
         'report': context.obj.get('report'),
         'package_vulnerabilities': context.obj.get('package-vulnerabilities'),
         'license_compliance': context.obj.get('license-compliance'),
+        'command_type': context.info_name,
     }
 
 
 def get_scan_parameters(context: click.Context, paths: Tuple[str]) -> dict:
     scan_parameters = get_default_scan_parameters(context)
 
+    if not paths:
+        return scan_parameters
+
+    scan_parameters['paths'] = paths
+
     if len(paths) != 1:
         # ignore remote url if multiple paths are provided
         return scan_parameters
@@ -584,11 +595,7 @@ def get_scan_parameters(context: click.Context, paths: Tuple[str]) -> dict:
     if remote_url:
         # TODO(MarshalX): remove hardcode in context
         context.obj['remote_url'] = remote_url
-        scan_parameters.update(
-            {
-                'remote_url': remote_url,
-            }
-        )
+        scan_parameters['remote_url'] = remote_url
 
     return scan_parameters
 
@@ -749,7 +756,7 @@ def _report_scan_status(
         logger.debug('Failed to report scan status, %s', {'exception_message': str(e)})
 
 
-def _get_scan_id() -> UUID:
+def _generate_unique_id() -> UUID:
     return uuid4()
 
 

cycode/cli/models.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import Dict, List, NamedTuple, Optional, Type
 
+from cycode.cyclient import logger
 from cycode.cyclient.models import Detection
 
 
@@ -42,6 +43,14 @@ class Severity(Enum):
 
         return Severity[name].value
 
+    @staticmethod
+    def get_member_weight(name: str) -> any:
+        weight = Severity.try_get_value(name)
+        if weight is None:
+            logger.debug(f'missing severity in enum: {name}')
+            return -2
+        return weight
+
 
 class CliError(NamedTuple):
     code: str

cycode/cli/printers/tables/sca_table_printer.py

@@ -74,7 +74,7 @@ class ScaTablePrinter(TablePrinterBase):
     @staticmethod
     def __severity_sort_key(detection: Detection) -> int:
         severity = detection.detection_details.get('advisory_severity')
-        return Severity.try_get_value(severity)
+        return Severity.get_member_weight(severity)
 
     def _sort_detections_by_severity(self, detections: List[Detection]) -> List[Detection]:
         return sorted(detections, key=self.__severity_sort_key, reverse=True)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycode
-Version: 1.7.2.dev1
+Version: 1.7.2.dev3
 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.2.dev1.dist-info → cycode-1.7.2.dev3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cycode/__init__.py,sha256=CJuC9EUe7skzvKnPepinzA2W_4qJwdjUybIXU8z12cc,114
+cycode/__init__.py,sha256=olpJ4awEGyM2uSy1nre0OjULKzEOt_GgDJ9L2u7WgvI,114
 cycode/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/commands/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,7 +20,7 @@ cycode/cli/commands/report/sbom/repository_url/repository_url_command.py,sha256=
 cycode/cli/commands/report/sbom/sbom_command.py,sha256=1eERdshZA6ItootEX1tD1FdAHIOVUZIyw8FRjd8auGc,2358
 cycode/cli/commands/report/sbom/sbom_report_file.py,sha256=fr3HMSr6lppeI3OgYADDWlWD8ij2edN1gmpUOPmeTN0,1533
 cycode/cli/commands/scan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cycode/cli/commands/scan/code_scanner.py,sha256=alVy03c--cru6mO8XJKVbF-JmMznz_su8a8v0EhL_nA,35363
+cycode/cli/commands/scan/code_scanner.py,sha256=s1Sq_mN3z_GX_nFhfe1_Hx_jrB05hLwTcokaI-7WR2o,35614
 cycode/cli/commands/scan/commit_history/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/commands/scan/commit_history/commit_history_command.py,sha256=nOv2BMX7KB0Bi9dXtiulMQNLt4XjJh9_rEnxtvOehPE,975
 cycode/cli/commands/scan/path/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -60,13 +60,13 @@ cycode/cli/files_collector/sca/maven/restore_maven_dependencies.py,sha256=k2giuU
 cycode/cli/files_collector/sca/sca_code_scanner.py,sha256=5pWrMiiGhYDHck9_DCOkFt4_690Y5huIA69Tg1DtYJc,6398
 cycode/cli/files_collector/zip_documents.py,sha256=N9ox2XV6y7zdVb7bdYHUxpBykrtU7_qmlHnq_AbcwRs,1522
 cycode/cli/main.py,sha256=TWZxfs7nu-zSm1YU4H801T_u16xeV3S-gZcb4gSSD24,387
-cycode/cli/models.py,sha256=Pvm7KCT131P9gtQ_6XipRuJtTvjYte8mfeVCRH6sfz0,1845
+cycode/cli/models.py,sha256=WFdVmyTtzT7xBvcWyJPnbXPaAWHOrBrGk_bo7_2iUIM,2123
 cycode/cli/printers/__init__.py,sha256=ALwAXSZy2lNXWC3NfCIxf8K0F6eFrbZa9PLZwPINi5E,93
 cycode/cli/printers/console_printer.py,sha256=cNYVTZyusQd0iLoBam5hjOJJAvL3dmMiWHXvI5XJdJ4,2078
 cycode/cli/printers/json_printer.py,sha256=pw0EZuFSzRYulzsWyKZahyggLEbTJA_XSWdQZWNJIaE,1973
 cycode/cli/printers/printer_base.py,sha256=tzHVhHghgxFAu1u080UDlvi9RA9-71FG2X0FI4M-MaE,786
 cycode/cli/printers/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cycode/cli/printers/tables/sca_table_printer.py,sha256=jYGZYx1IQOnH5Evk0F-TsvlbuZ0mngk-rOEg_v_H1_Q,8031
+cycode/cli/printers/tables/sca_table_printer.py,sha256=xkywlW_StKUsybVgPkdOZZBeq7uO3676bg4_eqjjcgQ,8035
 cycode/cli/printers/tables/table.py,sha256=drpHWm49gdraCY_ruYNbLmUuVgYXJvH8v_qLJCsv8_0,2281
 cycode/cli/printers/tables/table_models.py,sha256=8YkzoSTws2XOTM2PCUqSX099LGWYMh1pIVSmwIv63Ag,480
 cycode/cli/printers/tables/table_printer.py,sha256=hpRpKCEAwdlNVagBBi6Gb8D-N7QU_pDdNOO3b1I8VVU,5471
@@ -102,7 +102,7 @@ cycode/cyclient/models.py,sha256=T4u_GImzVmX4LmYIwcBrRAkQHEPyIAOLHaJYI63Xzas,122
 cycode/cyclient/report_client.py,sha256=sNLOm64oaONz-TUBs6fpFfbb7RfxALPS6YBqadMo2-8,3971
 cycode/cyclient/scan_client.py,sha256=egFt4mXSTQoWZliXwcTbPbrm4FlzS0wH01ULBgijNo0,10705
 cycode/cyclient/scan_config_base.py,sha256=Amlo2wE0opqhwPy1COQtD--bTOserehZM8EVxl3ZyAo,1296
-cycode-1.7.2.dev1.dist-info/METADATA,sha256=lRfgO56wyKKiU9SJ2j5bDXjCejlKyUwqU39fQiDwsWY,45120
-cycode-1.7.2.dev1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-cycode-1.7.2.dev1.dist-info/entry_points.txt,sha256=GKZlS6LtUdABDPd7-o9bwNSI5gYQnyA3qGrFFQKt3Vc,51
-cycode-1.7.2.dev1.dist-info/RECORD,,
+cycode-1.7.2.dev3.dist-info/METADATA,sha256=wcA081bQ3aHn7x6g2wFiVxBlWzngtSJanDIaNLT8of4,45120
+cycode-1.7.2.dev3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+cycode-1.7.2.dev3.dist-info/entry_points.txt,sha256=GKZlS6LtUdABDPd7-o9bwNSI5gYQnyA3qGrFFQKt3Vc,51
+cycode-1.7.2.dev3.dist-info/RECORD,,