Skip to content

Commit 9123b44

Browse files
authored
CM-35768, CM-32588 - Support secrets commit range scans with --report option (#248)
1 parent 17627da commit 9123b44

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

cycode/cli/commands/scan/code_scanner.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ def perform_scan(
487487
return perform_scan_sync(cycode_client, zipped_documents, scan_type, scan_parameters)
488488

489489
if scan_type in (consts.SCA_SCAN_TYPE, consts.SAST_SCAN_TYPE) or should_use_scan_service:
490-
return perform_scan_async(cycode_client, zipped_documents, scan_type, scan_parameters)
490+
return perform_scan_async(cycode_client, zipped_documents, scan_type, scan_parameters, is_commit_range)
491491

492492
if is_commit_range:
493493
return cycode_client.commit_range_zipped_file_scan(scan_type, zipped_documents, scan_id)
@@ -500,8 +500,11 @@ def perform_scan_async(
500500
zipped_documents: 'InMemoryZip',
501501
scan_type: str,
502502
scan_parameters: dict,
503+
is_commit_range: bool,
503504
) -> ZippedFileScanResult:
504-
scan_async_result = cycode_client.zipped_file_scan_async(zipped_documents, scan_type, scan_parameters)
505+
scan_async_result = cycode_client.zipped_file_scan_async(
506+
zipped_documents, scan_type, scan_parameters, is_commit_range=is_commit_range
507+
)
505508
logger.debug('Async scan request has been triggered successfully, %s', {'scan_id': scan_async_result.scan_id})
506509

507510
return poll_scan_results(

cycode/cyclient/scan_client.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,16 @@ def zipped_file_scan_async(
126126
scan_type: str,
127127
scan_parameters: dict,
128128
is_git_diff: bool = False,
129+
is_commit_range: bool = False,
129130
) -> models.ScanInitializationResponse:
130131
files = {'file': ('multiple_files_scan.zip', zip_file.read())}
131132
response = self.scan_cycode_client.post(
132133
url_path=self.get_zipped_file_scan_async_url_path(scan_type),
133-
data={'is_git_diff': is_git_diff, 'scan_parameters': json.dumps(scan_parameters)},
134+
data={
135+
'is_git_diff': is_git_diff,
136+
'scan_parameters': json.dumps(scan_parameters),
137+
'is_commit_range': is_commit_range,
138+
},
134139
files=files,
135140
)
136141
return models.ScanInitializationResponseSchema().load(response.json())

0 commit comments

Comments
 (0)