CM-60184-Move to V4 controllers

Author: mateusz-sterczewski

cycode/cli/apps/scan/code_scanner.py

@@ -217,7 +217,7 @@ def scan_documents(
     print_local_scan_results(ctx, local_scan_results, errors)
 
 
-def _perform_scan_v2_async(
+def _perform_scan_v4_async(
     cycode_client: 'ScanClient',
     zipped_documents: 'InMemoryZip',
     scan_type: str,
@@ -228,13 +228,13 @@ def _perform_scan_v2_async(
     upload_link = cycode_client.get_upload_link(scan_type)
     logger.debug('Got upload link, %s', {'upload_id': upload_link.upload_id})
 
-    cycode_client.upload_to_presigned_post(upload_link.url, upload_link.fields, zipped_documents)
+    cycode_client.upload_to_presigned_post(upload_link.url, upload_link.presigned_post_fields, zipped_documents)
     logger.debug('Uploaded zip to presigned URL')
 
     scan_async_result = cycode_client.scan_repository_from_upload_id(
         scan_type, upload_link.upload_id, scan_parameters, is_git_diff, is_commit_range
     )
-    logger.debug('V2 scan request triggered, %s', {'scan_id': scan_async_result.scan_id})
+    logger.debug('V4 scan request triggered, %s', {'scan_id': scan_async_result.scan_id})
 
     return poll_scan_results(cycode_client, scan_async_result.scan_id, scan_type, scan_parameters)
 
@@ -285,7 +285,7 @@ def _perform_scan(
         return _perform_scan_sync(cycode_client, zipped_documents, scan_type, scan_parameters, is_git_diff)
 
     if scan_type == consts.SAST_SCAN_TYPE:
-        return _perform_scan_v2_async(
+        return _perform_scan_v4_async(
             cycode_client, zipped_documents, scan_type, scan_parameters, is_git_diff, is_commit_range
         )
 

cycode/cyclient/models.py

@@ -118,7 +118,7 @@ def build_dto(self, data: dict[str, Any], **_) -> 'ScanResult':
 class UploadLinkResponse:
     upload_id: str
     url: str
-    fields: dict[str, str]
+    presigned_post_fields: dict[str, str]
 
 
 class UploadLinkResponseSchema(Schema):
@@ -127,7 +127,7 @@ class Meta:
 
     upload_id = fields.String()
     url = fields.String()
-    fields = fields.Dict(keys=fields.String(), values=fields.String())
+    presigned_post_fields = fields.Dict(keys=fields.String(), values=fields.String())
 
     @post_load
     def build_dto(self, data: dict[str, Any], **_) -> 'UploadLinkResponse':

cycode/cyclient/scan_client.py

@@ -26,7 +26,7 @@ def __init__(
         self.scan_config = scan_config
 
         self._SCAN_SERVICE_CLI_CONTROLLER_PATH = 'api/v1/cli-scan'
-        self._SCAN_SERVICE_V2_CLI_CONTROLLER_PATH = 'api/v2/cli-scan'
+        self._SCAN_SERVICE_V4_CLI_CONTROLLER_PATH = 'api/v4/scans/cli'
         self._DETECTIONS_SERVICE_CLI_CONTROLLER_PATH = 'api/v1/detections/cli'
         self._POLICIES_SERVICE_CONTROLLER_PATH_V3 = 'api/v3/policies'
 
@@ -58,9 +58,9 @@ def get_scan_aggregation_report_url(self, aggregation_id: str, scan_type: str) -
         )
         return models.ScanReportUrlResponseSchema().build_dto(response.json())
 
-    def get_scan_service_v2_url_path(self, scan_type: str) -> str:
+    def get_scan_service_v4_url_path(self, scan_type: str) -> str:
         service_path = self.scan_config.get_service_name(scan_type)
-        return f'{service_path}/{self._SCAN_SERVICE_V2_CLI_CONTROLLER_PATH}'
+        return f'{service_path}/{self._SCAN_SERVICE_V4_CLI_CONTROLLER_PATH}'
 
     def get_zipped_file_scan_async_url_path(self, scan_type: str, should_use_sync_flow: bool = False) -> str:
         async_scan_type = self.scan_config.get_async_scan_type(scan_type)
@@ -131,7 +131,7 @@ def zipped_file_scan_async(
 
     def get_upload_link(self, scan_type: str) -> models.UploadLinkResponse:
         async_scan_type = self.scan_config.get_async_scan_type(scan_type)
-        url_path = f'{self.get_scan_service_v2_url_path(scan_type)}/{async_scan_type}/upload-link'
+        url_path = f'{self.get_scan_service_v4_url_path(scan_type)}/{async_scan_type}/upload-link'
         response = self.scan_cycode_client.get(url_path=url_path, hide_response_content_log=self._hide_response_log)
         return models.UploadLinkResponseSchema().load(response.json())
 
@@ -150,7 +150,7 @@ def scan_repository_from_upload_id(
         is_commit_range: bool = False,
     ) -> models.ScanInitializationResponse:
         async_scan_type = self.scan_config.get_async_scan_type(scan_type)
-        url_path = f'{self.get_scan_service_v2_url_path(scan_type)}/{async_scan_type}/repository'
+        url_path = f'{self.get_scan_service_v4_url_path(scan_type)}/{async_scan_type}/repository'
         response = self.scan_cycode_client.post(
             url_path=url_path,
             data={