Skip to content

CM-35768, CM-32588 - Support secrets commit range scans with --report option #248

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
merged 7 commits into from
Aug 28, 2024
Merged

CM-35768, CM-32588 - Support secrets commit range scans with --report option #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a15f53
CM-32588 - Support secrets commit range cli scan
avishaiamiel Aug 28, 2024
50f7747
CM-32588 - Refactor
avishaiamiel Aug 28, 2024
007bb43
CM-32588 - Refactor
avishaiamiel Aug 28, 2024
501d7b3
CM-32588 - Refactor
avishaiamiel Aug 28, 2024
0e2fbcb
CM-32588 - Refactor
avishaiamiel Aug 28, 2024
846674f
CM-32588 - Refactor
avishaiamiel Aug 28, 2024
1b9da85
CM-32588 - Refactor
avishaiamiel Aug 28, 2024
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
7 changes: 5 additions & 2 deletions cycode/cli/commands/scan/code_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ def perform_scan(
return perform_scan_sync(cycode_client, zipped_documents, scan_type, scan_parameters)

if scan_type in (consts.SCA_SCAN_TYPE, consts.SAST_SCAN_TYPE) or should_use_scan_service:
return perform_scan_async(cycode_client, zipped_documents, scan_type, scan_parameters)
return perform_scan_async(cycode_client, zipped_documents, scan_type, scan_parameters, is_commit_range)

if is_commit_range:
return cycode_client.commit_range_zipped_file_scan(scan_type, zipped_documents, scan_id)
Expand All @@ -500,8 +500,11 @@ def perform_scan_async(
zipped_documents: 'InMemoryZip',
scan_type: str,
scan_parameters: dict,
is_commit_range: bool,
) -> ZippedFileScanResult:
scan_async_result = cycode_client.zipped_file_scan_async(zipped_documents, scan_type, scan_parameters)
scan_async_result = cycode_client.zipped_file_scan_async(
zipped_documents, scan_type, scan_parameters, is_commit_range=is_commit_range
)
logger.debug('Async scan request has been triggered successfully, %s', {'scan_id': scan_async_result.scan_id})

return poll_scan_results(
Expand Down
7 changes: 6 additions & 1 deletion cycode/cyclient/scan_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,16 @@ def zipped_file_scan_async(
scan_type: str,
scan_parameters: dict,
is_git_diff: bool = False,
is_commit_range: bool = False,
) -> models.ScanInitializationResponse:
files = {'file': ('multiple_files_scan.zip', zip_file.read())}
response = self.scan_cycode_client.post(
url_path=self.get_zipped_file_scan_async_url_path(scan_type),
data={'is_git_diff': is_git_diff, 'scan_parameters': json.dumps(scan_parameters)},
data={
'is_git_diff': is_git_diff,
'scan_parameters': json.dumps(scan_parameters),
'is_commit_range': is_commit_range,
},
files=files,
)
return models.ScanInitializationResponseSchema().load(response.json())
Expand Down