Skip to content

CM-60459-Fallback on V4 upload failure #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mateusz-sterczewski merged 2 commits into from
Mar 3, 2026
Merged

CM-60459-Fallback on V4 upload failure #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f89d7ba
CM-60459-Fallback on V4 upload failure
mateusz-sterczewski Mar 3, 2026
ce59837
CM-60459-Lint
mateusz-sterczewski Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions cycode/cli/apps/scan/code_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from platform import platform
from typing import TYPE_CHECKING, Callable, Optional

import requests
import typer

from cycode.cli import consts
Expand Down Expand Up @@ -330,9 +331,12 @@ 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)

Expand Down
28 changes: 20 additions & 8 deletions cycode/cli/apps/scan/commit_range_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from typing import TYPE_CHECKING, Optional

import click
import requests
import typer

from cycode.cli import consts
Expand Down Expand Up @@ -152,14 +153,25 @@ 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,
Expand Down