refactor: move ggshield.secret to ggshield.verticals.secret

ggshield/cmd/secret/scan/archive.py

@@ -13,7 +13,11 @@
 from ggshield.core.errors import UnexpectedError
 from ggshield.scan import Files, ScanContext, ScanMode
 from ggshield.scan.file import get_files_from_paths
-from ggshield.secret import RichSecretScannerUI, SecretScanCollection, SecretScanner
+from ggshield.verticals.secret import (
+    RichSecretScannerUI,
+    SecretScanCollection,
+    SecretScanner,
+)
 
 
 @click.command()

ggshield/cmd/secret/scan/ci.py

@@ -14,7 +14,7 @@
 from ggshield.core.git_hooks.ci import collect_commit_range_from_ci_env
 from ggshield.core.git_shell import check_git_dir
 from ggshield.scan import ScanContext, ScanMode
-from ggshield.secret.repo import scan_commit_range
+from ggshield.verticals.secret.repo import scan_commit_range
 
 
 @click.command()

ggshield/cmd/secret/scan/docker.py

@@ -11,7 +11,7 @@
 from ggshield.core.config import Config
 from ggshield.core.errors import handle_exception
 from ggshield.scan import ScanContext, ScanMode
-from ggshield.secret.docker import docker_save_to_tmp, docker_scan_archive
+from ggshield.verticals.secret.docker import docker_save_to_tmp, docker_scan_archive
 
 
 # bailout if docker command takes longer than 6 minutes

ggshield/cmd/secret/scan/dockerarchive.py

@@ -10,7 +10,7 @@
 from ggshield.core.config import Config
 from ggshield.core.errors import handle_exception
 from ggshield.scan import ScanContext, ScanMode
-from ggshield.secret.docker import docker_scan_archive
+from ggshield.verticals.secret.docker import docker_scan_archive
 
 
 @click.command(hidden=True)

ggshield/cmd/secret/scan/docset.py

@@ -12,7 +12,7 @@
 from ggshield.core.errors import handle_exception
 from ggshield.core.text_utils import create_progress_bar, display_info
 from ggshield.scan import ScanContext, ScanMode, Scannable, StringScannable
-from ggshield.secret import SecretScanCollection, SecretScanner
+from ggshield.verticals.secret import SecretScanCollection, SecretScanner
 
 
 def generate_files_from_docsets(

ggshield/cmd/secret/scan/path.py

@@ -10,7 +10,11 @@
 from ggshield.core.errors import handle_exception
 from ggshield.scan import ScanContext, ScanMode
 from ggshield.scan.file import get_files_from_paths
-from ggshield.secret import RichSecretScannerUI, SecretScanCollection, SecretScanner
+from ggshield.verticals.secret import (
+    RichSecretScannerUI,
+    SecretScanCollection,
+    SecretScanner,
+)
 
 
 @click.command()

ggshield/cmd/secret/scan/precommit.py

@@ -9,9 +9,9 @@
 from ggshield.core.errors import handle_exception
 from ggshield.core.git_shell import check_git_dir
 from ggshield.scan import Commit, ScanContext, ScanMode
-from ggshield.secret import SecretScanCollection, SecretScanner
-from ggshield.secret.output import SecretTextOutputHandler
-from ggshield.secret.output.messages import remediation_message
+from ggshield.verticals.secret import SecretScanCollection, SecretScanner
+from ggshield.verticals.secret.output import SecretTextOutputHandler
+from ggshield.verticals.secret.output.messages import remediation_message
 
 
 REMEDIATION_STEPS = """  Since the secret was detected before the commit was made:

ggshield/cmd/secret/scan/prepush.py

@@ -13,8 +13,8 @@
 from ggshield.core.git_shell import check_git_dir, get_list_commit_SHA
 from ggshield.core.utils import EMPTY_SHA, EMPTY_TREE
 from ggshield.scan import ScanContext, ScanMode
-from ggshield.secret.output.messages import remediation_message
-from ggshield.secret.repo import scan_commit_range
+from ggshield.verticals.secret.output.messages import remediation_message
+from ggshield.verticals.secret.repo import scan_commit_range
 
 
 logger = logging.getLogger(__name__)

ggshield/cmd/secret/scan/prereceive.py

@@ -24,9 +24,12 @@
 from ggshield.core.git_shell import get_list_commit_SHA
 from ggshield.core.text_utils import display_error
 from ggshield.scan import ScanContext, ScanMode
-from ggshield.secret.output import SecretGitLabWebUIOutputHandler, SecretOutputHandler
-from ggshield.secret.output.messages import remediation_message
-from ggshield.secret.repo import scan_commit_range
+from ggshield.verticals.secret.output import (
+    SecretGitLabWebUIOutputHandler,
+    SecretOutputHandler,
+)
+from ggshield.verticals.secret.output.messages import remediation_message
+from ggshield.verticals.secret.repo import scan_commit_range
 
 
 logger = logging.getLogger(__name__)

ggshield/cmd/secret/scan/pypi.py

@@ -16,7 +16,11 @@
 from ggshield.core.errors import UnexpectedError
 from ggshield.scan import Files, ScanContext, ScanMode
 from ggshield.scan.file import get_files_from_paths
-from ggshield.secret import RichSecretScannerUI, SecretScanCollection, SecretScanner
+from ggshield.verticals.secret import (
+    RichSecretScannerUI,
+    SecretScanCollection,
+    SecretScanner,
+)
 
 
 PYPI_DOWNLOAD_TIMEOUT = 30

ggshield/cmd/secret/scan/range.py

@@ -11,7 +11,7 @@
 from ggshield.core.errors import handle_exception
 from ggshield.core.git_shell import get_list_commit_SHA
 from ggshield.scan import ScanContext, ScanMode
-from ggshield.secret.repo import scan_commit_range
+from ggshield.verticals.secret.repo import scan_commit_range
 
 
 @click.command()

ggshield/cmd/secret/scan/repo.py

@@ -15,7 +15,7 @@
 from ggshield.core.git_shell import git
 from ggshield.core.utils import REGEX_GIT_URL
 from ggshield.scan import ScanContext, ScanMode
-from ggshield.secret.repo import scan_repo_path
+from ggshield.verticals.secret.repo import scan_repo_path
 
 
 @click.command()

ggshield/cmd/secret/scan/secret_scan_common_options.py

@@ -16,7 +16,7 @@
 from ggshield.core.config.user_config import SecretConfig
 from ggshield.core.filter import init_exclusion_regexes
 from ggshield.core.utils import IGNORED_DEFAULT_WILDCARDS
-from ggshield.secret.output import (
+from ggshield.verticals.secret.output import (
     SecretJSONOutputHandler,
     SecretOutputHandler,
     SecretTextOutputHandler,

ggshield/secret/output/secret_output_handler.py → ggshield/verticals/secret/output/secret_output_handler.py

@@ -4,7 +4,7 @@
 import click
 
 from ggshield.core.errors import ExitCode
-from ggshield.secret import SecretScanCollection
+from ggshield.verticals.secret import SecretScanCollection
 
 
 class SecretOutputHandler(ABC):

tests/unit/cmd/iac/test_scan_diff.py

@@ -4,7 +4,7 @@
 
 from ggshield.cmd.main import cli
 from ggshield.core.errors import ExitCode
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 from tests.conftest import _IAC_SINGLE_VULNERABILITY
 from tests.repository import Repository
 from tests.unit.conftest import my_vcr

tests/unit/cmd/iac/test_scan_prepush.py

@@ -5,7 +5,7 @@
 from click.testing import CliRunner
 
 from ggshield.cmd.main import cli
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 from tests.conftest import _IAC_NO_VULNERABILITIES, _IAC_SINGLE_VULNERABILITY
 from tests.repository import Repository
 from tests.unit.conftest import my_vcr

tests/unit/cmd/sca/test_diff.py

@@ -2,7 +2,7 @@
 
 from ggshield.cmd.main import cli
 from ggshield.core.errors import ExitCode
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 from tests.unit.conftest import my_vcr
 
 

tests/unit/cmd/sca/test_precommit.py

@@ -12,7 +12,7 @@
     SCAVulnerability,
     SCAVulnerablePackageVersion,
 )
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 from tests.repository import Repository
 from tests.unit.conftest import my_vcr
 

tests/unit/cmd/sca/test_scan.py

@@ -16,7 +16,7 @@
 from ggshield.core.errors import ExitCode
 from ggshield.sca.client import SCAClient
 from ggshield.sca.sca_scan_models import SCAScanAllOutput, SCAScanDiffOutput
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 from tests.repository import Repository
 from tests.unit.conftest import my_vcr, write_text
 

tests/unit/cmd/sca/test_scan_prepush.py

@@ -6,7 +6,7 @@
 
 from ggshield.cmd.main import cli
 from ggshield.core.errors import ExitCode
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 from tests.repository import Repository
 from tests.unit.conftest import my_vcr
 

tests/unit/cmd/sca/test_scan_prereceive.py

@@ -6,7 +6,7 @@
 
 from ggshield.cmd.main import cli
 from ggshield.core.errors import ExitCode
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 from tests.repository import create_pre_receive_repo
 from tests.unit.conftest import my_vcr
 

tests/unit/cmd/scan/test_docker.py

@@ -8,8 +8,8 @@
 from ggshield.cmd.main import cli
 from ggshield.core.errors import ExitCode
 from ggshield.scan import Files, StringScannable
-from ggshield.secret import SecretScanCollection
-from ggshield.secret.docker import DockerImage, LayerInfo, _validate_filepath
+from ggshield.verticals.secret import SecretScanCollection
+from ggshield.verticals.secret.docker import DockerImage, LayerInfo, _validate_filepath
 from tests.unit.conftest import (
     DOCKER__INCOMPLETE_MANIFEST_EXAMPLE_PATH,
     DOCKER_EXAMPLE_PATH,
@@ -95,7 +95,7 @@ def test_docker_scan_failed_to_save(
         assert_invoke_exited_with(result, ExitCode.UNEXPECTED_ERROR)
         assert 'Image "ggshield-non-existant" not found' in result.output
 
-    @patch("ggshield.secret.docker.DockerImage")
+    @patch("ggshield.verticals.secret.docker.DockerImage")
     @pytest.mark.parametrize(
         "image_path", [DOCKER_EXAMPLE_PATH, DOCKER__INCOMPLETE_MANIFEST_EXAMPLE_PATH]
     )

tests/unit/cmd/scan/test_prepush.py

@@ -9,7 +9,7 @@
 from ggshield.core.filter import init_exclusion_regexes
 from ggshield.core.utils import EMPTY_SHA, EMPTY_TREE, IGNORED_DEFAULT_WILDCARDS
 from ggshield.scan import ScanContext, ScanMode
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 from tests.repository import Repository
 from tests.unit.conftest import assert_invoke_exited_with, assert_invoke_ok
 

tests/unit/cmd/scan/test_prereceive.py

@@ -7,8 +7,8 @@
 from ggshield.core.errors import ExitCode
 from ggshield.core.utils import EMPTY_SHA, Filemode
 from ggshield.scan import StringScannable
-from ggshield.secret import Result, Results, SecretScanCollection
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret import Result, Results, SecretScanCollection
+from ggshield.verticals.secret.repo import cd
 from tests.repository import Repository, create_pre_receive_repo
 from tests.unit.conftest import (
     _SIMPLE_SECRET_PATCH,
@@ -157,8 +157,8 @@ def test_stdin_breakglass_2ndoption(
             in result.output
         )
 
-    @patch("ggshield.secret.repo.check_client_api_key")
-    @patch("ggshield.secret.repo.scan_commits_content")
+    @patch("ggshield.verticals.secret.repo.check_client_api_key")
+    @patch("ggshield.verticals.secret.repo.scan_commits_content")
     def test_stdin_supports_gitlab_web_ui(
         self,
         scan_commits_content_mock: Mock,

tests/unit/cmd/test_config.py

@@ -8,7 +8,7 @@
 from ggshield.core.config.user_config import UserConfig
 from ggshield.core.config.utils import find_global_config_path
 from ggshield.core.errors import ExitCode
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 
 from .utils import add_instance_config
 

tests/unit/cmd/test_ignore.py

@@ -8,7 +8,7 @@
 from ggshield.core.config import Config
 from ggshield.core.types import IgnoredMatch
 from ggshield.scan import Commit, ScanContext, ScanMode
-from ggshield.secret import SecretScanner
+from ggshield.verticals.secret import SecretScanner
 from tests.unit.conftest import _MULTIPLE_SECRETS_PATCH, my_vcr
 
 

tests/unit/core/test_git_shell.py

@@ -16,7 +16,7 @@
     is_valid_git_commit_ref,
     tar_from_ref_and_filepaths,
 )
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret.repo import cd
 from tests.repository import Repository
 
 

tests/unit/core/test_utils.py

@@ -22,8 +22,8 @@
 )
 from ggshield.scan import Commit, Files, ScanContext, ScanMode, StringScannable
 from ggshield.scan.scan_context import parse_os_release
-from ggshield.secret import SecretScanner
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret import SecretScanner
+from ggshield.verticals.secret.repo import cd
 from tests.unit.conftest import (
     _PATCH_WITH_NONEWLINE_BEFORE_SECRET,
     _SECRET_RAW_FILE,

tests/unit/secret/output/test_gitlab_webui_output.py → tests/unit/verticals/secret/output/test_gitlab_webui_output.py

@@ -4,8 +4,8 @@
 from pygitguardian.models import Match, PolicyBreak
 
 from ggshield.scan import StringScannable
-from ggshield.secret import Result, Results, SecretScanCollection
-from ggshield.secret.output.secret_gitlab_webui_output_handler import (
+from ggshield.verticals.secret import Result, Results, SecretScanCollection
+from ggshield.verticals.secret.output.secret_gitlab_webui_output_handler import (
     SecretGitLabWebUIOutputHandler,
     format_policy_break,
 )

tests/unit/secret/output/test_json_output.py → tests/unit/verticals/secret/output/test_json_output.py

@@ -10,9 +10,17 @@
 from ggshield.core.filter import leak_dictionary_by_ignore_sha
 from ggshield.core.git_shell import Filemode
 from ggshield.scan import Commit, ScanContext, ScanMode, StringScannable
-from ggshield.secret import Result, Results, SecretScanCollection, SecretScanner
-from ggshield.secret.output import SecretJSONOutputHandler, SecretOutputHandler
-from ggshield.secret.output.schemas import JSONScanCollectionSchema
+from ggshield.verticals.secret import (
+    Result,
+    Results,
+    SecretScanCollection,
+    SecretScanner,
+)
+from ggshield.verticals.secret.output import (
+    SecretJSONOutputHandler,
+    SecretOutputHandler,
+)
+from ggshield.verticals.secret.output.schemas import JSONScanCollectionSchema
 from tests.unit.conftest import (
     _MULTIPLE_SECRETS_PATCH,
     _NO_SECRET_PATCH,

tests/unit/secret/output/test_text_output.py → tests/unit/verticals/secret/output/test_text_output.py

@@ -7,9 +7,11 @@
 from ggshield.core.filter import leak_dictionary_by_ignore_sha
 from ggshield.core.git_shell import Filemode
 from ggshield.scan import StringScannable
-from ggshield.secret import Result, Results, SecretScanCollection
-from ggshield.secret.output import SecretTextOutputHandler
-from ggshield.secret.output.secret_text_output_handler import format_line_count_break
+from ggshield.verticals.secret import Result, Results, SecretScanCollection
+from ggshield.verticals.secret.output import SecretTextOutputHandler
+from ggshield.verticals.secret.output.secret_text_output_handler import (
+    format_line_count_break,
+)
 from tests.unit.conftest import (
     _MULTI_SECRET_ONE_LINE_PATCH,
     _MULTI_SECRET_ONE_LINE_PATCH_OVERLAY,
@@ -111,7 +113,7 @@ def test_leak_message(result_input, snapshot, show_secrets, verbose):
     # None until we make an API call. Since this test does not make any API call, set
     # the version to a fake value.
     with mock.patch(
-        "ggshield.secret.output.secret_text_output_handler.VERSIONS"
+        "ggshield.verticals.secret.output.secret_text_output_handler.VERSIONS"
     ) as VERSIONS:
         VERSIONS.secrets_engine_version = "3.14.159"
 

tests/unit/secret/test_scan.py → tests/unit/verticals/secret/test_scan.py

@@ -9,8 +9,8 @@
 from ggshield.core.cache import Cache
 from ggshield.scan import Commit, ScanContext, ScanMode
 from ggshield.scan.scan_context import get_os_info
-from ggshield.secret import SecretScanner
-from ggshield.secret.repo import cd
+from ggshield.verticals.secret import SecretScanner
+from ggshield.verticals.secret.repo import cd
 from tests.unit.conftest import UNCHECKED_SECRET_PATCH
 
 

tests/unit/secret/test_scan_docker.py → tests/unit/verticals/secret/test_scan_docker.py

@@ -9,7 +9,7 @@
 import pytest
 
 from ggshield.core.errors import UnexpectedError
-from ggshield.secret.docker import (
+from ggshield.verticals.secret.docker import (
     DockerImage,
     InvalidDockerArchiveException,
     LayerInfo,