cycode 1.10.0__tar.gz → 1.10.1.dev1__tar.gz

{cycode-1.10.0 → cycode-1.10.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycode
-Version: 1.10.0
+Version: 1.10.1.dev1
 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.10.1.dev1/cycode/__init__.py

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

{cycode-1.10.0 → cycode-1.10.1.dev1}/cycode/cli/commands/scan/code_scanner.py

@@ -317,10 +317,14 @@ def scan_documents(
     errors, local_scan_results = run_parallel_batched_scan(
         scan_batch_thread_func, documents_to_scan, progress_bar=progress_bar
     )
-    aggregation_report_url = _try_get_aggregation_report_url_if_needed(
-        scan_parameters, context.obj['client'], context.obj['scan_type']
-    )
-    set_aggregation_report_url(context, aggregation_report_url)
+
+    if len(local_scan_results) > 1:
+        # if we used more than one batch, we need to fetch aggregate report url
+        aggregation_report_url = _try_get_aggregation_report_url_if_needed(
+            scan_parameters, context.obj['client'], context.obj['scan_type']
+        )
+        set_aggregation_report_url(context, aggregation_report_url)
+
     progress_bar.set_section_length(ScanProgressBarSection.GENERATE_REPORT, 1)
     progress_bar.update(ScanProgressBarSection.GENERATE_REPORT)
     progress_bar.stop()
@@ -863,8 +867,6 @@ def _get_scan_result(
     if not scan_details.detections_count:
         return init_default_scan_result(cycode_client, scan_id, scan_type, should_get_report)
 
-    wait_for_detections_creation(cycode_client, scan_type, scan_id, scan_details.detections_count)
-
     scan_detections = cycode_client.get_scan_detections(scan_type, scan_id)
 
     return ZippedFileScanResult(
@@ -899,35 +901,6 @@ def _try_get_report_url_if_needed(
         logger.debug('Failed to get report URL', exc_info=e)
 
 
-def wait_for_detections_creation(
-    cycode_client: 'ScanClient', scan_type: str, scan_id: str, expected_detections_count: int
-) -> None:
-    logger.debug('Waiting for detections to be created')
-
-    scan_persisted_detections_count = 0
-    polling_timeout = consts.DETECTIONS_COUNT_VERIFICATION_TIMEOUT_IN_SECONDS
-    end_polling_time = time.time() + polling_timeout
-
-    while time.time() < end_polling_time:
-        scan_persisted_detections_count = cycode_client.get_scan_detections_count(scan_type, scan_id)
-        logger.debug(
-            'Excepting %s detections, got %s detections (%s more; %s seconds left)',
-            expected_detections_count,
-            scan_persisted_detections_count,
-            expected_detections_count - scan_persisted_detections_count,
-            round(end_polling_time - time.time()),
-        )
-        if scan_persisted_detections_count == expected_detections_count:
-            return
-
-        time.sleep(consts.DETECTIONS_COUNT_VERIFICATION_WAIT_INTERVAL_IN_SECONDS)
-
-    logger.debug('%s detections has been created', scan_persisted_detections_count)
-    raise custom_exceptions.ScanAsyncError(
-        f'Failed to wait for detections to be created after {polling_timeout} seconds'
-    )
-
-
 def _map_detections_per_file(detections: List[dict]) -> List[DetectionsPerFile]:
     detections_per_files = {}
     for detection in detections:

{cycode-1.10.0 → cycode-1.10.1.dev1}/cycode/cli/consts.py

@@ -151,8 +151,6 @@ REPORT_POLLING_TIMEOUT_IN_SECONDS_ENV_VAR_NAME = 'REPORT_POLLING_TIMEOUT_IN_SECO
 SCAN_POLLING_WAIT_INTERVAL_IN_SECONDS = 5
 DEFAULT_SCAN_POLLING_TIMEOUT_IN_SECONDS = 3600
 SCAN_POLLING_TIMEOUT_IN_SECONDS_ENV_VAR_NAME = 'SCAN_POLLING_TIMEOUT_IN_SECONDS'
-DETECTIONS_COUNT_VERIFICATION_TIMEOUT_IN_SECONDS = 600
-DETECTIONS_COUNT_VERIFICATION_WAIT_INTERVAL_IN_SECONDS = 10
 DEFAULT_SCA_PRE_COMMIT_TIMEOUT_IN_SECONDS = 600
 SCA_PRE_COMMIT_TIMEOUT_IN_SECONDS_ENV_VAR_NAME = 'SCA_PRE_COMMIT_TIMEOUT_IN_SECONDS'
 

{cycode-1.10.0 → cycode-1.10.1.dev1}/cycode/cyclient/scan_client.py

@@ -245,15 +245,6 @@ class ScanClient:
 
         return detections
 
-    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_scan_detections_count_path(scan_type), params={'scan_id': scan_id}
-        )
-        return response.json().get('count', 0)
-
     def commit_range_zipped_file_scan(
         self, scan_type: str, zip_file: InMemoryZip, scan_id: str
     ) -> models.ZippedFileScanResult:

{cycode-1.10.0 → cycode-1.10.1.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycode"
-version = "1.10.0" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+version = "1.10.1.dev1" # 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.10.0/cycode/__init__.py

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