CM-60459-Fallback on V4 upload failure

Author: mateusz-sterczewski

cycode/cli/apps/scan/code_scanner.py

@@ -3,6 +3,7 @@
 from platform import platform
 from typing import TYPE_CHECKING, Callable, Optional
 
+import requests
 import typer
 
 from cycode.cli import consts
@@ -330,9 +331,14 @@ def _perform_scan(
         return _perform_scan_sync(cycode_client, zipped_documents, scan_type, scan_parameters, is_git_diff)
 
     if should_use_presigned_upload(scan_type):
-        return _perform_scan_v4_async(
-            cycode_client, zipped_documents, scan_type, scan_parameters, is_git_diff, is_commit_range
-        )
+        try:
+            return _perform_scan_v4_async(
+                cycode_client, zipped_documents, scan_type, scan_parameters, is_git_diff, is_commit_range
+            )
+        except requests.exceptions.RequestException:
+            logger.warning(
+                'Direct upload to object storage failed. Falling back to upload via Cycode API. '
+            )
 
     return _perform_scan_async(cycode_client, zipped_documents, scan_type, scan_parameters, is_commit_range)
 

cycode/cli/apps/scan/commit_range_scanner.py

@@ -1,6 +1,7 @@
 import os
 from typing import TYPE_CHECKING, Optional
 
+import requests
 import click
 import typer
 
@@ -152,14 +153,27 @@ def _scan_commit_range_documents(
             to_commit_zipped_documents = zip_documents(scan_type, to_documents_to_scan)
 
             if should_use_presigned_upload(scan_type):
-                scan_result = _perform_commit_range_scan_v4_async(
-                    cycode_client,
-                    from_commit_zipped_documents,
-                    to_commit_zipped_documents,
-                    scan_type,
-                    scan_parameters,
-                    timeout,
-                )
+                try:
+                    scan_result = _perform_commit_range_scan_v4_async(
+                        cycode_client,
+                        from_commit_zipped_documents,
+                        to_commit_zipped_documents,
+                        scan_type,
+                        scan_parameters,
+                        timeout,
+                    )
+                except requests.exceptions.RequestException:
+                    logger.warning(
+                        'Direct upload to object storage failed. Falling back to upload via Cycode API. '
+                    )
+                    scan_result = _perform_commit_range_scan_async(
+                        cycode_client,
+                        from_commit_zipped_documents,
+                        to_commit_zipped_documents,
+                        scan_type,
+                        scan_parameters,
+                        timeout,
+                    )
             else:
                 scan_result = _perform_commit_range_scan_async(
                     cycode_client,