From e7d719e5141ec793918eb5be5a8f898b5d64b273 Mon Sep 17 00:00:00 2001 From: pedrooot Date: Tue, 1 Oct 2024 14:18:44 -0600 Subject: [PATCH] feat(inventory): change prints for inventory --- poetry.lock | 22 +--------------------- prowler/providers/common/inventory.py | 10 +++++++--- pyproject.toml | 1 - 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/poetry.lock b/poetry.lock index a5d2ad9ebd..280f600a4c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4643,26 +4643,6 @@ files = [ {file = "tomlkit-0.13.2.tar.gz", hash = "sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79"}, ] -[[package]] -name = "tqdm" -version = "4.66.5" -description = "Fast, Extensible Progress Meter" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tqdm-4.66.5-py3-none-any.whl", hash = "sha256:90279a3770753eafc9194a0364852159802111925aa30eb3f9d85b0e805ac7cd"}, - {file = "tqdm-4.66.5.tar.gz", hash = "sha256:e1020aef2e5096702d8a025ac7d16b1577279c9d63f8375b63083e9a5f0fcbad"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} - -[package.extras] -dev = ["pytest (>=6)", "pytest-cov", "pytest-timeout", "pytest-xdist"] -notebook = ["ipywidgets (>=6)"] -slack = ["slack-sdk"] -telegram = ["requests"] - [[package]] name = "typer" version = "0.12.5" @@ -5080,4 +5060,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "68fb9f6bc687d8be8324a80f955119d9934750cfd3ee3ffd6745c109e5334483" +content-hash = "6ab3e45b4316275b0c26103a5dff489527d927bb4d9e4ff6a847849cb106d837" diff --git a/prowler/providers/common/inventory.py b/prowler/providers/common/inventory.py index 134d5533bf..1461298b01 100644 --- a/prowler/providers/common/inventory.py +++ b/prowler/providers/common/inventory.py @@ -5,12 +5,13 @@ import shutil from collections import deque from datetime import datetime +from colorama import Fore, Style from pydantic import BaseModel -from tqdm import tqdm + +from prowler.config.config import orange_color def run_prowler_inventory(checks_to_execute, provider): - print(f"\nRunning scan inventory for {provider}") output_folder_path = f"./output/inventory/{provider}" meta_json_file = {} @@ -46,7 +47,7 @@ def run_prowler_inventory(checks_to_execute, provider): service_set = set() - for check_name in tqdm(checks_to_execute): + for check_name in checks_to_execute: try: service = check_name.split("_")[0] @@ -117,3 +118,6 @@ def run_prowler_inventory(checks_to_execute, provider): # Compress the folder into a zip file shutil.make_archive(f"{output_zip_file}", "zip", folder_to_compress) + print( + f"\n{Style.BRIGHT}{Fore.GREEN}Scan inventory for {provider} results: {orange_color}{output_folder_path}" + ) diff --git a/pyproject.toml b/pyproject.toml index 59c3195c0b..74a0a204d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,7 +71,6 @@ schema = "0.7.7" shodan = "1.31.0" slack-sdk = "3.33.1" tabulate = "0.9.0" -tqdm = "^4.66.5" tzlocal = "5.2" [tool.poetry.group.dev.dependencies]