CM-29799 - Revert async flow for secrets (#181)

Author: MarshalX

cycode/cli/code_scanner.py

@@ -546,13 +546,13 @@ def perform_scan(
     is_commit_range: bool,
     scan_parameters: dict,
 ) -> ZippedFileScanResult:
+    if scan_type in (consts.SCA_SCAN_TYPE, consts.SAST_SCAN_TYPE):
+        return perform_scan_async(cycode_client, zipped_documents, scan_type, scan_parameters)
+
     if is_commit_range:
         return cycode_client.commit_range_zipped_file_scan(scan_type, zipped_documents, scan_id)
 
-    if scan_type == consts.INFRA_CONFIGURATION_SCAN_TYPE:
-        return cycode_client.zipped_file_scan(scan_type, zipped_documents, scan_id, scan_parameters, is_git_diff)
-
-    return perform_scan_async(cycode_client, zipped_documents, scan_type, scan_parameters)
+    return cycode_client.zipped_file_scan(scan_type, zipped_documents, scan_id, scan_parameters, is_git_diff)
 
 
 def perform_scan_async(
@@ -1025,10 +1025,6 @@ def _map_detections_per_file(detections: List[dict]) -> List[DetectionsPerFile]:
 def _get_file_name_from_detection(detection: dict) -> str:
     if detection['category'] == 'SAST':
         return detection['detection_details']['file_path']
-    if detection['category'] == 'SecretDetection':
-        file_path = detection['detection_details']['file_path']
-        file_name = detection['detection_details']['file_name']
-        return os.path.join(file_path, file_name)
 
     return detection['detection_details']['file_name']
 

cycode/cyclient/scan_config_base.py

@@ -16,10 +16,8 @@ def get_async_scan_type(scan_type: str) -> str:
         return scan_type.upper()
 
     @staticmethod
-    def get_async_entity_type(scan_type: str) -> str:
-        if scan_type == 'secret':
-            return 'zippedfile'
-
+    def get_async_entity_type(_: str) -> str:
+        # we are migrating to "zippedfile" entity type. will be used later
         return 'repository'
 
     @abstractmethod

tests/cli/test_main.py

@@ -1,14 +1,15 @@
 import json
 from typing import TYPE_CHECKING
-from uuid import UUID
+from uuid import uuid4
 
 import pytest
 import responses
 from click.testing import CliRunner
 
 from cycode.cli.main import main_cli
 from tests.conftest import CLI_ENV_VARS, TEST_FILES_PATH, ZIP_CONTENT_PATH
-from tests.cyclient.mocked_responses.scan_client import mock_scan_async_responses
+from tests.cyclient.mocked_responses.scan_client import mock_scan_responses
+from tests.cyclient.test_scan_client import get_zipped_file_scan_response, get_zipped_file_scan_url
 
 _PATH_TO_SCAN = TEST_FILES_PATH.joinpath('zip_content').absolute()
 
@@ -28,10 +29,11 @@ def _is_json(plain: str) -> bool:
 @pytest.mark.parametrize('output', ['text', 'json'])
 def test_passing_output_option(output: str, scan_client: 'ScanClient', api_token_response: responses.Response) -> None:
     scan_type = 'secret'
-    scan_id = UUID('12345678-418f-47ee-abb0-012345678901')
+    scan_id = uuid4()
 
+    mock_scan_responses(responses, scan_type, scan_client, scan_id, ZIP_CONTENT_PATH)
+    responses.add(get_zipped_file_scan_response(get_zipped_file_scan_url(scan_type, scan_client), ZIP_CONTENT_PATH))
     responses.add(api_token_response)
-    mock_scan_async_responses(responses, scan_type, scan_client, scan_id, ZIP_CONTENT_PATH)
 
     args = ['--output', output, 'scan', '--soft-fail', 'path', str(_PATH_TO_SCAN)]
     result = CliRunner().invoke(main_cli, args, env=CLI_ENV_VARS)

tests/cyclient/mocked_responses/scan_client.py

@@ -156,3 +156,12 @@ def mock_scan_async_responses(
     responses_module.add(get_scan_detections_count_response(get_scan_detections_count_url(scan_client)))
     responses_module.add(get_scan_detections_response(get_scan_detections_url(scan_client), scan_id, zip_content_path))
     responses_module.add(get_report_scan_status_response(get_report_scan_status_url(scan_type, scan_id, scan_client)))
+
+
+def mock_scan_responses(
+    responses_module: responses, scan_type: str, scan_client: ScanClient, scan_id: UUID, zip_content_path: Path
+) -> None:
+    responses_module.add(
+        get_zipped_file_scan_response(get_zipped_file_scan_url(scan_type, scan_client), zip_content_path)
+    )
+    responses_module.add(get_report_scan_status_response(get_report_scan_status_url(scan_type, scan_id, scan_client)))

tests/cyclient/test_scan_client.py

@@ -37,6 +37,14 @@ def get_test_zip_file(scan_type: str) -> InMemoryZip:
     return zip_documents(scan_type, test_documents)
 
 
+def test_get_service_name(scan_client: ScanClient) -> None:
+    # TODO(MarshalX): get_service_name should be removed from ScanClient? Because it exists in ScanConfig
+    assert scan_client.get_service_name('secret') == 'secret'
+    assert scan_client.get_service_name('iac') == 'iac'
+    assert scan_client.get_service_name('sca') == 'scans'
+    assert scan_client.get_service_name('sast') == 'scans'
+
+
 @pytest.mark.parametrize('scan_type', config['scans']['supported_scans'])
 @responses.activate
 def test_zipped_file_scan(scan_type: str, scan_client: ScanClient, api_token_response: responses.Response) -> None: