cycode 1.9.6.dev2__tar.gz → 1.9.6.dev4__tar.gz

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycode
-Version: 1.9.6.dev2
+Version: 1.9.6.dev4
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 Home-page: https://github.com/cycodehq/cycode-cli
 License: MIT

cycode-1.9.6.dev4/cycode/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.9.6.dev4'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/commands/scan/code_scanner.py

@@ -7,7 +7,6 @@ from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Tuple
 from uuid import UUID, uuid4
 
 import click
-from git import NULL_TREE, Repo
 
 from cycode.cli import consts
 from cycode.cli.config import configuration_manager
@@ -28,9 +27,8 @@ from cycode.cli.files_collector.zip_documents import zip_documents
 from cycode.cli.models import CliError, Document, DocumentDetections, LocalScanResult, Severity
 from cycode.cli.printers import ConsolePrinter
 from cycode.cli.utils import scan_utils
-from cycode.cli.utils.path_utils import (
-    get_path_by_os,
-)
+from cycode.cli.utils.git_proxy import git_proxy
+from cycode.cli.utils.path_utils import get_path_by_os
 from cycode.cli.utils.progress_bar import ScanProgressBarSection
 from cycode.cli.utils.scan_batch import run_parallel_batched_scan
 from cycode.cli.utils.scan_utils import set_issue_detected
@@ -148,14 +146,14 @@ def _enrich_scan_result_with_data_from_detection_rules(
 
 def _get_scan_documents_thread_func(
     context: click.Context, is_git_diff: bool, is_commit_range: bool, scan_parameters: dict
-) -> Callable[[List[Document]], Tuple[str, CliError, LocalScanResult]]:
+) -> Tuple[Callable[[List[Document]], Tuple[str, CliError, LocalScanResult]], str]:
     cycode_client = context.obj['client']
     scan_type = context.obj['scan_type']
     severity_threshold = context.obj['severity_threshold']
     sync_option = context.obj['sync']
     command_scan_type = context.info_name
-
-    scan_parameters['aggregation_id'] = str(_generate_unique_id())
+    aggregation_id = str(_generate_unique_id())
+    scan_parameters['aggregation_id'] = aggregation_id
 
     def _scan_batch_thread_func(batch: List[Document]) -> Tuple[str, CliError, LocalScanResult]:
         local_scan_result = error = error_message = None
@@ -224,7 +222,7 @@ def _get_scan_documents_thread_func(
 
         return scan_id, error, local_scan_result
 
-    return _scan_batch_thread_func
+    return _scan_batch_thread_func, aggregation_id
 
 
 def scan_commit_range(
@@ -244,7 +242,7 @@ def scan_commit_range(
     documents_to_scan = []
     commit_ids_to_scan = []
 
-    repo = Repo(path)
+    repo = git_proxy.get_repo(path)
     total_commits_count = int(repo.git.rev_list('--count', commit_range))
     logger.debug('Calculating diffs for %s commits in the commit range %s', total_commits_count, commit_range)
 
@@ -261,7 +259,7 @@ def scan_commit_range(
 
         commit_id = commit.hexsha
         commit_ids_to_scan.append(commit_id)
-        parent = commit.parents[0] if commit.parents else NULL_TREE
+        parent = commit.parents[0] if commit.parents else git_proxy.get_null_tree()
         diff = commit.diff(parent, create_patch=True, R=True)
         commit_documents_to_scan = []
         for blob in diff:
@@ -313,11 +311,16 @@ def scan_documents(
         )
         return
 
-    scan_batch_thread_func = _get_scan_documents_thread_func(context, is_git_diff, is_commit_range, scan_parameters)
+    scan_batch_thread_func, aggregation_id = _get_scan_documents_thread_func(
+        context, is_git_diff, is_commit_range, scan_parameters
+    )
     errors, local_scan_results = run_parallel_batched_scan(
         scan_batch_thread_func, documents_to_scan, progress_bar=progress_bar
     )
-
+    aggregation_report_url = _try_get_aggregation_report_url_if_needed(
+        scan_parameters, context.obj['client'], context.obj['scan_type']
+    )
+    set_aggregation_report_url(context, aggregation_report_url)
     progress_bar.set_section_length(ScanProgressBarSection.GENERATE_REPORT, 1)
     progress_bar.update(ScanProgressBarSection.GENERATE_REPORT)
     progress_bar.stop()
@@ -326,6 +329,25 @@ def scan_documents(
     print_results(context, local_scan_results, errors)
 
 
+def set_aggregation_report_url(context: click.Context, aggregation_report_url: Optional[str] = None) -> None:
+    context.obj['aggregation_report_url'] = aggregation_report_url
+
+
+def _try_get_aggregation_report_url_if_needed(
+    scan_parameters: dict, cycode_client: 'ScanClient', scan_type: str
+) -> Optional[str]:
+    aggregation_id = scan_parameters.get('aggregation_id')
+    if not scan_parameters.get('report'):
+        return None
+    if aggregation_id is None:
+        return None
+    try:
+        report_url_response = cycode_client.get_scan_aggregation_report_url(aggregation_id, scan_type)
+        return report_url_response.report_url
+    except Exception as e:
+        logger.debug('Failed to get aggregation report url: %s', str(e))
+
+
 def scan_commit_range_documents(
     context: click.Context,
     from_documents_to_scan: List[Document],
@@ -664,7 +686,7 @@ def get_scan_parameters(context: click.Context, paths: Tuple[str]) -> dict:
 
 def try_get_git_remote_url(path: str) -> Optional[str]:
     try:
-        remote_url = Repo(path).remotes[0].config_reader.get('url')
+        remote_url = git_proxy.get_repo(path).remotes[0].config_reader.get('url')
         logger.debug('Found Git remote URL, %s', {'remote_url': remote_url, 'path': path})
         return remote_url
     except Exception as e:

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/commands/scan/pre_commit/pre_commit_command.py

@@ -2,7 +2,6 @@ import os
 from typing import List
 
 import click
-from git import Repo
 
 from cycode.cli import consts
 from cycode.cli.commands.scan.code_scanner import scan_documents, scan_sca_pre_commit
@@ -12,6 +11,7 @@ from cycode.cli.files_collector.repository_documents import (
     get_diff_file_path,
 )
 from cycode.cli.models import Document
+from cycode.cli.utils.git_proxy import git_proxy
 from cycode.cli.utils.path_utils import (
     get_path_by_os,
 )
@@ -31,7 +31,7 @@ def pre_commit_command(context: click.Context, ignored_args: List[str]) -> None:
         scan_sca_pre_commit(context)
         return
 
-    diff_files = Repo(os.getcwd()).index.diff('HEAD', create_patch=True, R=True)
+    diff_files = git_proxy.get_repo(os.getcwd()).index.diff('HEAD', create_patch=True, R=True)
 
     progress_bar.set_section_length(ScanProgressBarSection.PREPARE_LOCAL_FILES, len(diff_files))
 

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/exceptions/handle_scan_errors.py

@@ -1,11 +1,11 @@
 from typing import Optional
 
 import click
-from git import InvalidGitRepositoryError
 
 from cycode.cli.exceptions import custom_exceptions
 from cycode.cli.models import CliError, CliErrors
 from cycode.cli.printers import ConsolePrinter
+from cycode.cli.utils.git_proxy import git_proxy
 
 
 def handle_scan_exception(
@@ -13,7 +13,7 @@ def handle_scan_exception(
 ) -> Optional[CliError]:
     context.obj['did_fail'] = True
 
-    ConsolePrinter(context).print_exception()
+    ConsolePrinter(context).print_exception(e)
 
     errors: CliErrors = {
         custom_exceptions.NetworkError: CliError(
@@ -49,7 +49,7 @@ def handle_scan_exception(
             'Please make sure that your file is well formed '
             'and execute the scan again',
         ),
-        InvalidGitRepositoryError: CliError(
+        git_proxy.get_invalid_git_repository_error(): CliError(
             soft_fail=False,
             code='invalid_git_error',
             message='The path you supplied does not correlate to a git repository. '
@@ -69,10 +69,13 @@ def handle_scan_exception(
         ConsolePrinter(context).print_error(error)
         return None
 
+    unknown_error = CliError(code='unknown_error', message=str(e))
+
     if return_exception:
-        return CliError(code='unknown_error', message=str(e))
+        return unknown_error
 
     if isinstance(e, click.ClickException):
         raise e
 
-    raise click.ClickException(str(e))
+    ConsolePrinter(context).print_error(unknown_error)
+    exit(1)

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/files_collector/repository_documents.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING, Iterator, List, Optional, Tuple, Union
 from cycode.cli import consts
 from cycode.cli.files_collector.sca import sca_code_scanner
 from cycode.cli.models import Document
+from cycode.cli.utils.git_proxy import git_proxy
 from cycode.cli.utils.path_utils import get_file_content, get_path_by_os
 
 if TYPE_CHECKING:
@@ -13,8 +14,6 @@ if TYPE_CHECKING:
 
     from cycode.cli.utils.progress_bar import BaseProgressBar, ProgressBarSection
 
-from git import Repo
-
 
 def should_process_git_object(obj: 'Blob', _: int) -> bool:
     return obj.type == 'blob' and obj.size > 0
@@ -23,14 +22,14 @@ def should_process_git_object(obj: 'Blob', _: int) -> bool:
 def get_git_repository_tree_file_entries(
     path: str, branch: str
 ) -> Union[Iterator['IndexObjUnion'], Iterator['TraversedTreeTup']]:
-    return Repo(path).tree(branch).traverse(predicate=should_process_git_object)
+    return git_proxy.get_repo(path).tree(branch).traverse(predicate=should_process_git_object)
 
 
 def parse_commit_range(commit_range: str, path: str) -> Tuple[str, str]:
     from_commit_rev = None
     to_commit_rev = None
 
-    for commit in Repo(path).iter_commits(rev=commit_range):
+    for commit in git_proxy.get_repo(path).iter_commits(rev=commit_range):
         if not to_commit_rev:
             to_commit_rev = commit.hexsha
         from_commit_rev = commit.hexsha
@@ -52,7 +51,7 @@ def get_pre_commit_modified_documents(
     git_head_documents = []
     pre_committed_documents = []
 
-    repo = Repo(os.getcwd())
+    repo = git_proxy.get_repo(os.getcwd())
     diff_files = repo.index.diff(consts.GIT_HEAD_COMMIT_REV, create_patch=True, R=True)
     progress_bar.set_section_length(progress_bar_section, len(diff_files))
     for file in diff_files:
@@ -82,7 +81,7 @@ def get_commit_range_modified_documents(
     from_commit_documents = []
     to_commit_documents = []
 
-    repo = Repo(path)
+    repo = git_proxy.get_repo(path)
     diff = repo.commit(from_commit_rev).diff(to_commit_rev)
 
     modified_files_diff = [
@@ -131,7 +130,8 @@ def _get_end_commit_from_branch_update_details(update_details: str) -> str:
 def _get_oldest_unupdated_commit_for_branch(commit: str) -> Optional[str]:
     # get a list of commits by chronological order that are not in the remote repository yet
     # more info about rev-list command: https://git-scm.com/docs/git-rev-list
-    not_updated_commits = Repo(os.getcwd()).git.rev_list(commit, '--topo-order', '--reverse', '--not', '--all')
+    repo = git_proxy.get_repo(os.getcwd())
+    not_updated_commits = repo.git.rev_list(commit, '--topo-order', '--reverse', '--not', '--all')
 
     commits = not_updated_commits.splitlines()
     if not commits:

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/files_collector/sca/sca_code_scanner.py

@@ -2,16 +2,18 @@ import os
 from typing import TYPE_CHECKING, Dict, List, Optional
 
 import click
-from git import GitCommandError, Repo
 
 from cycode.cli import consts
 from cycode.cli.files_collector.sca.maven.restore_gradle_dependencies import RestoreGradleDependencies
 from cycode.cli.files_collector.sca.maven.restore_maven_dependencies import RestoreMavenDependencies
 from cycode.cli.models import Document
+from cycode.cli.utils.git_proxy import git_proxy
 from cycode.cli.utils.path_utils import get_file_content, get_file_dir, join_paths
 from cycode.cyclient import logger
 
 if TYPE_CHECKING:
+    from git import Repo
+
     from cycode.cli.files_collector.sca.maven.base_restore_maven_dependencies import BaseRestoreMavenDependencies
 
 BUILD_GRADLE_FILE_NAME = 'build.gradle'
@@ -27,7 +29,7 @@ def perform_pre_commit_range_scan_actions(
     to_commit_documents: List[Document],
     to_commit_rev: str,
 ) -> None:
-    repo = Repo(path)
+    repo = git_proxy.get_repo(path)
     add_ecosystem_related_files_if_exists(from_commit_documents, repo, from_commit_rev)
     add_ecosystem_related_files_if_exists(to_commit_documents, repo, to_commit_rev)
 
@@ -35,13 +37,13 @@ def perform_pre_commit_range_scan_actions(
 def perform_pre_hook_range_scan_actions(
     git_head_documents: List[Document], pre_committed_documents: List[Document]
 ) -> None:
-    repo = Repo(os.getcwd())
+    repo = git_proxy.get_repo(os.getcwd())
     add_ecosystem_related_files_if_exists(git_head_documents, repo, consts.GIT_HEAD_COMMIT_REV)
     add_ecosystem_related_files_if_exists(pre_committed_documents)
 
 
 def add_ecosystem_related_files_if_exists(
-    documents: List[Document], repo: Optional[Repo] = None, commit_rev: Optional[str] = None
+    documents: List[Document], repo: Optional['Repo'] = None, commit_rev: Optional[str] = None
 ) -> None:
     documents_to_add: List[Document] = []
     for doc in documents:
@@ -56,7 +58,7 @@ def add_ecosystem_related_files_if_exists(
 
 
 def get_doc_ecosystem_related_project_files(
-    doc: Document, documents: List[Document], ecosystem: str, commit_rev: Optional[str], repo: Optional[Repo]
+    doc: Document, documents: List[Document], ecosystem: str, commit_rev: Optional[str], repo: Optional['Repo']
 ) -> List[Document]:
     documents_to_add: List[Document] = []
     for ecosystem_project_file in consts.PROJECT_FILES_BY_ECOSYSTEM_MAP.get(ecosystem):
@@ -136,10 +138,10 @@ def get_manifest_file_path(document: Document, is_monitor_action: bool, project_
     return join_paths(project_path, document.path) if is_monitor_action else document.path
 
 
-def get_file_content_from_commit(repo: Repo, commit: str, file_path: str) -> Optional[str]:
+def get_file_content_from_commit(repo: 'Repo', commit: str, file_path: str) -> Optional[str]:
     try:
         return repo.git.show(f'{commit}:{file_path}')
-    except GitCommandError:
+    except git_proxy.get_git_command_error():
         return None
 
 

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/printers/console_printer.py

@@ -28,13 +28,15 @@ class ConsolePrinter:
         self.context = context
         self.scan_type = self.context.obj.get('scan_type')
         self.output_type = self.context.obj.get('output')
-
+        self.aggregation_report_url = self.context.obj.get('aggregation_report_url')
         self._printer_class = self._AVAILABLE_PRINTERS.get(self.output_type)
         if self._printer_class is None:
             raise CycodeError(f'"{self.output_type}" output type is not supported.')
 
     def print_scan_results(
-        self, local_scan_results: List['LocalScanResult'], errors: Optional[Dict[str, 'CliError']] = None
+        self,
+        local_scan_results: List['LocalScanResult'],
+        errors: Optional[Dict[str, 'CliError']] = None,
     ) -> None:
         printer = self._get_scan_printer()
         printer.print_scan_results(local_scan_results, errors)

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/printers/json_printer.py

@@ -28,13 +28,15 @@ class JsonPrinter(PrinterBase):
         scan_ids = []
         report_urls = []
         detections = []
+        aggregation_report_url = self.context.obj.get('aggregation_report_url')
+        if aggregation_report_url:
+            report_urls.append(aggregation_report_url)
 
         for local_scan_result in local_scan_results:
             scan_ids.append(local_scan_result.scan_id)
 
-            if local_scan_result.report_url:
+            if not aggregation_report_url and local_scan_result.report_url:
                 report_urls.append(local_scan_result.report_url)
-
             for document_detections in local_scan_result.document_detections:
                 detections.extend(document_detections.detections)
 

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/printers/printer_base.py

@@ -43,7 +43,7 @@ class PrinterBase(ABC):
             # gets the most recent exception caught by an except clause
             message = f'Error: {traceback.format_exc()}'
         else:
-            traceback_message = ''.join(traceback.format_exception(e))
+            traceback_message = ''.join(traceback.format_exception(None, e, e.__traceback__))
             message = f'Error: {traceback_message}'
 
         click.secho(message, err=True, fg=self.RED_COLOR_NAME)

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/printers/tables/sca_table_printer.py

@@ -13,7 +13,6 @@ from cycode.cli.utils.string_utils import shortcut_dependency_paths
 if TYPE_CHECKING:
     from cycode.cli.models import LocalScanResult
 
-
 column_builder = ColumnInfoBuilder()
 
 # Building must have strict order. Represents the order of the columns in the table (from left to right)
@@ -29,7 +28,6 @@ LICENSE_COLUMN = column_builder.build(name='License')
 DIRECT_DEPENDENCY_COLUMN = column_builder.build(name='Direct Dependency')
 DEVELOPMENT_DEPENDENCY_COLUMN = column_builder.build(name='Development Dependency')
 
-
 COLUMN_WIDTHS_CONFIG: ColumnWidths = {
     REPOSITORY_COLUMN: 2,
     CODE_PROJECT_COLUMN: 2,
@@ -42,6 +40,7 @@ COLUMN_WIDTHS_CONFIG: ColumnWidths = {
 
 class ScaTablePrinter(TablePrinterBase):
     def _print_results(self, local_scan_results: List['LocalScanResult']) -> None:
+        aggregation_report_url = self.context.obj.get('aggregation_report_url')
         detections_per_policy_id = self._extract_detections_per_policy_id(local_scan_results)
         for policy_id, detections in detections_per_policy_id.items():
             table = self._get_table(policy_id)
@@ -53,7 +52,7 @@ class ScaTablePrinter(TablePrinterBase):
             self._print_summary_issues(len(detections), self._get_title(policy_id))
             self._print_table(table)
 
-        self._print_report_urls(local_scan_results)
+        self._print_report_urls(local_scan_results, aggregation_report_url)
 
     @staticmethod
     def _get_title(policy_id: str) -> str:

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/printers/tables/table_printer.py

@@ -63,7 +63,7 @@ class TablePrinter(TablePrinterBase):
                     self._enrich_table_with_values(table, detection, document_detections.document)
 
         self._print_table(table)
-        self._print_report_urls(local_scan_results)
+        self._print_report_urls(local_scan_results, self.context.obj.get('aggregation_report_url'))
 
     def _get_table(self) -> Table:
         table = Table()

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/printers/tables/table_printer_base.py

@@ -58,9 +58,15 @@ class TablePrinterBase(PrinterBase, abc.ABC):
             click.echo(table.get_table().draw())
 
     @staticmethod
-    def _print_report_urls(local_scan_results: List['LocalScanResult']) -> None:
+    def _print_report_urls(
+        local_scan_results: List['LocalScanResult'],
+        aggregation_report_url: Optional[str] = None,
+    ) -> None:
         report_urls = [scan_result.report_url for scan_result in local_scan_results if scan_result.report_url]
-        if not report_urls:
+        if not report_urls and not aggregation_report_url:
+            return
+        if aggregation_report_url:
+            click.echo(f'Report URL: {aggregation_report_url}')
             return
 
         click.echo('Report URLs:')

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cli/printers/text_printer.py

@@ -39,10 +39,11 @@ class TextPrinter(PrinterBase):
 
         for local_scan_result in local_scan_results:
             for document_detections in local_scan_result.document_detections:
-                self._print_document_detections(
-                    document_detections, local_scan_result.scan_id, local_scan_result.report_url
-                )
+                self._print_document_detections(document_detections, local_scan_result.scan_id)
 
+        report_urls = [scan_result.report_url for scan_result in local_scan_results if scan_result.report_url]
+
+        self._print_report_urls(report_urls, self.context.obj.get('aggregation_report_url'))
         if not errors:
             return
 
@@ -55,18 +56,14 @@ class TextPrinter(PrinterBase):
             click.echo(f'- {scan_id}: ', nl=False)
             self.print_error(error)
 
-    def _print_document_detections(
-        self, document_detections: DocumentDetections, scan_id: str, report_url: Optional[str]
-    ) -> None:
+    def _print_document_detections(self, document_detections: DocumentDetections, scan_id: str) -> None:
         document = document_detections.document
         lines_to_display = self._get_lines_to_display_count()
         for detection in document_detections.detections:
-            self._print_detection_summary(detection, document.path, scan_id, report_url)
+            self._print_detection_summary(detection, document.path, scan_id)
             self._print_detection_code_segment(detection, document, lines_to_display)
 
-    def _print_detection_summary(
-        self, detection: Detection, document_path: str, scan_id: str, report_url: Optional[str]
-    ) -> None:
+    def _print_detection_summary(self, detection: Detection, document_path: str, scan_id: str) -> None:
         detection_name = detection.type if self.scan_type == SECRET_SCAN_TYPE else detection.message
         detection_name_styled = click.style(detection_name, fg='bright_red', bold=True)
 
@@ -74,8 +71,6 @@ class TextPrinter(PrinterBase):
         detection_sha_message = f'\nSecret SHA: {detection_sha}' if detection_sha else ''
 
         scan_id_message = f'\nScan ID: {scan_id}'
-        report_url_message = f'\nReport URL: {report_url}' if report_url else ''
-
         detection_commit_id = detection.detection_details.get('commit_id')
         detection_commit_id_message = f'\nCommit SHA: {detection_commit_id}' if detection_commit_id else ''
 
@@ -88,7 +83,6 @@ class TextPrinter(PrinterBase):
             f'(rule ID: {detection.detection_rule_id}) in file: {click.format_filename(document_path)} '
             f'{detection_sha_message}'
             f'{scan_id_message}'
-            f'{report_url_message}'
             f'{detection_commit_id_message}'
             f'{company_guidelines_message}'
             f'  ⛔'
@@ -101,6 +95,18 @@ class TextPrinter(PrinterBase):
 
         self._print_detection_from_file(detection, document, code_segment_size)
 
+    @staticmethod
+    def _print_report_urls(report_urls: List[str], aggregation_report_url: Optional[str] = None) -> None:
+        if not report_urls and not aggregation_report_url:
+            return
+        if aggregation_report_url:
+            click.echo(f'Report URL: {aggregation_report_url}')
+            return
+
+        click.echo('Report URLs:')
+        for report_url in report_urls:
+            click.echo(f'- {report_url}')
+
     @staticmethod
     def _get_code_segment_start_line(detection_line: int, code_segment_size: int) -> int:
         start_line = detection_line - math.ceil(code_segment_size / 2)

cycode-1.9.6.dev4/cycode/cli/utils/git_proxy.py

@@ -0,0 +1,76 @@
+import types
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING, Optional, Type
+
+_GIT_ERROR_MESSAGE = """
+Cycode CLI needs the git executable to be installed on the system.
+Git executable must be available in the PATH.
+Git 1.7.x or newer is required.
+You can help Cycode CLI to locate the Git executable
+by setting the GIT_PYTHON_GIT_EXECUTABLE=<path/to/git> environment variable.
+""".strip().replace('\n', ' ')
+
+try:
+    import git
+except ImportError:
+    git = None
+
+if TYPE_CHECKING:
+    from git import PathLike, Repo
+
+
+class GitProxyError(Exception):
+    pass
+
+
+class _AbstractGitProxy(ABC):
+    @abstractmethod
+    def get_repo(self, path: Optional['PathLike'] = None, *args, **kwargs) -> 'Repo':
+        ...
+
+    @abstractmethod
+    def get_null_tree(self) -> object:
+        ...
+
+    @abstractmethod
+    def get_invalid_git_repository_error(self) -> Type[BaseException]:
+        ...
+
+    @abstractmethod
+    def get_git_command_error(self) -> Type[BaseException]:
+        ...
+
+
+class _DummyGitProxy(_AbstractGitProxy):
+    def get_repo(self, path: Optional['PathLike'] = None, *args, **kwargs) -> 'Repo':
+        raise RuntimeError(_GIT_ERROR_MESSAGE)
+
+    def get_null_tree(self) -> object:
+        raise RuntimeError(_GIT_ERROR_MESSAGE)
+
+    def get_invalid_git_repository_error(self) -> Type[BaseException]:
+        return GitProxyError
+
+    def get_git_command_error(self) -> Type[BaseException]:
+        return GitProxyError
+
+
+class _GitProxy(_AbstractGitProxy):
+    def get_repo(self, path: Optional['PathLike'] = None, *args, **kwargs) -> 'Repo':
+        return git.Repo(path, *args, **kwargs)
+
+    def get_null_tree(self) -> object:
+        return git.NULL_TREE
+
+    def get_invalid_git_repository_error(self) -> Type[BaseException]:
+        return git.InvalidGitRepositoryError
+
+    def get_git_command_error(self) -> Type[BaseException]:
+        return git.GitCommandError
+
+
+def get_git_proxy(git_module: Optional[types.ModuleType]) -> _AbstractGitProxy:
+    return _GitProxy() if git_module else _DummyGitProxy()
+
+
+git_proxy = get_git_proxy(git)

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/cycode/cyclient/scan_client.py

@@ -59,7 +59,7 @@ class ScanClient:
         self, scan_type: str, should_use_scan_service: bool = False, should_use_sync_flow: bool = False
     ) -> str:
         service_path = self.scan_config.get_service_name(scan_type, should_use_scan_service)
-        controller_path = self.get_scan_controller_path(scan_type)
+        controller_path = self.get_scan_controller_path(scan_type, should_use_scan_service)
         flow_type = self.get_scan_flow_type(should_use_sync_flow)
         return f'{service_path}/{controller_path}{flow_type}'
 
@@ -92,6 +92,12 @@ class ScanClient:
         response = self.scan_cycode_client.get(url_path=self.get_scan_report_url_path(scan_id, scan_type))
         return models.ScanReportUrlResponseSchema().build_dto(response.json())
 
+    def get_scan_aggregation_report_url(self, aggregation_id: str, scan_type: str) -> models.ScanReportUrlResponse:
+        response = self.scan_cycode_client.get(
+            url_path=self.get_scan_aggregation_report_url_path(aggregation_id, scan_type)
+        )
+        return models.ScanReportUrlResponseSchema().build_dto(response.json())
+
     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)
         async_entity_type = self.scan_config.get_async_entity_type(scan_type)
@@ -155,6 +161,12 @@ class ScanClient:
     def get_scan_report_url_path(self, scan_id: str, scan_type: str) -> str:
         return f'{self.get_scan_service_url_path(scan_type, should_use_scan_service=True)}/reportUrl/{scan_id}'
 
+    def get_scan_aggregation_report_url_path(self, aggregation_id: str, scan_type: str) -> str:
+        return (
+            f'{self.get_scan_service_url_path(scan_type, should_use_scan_service=True)}'
+            f'/reportUrlByAggregationId/{aggregation_id}'
+        )
+
     def get_scan_details(self, scan_type: str, scan_id: str) -> models.ScanDetailsResponse:
         path = self.get_scan_details_path(scan_type, scan_id)
         response = self.scan_cycode_client.get(url_path=path)

{cycode-1.9.6.dev2 → cycode-1.9.6.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycode"
-version = "1.9.6.dev2" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+version = "1.9.6.dev4" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
 description = "Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning."
 keywords=["secret-scan", "cycode", "devops", "token", "secret", "security", "cycode", "code"]
 authors = ["Cycode <support@cycode.com>"]

cycode-1.9.6.dev2/cycode/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.9.6.dev2'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag