Merge pull request #982 from GitGuardian/mmillet/pass_config_around

chore: pass secret config around instead of discrete args

Author: agateau-gg

ggshield/cmd/secret/scan/archive.py

@@ -64,8 +64,7 @@ def archive_cmd(
                 client=ctx_obj.client,
                 cache=ctx_obj.cache,
                 scan_context=scan_context,
-                ignored_matches=config.user_config.secret.ignored_matches,
-                ignored_detectors=config.user_config.secret.ignored_detectors,
+                secret_config=config.user_config.secret,
             )
             results = scanner.scan(files, scanner_ui=scanner_ui)
 

ggshield/cmd/secret/scan/changes.py

@@ -52,9 +52,7 @@ def changes_cmd(ctx: click.Context, **kwargs: Any) -> int:
         commit_list=commit_list,
         output_handler=create_output_handler(ctx),
         exclusion_regexes=ctx_obj.exclusion_regexes,
-        matches_ignore=config.user_config.secret.ignored_matches,
+        secret_config=config.user_config.secret,
         scan_context=scan_context,
-        ignored_detectors=config.user_config.secret.ignored_detectors,
         verbose=config.user_config.verbose,
-        include_staged=True,
     )

ggshield/cmd/secret/scan/ci.py

@@ -51,7 +51,6 @@ def ci_cmd(ctx: click.Context, **kwargs: Any) -> int:
         commit_list=commit_list,
         output_handler=create_output_handler(ctx),
         exclusion_regexes=ctx_obj.exclusion_regexes,
-        matches_ignore=config.user_config.secret.ignored_matches,
+        secret_config=config.user_config.secret,
         scan_context=scan_context,
-        ignored_detectors=config.user_config.secret.ignored_detectors,
     )

ggshield/cmd/secret/scan/docker.py

@@ -57,9 +57,8 @@ def docker_name_cmd(
             archive_path=archive,
             client=ctx_obj.client,
             cache=ctx_obj.cache,
-            matches_ignore=config.user_config.secret.ignored_matches,
+            secret_config=config.user_config.secret,
             scan_context=scan_context,
-            ignored_detectors=config.user_config.secret.ignored_detectors,
             verbose=config.user_config.verbose,
         )
 

ggshield/cmd/secret/scan/dockerarchive.py

@@ -44,9 +44,8 @@ def docker_archive_cmd(
         archive_path=archive,
         client=ctx_obj.client,
         cache=ctx_obj.cache,
-        matches_ignore=config.user_config.secret.ignored_matches,
+        secret_config=config.user_config.secret,
         scan_context=scan_context,
-        ignored_detectors=config.user_config.secret.ignored_detectors,
     )
 
     return output_handler.process_scan(scan)

ggshield/cmd/secret/scan/docset.py

@@ -76,9 +76,8 @@ def docset_cmd(
         scanner = SecretScanner(
             client=ctx_obj.client,
             cache=ctx_obj.cache,
-            ignored_matches=config.user_config.secret.ignored_matches,
+            secret_config=config.user_config.secret,
             scan_context=scan_context,
-            ignored_detectors=config.user_config.secret.ignored_detectors,
         )
         scans = create_scans_from_docset_files(
             scanner=scanner,

ggshield/cmd/secret/scan/path.py

@@ -81,9 +81,8 @@ def path_cmd(
         scanner = SecretScanner(
             client=ctx_obj.client,
             cache=ctx_obj.cache,
-            ignored_matches=config.user_config.secret.ignored_matches,
             scan_context=scan_context,
-            ignored_detectors=config.user_config.secret.ignored_detectors,
+            secret_config=config.user_config.secret,
         )
         results = scanner.scan(files, scanner_ui=scanner_ui)
     scan = SecretScanCollection(

ggshield/cmd/secret/scan/precommit.py

@@ -66,12 +66,10 @@ def precommit_cmd(
         return 0
 
     output_handler = SecretTextOutputHandler(
-        show_secrets=config.user_config.secret.show_secrets,
         verbose=verbose,
         client=ctx_obj.client,
         output=None,
-        ignore_known_secrets=config.user_config.secret.ignore_known_secrets,
-        with_incident_details=config.user_config.secret.with_incident_details,
+        secret_config=config.user_config.secret,
     )
     check_git_dir()
 
@@ -94,8 +92,7 @@ def precommit_cmd(
         client=ctx_obj.client,
         cache=ctx_obj.cache,
         scan_context=scan_context,
-        ignored_matches=config.user_config.secret.ignored_matches,
-        ignored_detectors=config.user_config.secret.ignored_detectors,
+        secret_config=config.user_config.secret,
     )
     with ui.create_scanner_ui(len(commit.urls), verbose=verbose) as scanner_ui:
         results = scanner.scan(commit.get_files(), scanner_ui)

ggshield/cmd/secret/scan/prepush.py

@@ -98,9 +98,8 @@ def prepush_cmd(ctx: click.Context, prepush_args: List[str], **kwargs: Any) -> i
         commit_list=commit_list,
         output_handler=create_output_handler(ctx),
         exclusion_regexes=ctx_obj.exclusion_regexes,
-        matches_ignore=config.user_config.secret.ignored_matches,
+        secret_config=config.user_config.secret,
         scan_context=scan_context,
-        ignored_detectors=config.user_config.secret.ignored_detectors,
     )
     if return_code:
         click.echo(

ggshield/cmd/secret/scan/prereceive.py

@@ -55,9 +55,8 @@ def _execute_prereceive(
             commit_list=commit_list,
             output_handler=output_handler,
             exclusion_regexes=exclusion_regexes,
-            matches_ignore=config.user_config.secret.ignored_matches,
+            secret_config=config.user_config.secret,
             scan_context=scan_context,
-            ignored_detectors=config.user_config.secret.ignored_detectors,
         )
         if return_code:
             click.echo(
@@ -95,8 +94,7 @@ def prereceive_cmd(
     if os.getenv("GL_PROTOCOL") == "web":
         # We are inside GitLab web UI
         output_handler = SecretGitLabWebUIOutputHandler(
-            show_secrets=config.user_config.secret.show_secrets,
-            ignore_known_secrets=config.user_config.secret.ignore_known_secrets,
+            secret_config=config.user_config.secret, verbose=False
         )
 
     if get_breakglass_option():