Skip to content

Commit 43898ee

Browse files
committed
CM-45717 - Add formatted and colorized text in logs (--verbose mode)
1 parent 25ad3ec commit 43898ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+251
-261
lines changed

cycode/cli/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
from cycode.cli.utils.progress_bar import SCAN_PROGRESS_BAR_SECTIONS, get_progress_bar
1212
from cycode.cli.utils.sentry import add_breadcrumb, init_sentry
1313
from cycode.cli.utils.version_checker import version_checker
14-
from cycode.cyclient.config import set_logging_level
1514
from cycode.cyclient.cycode_client_base import CycodeClientBase
1615
from cycode.cyclient.models import UserAgentOptionScheme
16+
from cycode.logger import set_logging_level
1717

1818
app = typer.Typer(
1919
pretty_exceptions_show_locals=False,

cycode/cli/apps/auth/auth_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
from cycode.cli.apps.auth.auth_manager import AuthManager
44
from cycode.cli.exceptions.handle_auth_errors import handle_auth_exception
5+
from cycode.cli.logger import logger
56
from cycode.cli.models import CliResult
67
from cycode.cli.printers import ConsolePrinter
78
from cycode.cli.utils.sentry import add_breadcrumb
8-
from cycode.cyclient import logger
99

1010

1111
def auth_command(ctx: typer.Context) -> None:

cycode/cli/apps/auth/auth_manager.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@
88
from cycode.cli.user_settings.configuration_manager import ConfigurationManager
99
from cycode.cli.user_settings.credentials_manager import CredentialsManager
1010
from cycode.cli.utils.string_utils import generate_random_string, hash_string_to_sha256
11-
from cycode.cyclient import logger
1211
from cycode.cyclient.auth_client import AuthClient
1312
from cycode.cyclient.models import ApiTokenGenerationPollingResponse
13+
from cycode.logger import get_logger
1414

1515
if TYPE_CHECKING:
1616
from cycode.cyclient.models import ApiToken
1717

1818

19+
logger = get_logger('Auth Manager')
20+
21+
1922
class AuthManager:
2023
CODE_VERIFIER_LENGTH = 101
2124
POLLING_WAIT_INTERVAL_IN_SECONDS = 3

cycode/cli/apps/ignore/ignore_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
from cycode.cli import consts
88
from cycode.cli.cli_types import ScanTypeOption
99
from cycode.cli.config import configuration_manager
10+
from cycode.cli.logger import logger
1011
from cycode.cli.utils.path_utils import get_absolute_path, is_path_exists
1112
from cycode.cli.utils.sentry import add_breadcrumb
1213
from cycode.cli.utils.string_utils import hash_string_to_sha256
13-
from cycode.cyclient import logger
1414

1515

1616
def _is_package_pattern_valid(package: str) -> bool:

cycode/cli/apps/report/sbom/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
from cycode.cli.apps.report.sbom.sbom_report_file import SbomReportFile
88
from cycode.cli.config import configuration_manager
99
from cycode.cli.exceptions.custom_exceptions import ReportAsyncError
10+
from cycode.cli.logger import logger
1011
from cycode.cli.utils.progress_bar import SbomReportProgressBarSection
11-
from cycode.cyclient import logger
1212
from cycode.cyclient.models import ReportExecutionSchema
1313

1414
if TYPE_CHECKING:

cycode/cli/apps/scan/code_scanner.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@
3434
from cycode.cli.utils.progress_bar import ScanProgressBarSection
3535
from cycode.cli.utils.scan_batch import run_parallel_batched_scan
3636
from cycode.cli.utils.scan_utils import set_issue_detected
37-
from cycode.cyclient import logger
38-
from cycode.cyclient.config import set_logging_level
3937
from cycode.cyclient.models import Detection, DetectionSchema, DetectionsPerFile, ZippedFileScanResult
38+
from cycode.logger import get_logger, set_logging_level
4039

4140
if TYPE_CHECKING:
4241
from cycode.cyclient.models import ScanDetailsResponse
@@ -45,6 +44,9 @@
4544
start_scan_time = time.time()
4645

4746

47+
logger = get_logger('Code Scanner')
48+
49+
4850
def scan_sca_pre_commit(ctx: typer.Context) -> None:
4951
scan_type = ctx.obj['scan_type']
5052
scan_parameters = get_default_scan_parameters(ctx)

cycode/cli/apps/scan/commit_history/commit_history_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
from cycode.cli.apps.scan.code_scanner import scan_commit_range
77
from cycode.cli.exceptions.handle_scan_errors import handle_scan_exception
8+
from cycode.cli.logger import logger
89
from cycode.cli.utils.sentry import add_breadcrumb
9-
from cycode.cyclient import logger
1010

1111

1212
def commit_history_command(

cycode/cli/apps/scan/path/path_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import typer
55

66
from cycode.cli.apps.scan.code_scanner import scan_disk_files
7+
from cycode.cli.logger import logger
78
from cycode.cli.utils.sentry import add_breadcrumb
8-
from cycode.cyclient import logger
99

1010

1111
def path_command(

cycode/cli/apps/scan/pre_receive/pre_receive_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from cycode.cli.files_collector.repository_documents import (
1919
calculate_pre_receive_commit_range,
2020
)
21+
from cycode.cli.logger import logger
2122
from cycode.cli.utils.sentry import add_breadcrumb
2223
from cycode.cli.utils.task_timer import TimeoutAfter
23-
from cycode.cyclient import logger
2424

2525

2626
def pre_receive_command(

cycode/cli/apps/scan/repository/repository_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
from cycode.cli.files_collector.excluder import exclude_irrelevant_documents_to_scan
1212
from cycode.cli.files_collector.repository_documents import get_git_repository_tree_file_entries
1313
from cycode.cli.files_collector.sca.sca_code_scanner import perform_pre_scan_documents_actions
14+
from cycode.cli.logger import logger
1415
from cycode.cli.models import Document
1516
from cycode.cli.utils.path_utils import get_path_by_os
1617
from cycode.cli.utils.progress_bar import ScanProgressBarSection
1718
from cycode.cli.utils.sentry import add_breadcrumb
18-
from cycode.cyclient import logger
1919

2020

2121
def repository_command(

0 commit comments

Comments
 (0)