fix(ci): use full scans outside pull requests

Author: lelia

socketsecurity/socketcli.py

@@ -133,6 +133,14 @@ def _select_pull_request_provider(integration_type: str, scm_type: str) -> str:
     return scm_type if scm_type in ("github", "gitlab") else integration_type
 
 
+def _should_create_scm_diff(
+    event_type: str,
+    enable_diff: bool = False,
+    force_diff_mode: bool = False,
+) -> bool:
+    return event_type == "diff" or enable_diff or force_diff_mode
+
+
 def build_socket_sdk(config: CliConfig) -> socketdev:
     cli_user_agent_string = f"SocketPythonCLI/{config.version}"
     return socketdev(
@@ -680,7 +688,8 @@ def _is_unprocessed(c):
                 return False
             return True
 
-        if scm is not None and scm.check_event_type() == "comment":
+        scm_event_type = scm.check_event_type() if scm is not None else None
+        if scm_event_type == "comment":
             # FIXME: This entire flow should be a separate command called "filter_ignored_alerts_in_comments"
             # It's not related to scanning or diff generation - it just:
             # 1. Triggers on comments in GitHub/GitLab
@@ -734,9 +743,13 @@ def _is_unprocessed(c):
             else:
                 log.info("Ignore commands disabled (--disable-ignore), skipping comment processing")
 
-        elif scm is not None and scm.check_event_type() != "comment" and not force_api_mode:
+        elif scm is not None and not force_api_mode:
             log.info("Push initiated flow")
-            if scm.check_event_type() == "diff":
+            if _should_create_scm_diff(
+                scm_event_type,
+                enable_diff=config.enable_diff,
+                force_diff_mode=force_diff_mode,
+            ):
                 log.info("Starting comment logic for PR/MR event")
                 diff = core.create_new_diff(
                     scan_paths,
@@ -874,15 +887,14 @@ def _is_unprocessed(c):
                 )
             else:
                 log.info("Starting non-PR/MR flow")
-                diff = core.create_new_diff(
+                diff = core.create_full_scan_with_report_url(
                     scan_paths,
                     params,
                     no_change=should_skip_scan,
                     save_files_list_path=config.save_submitted_files_list,
                     save_manifest_tar_path=config.save_manifest_tar,
                     base_paths=base_paths,
                     explicit_files=scan_explicit_files,
-                    external_href=pr_context.url,
                 )
 
             output_handler.handle_output(diff)

tests/unit/test_socketcli.py

@@ -74,6 +74,20 @@ def test_pr_context_provider_uses_integration_without_comment_adapter():
     assert socketcli._select_pull_request_provider("azure", "api") == "azure"
 
 
+def test_scm_merge_request_event_creates_diff():
+    assert socketcli._should_create_scm_diff("diff") is True
+
+
+def test_scm_branch_event_defaults_to_full_scan():
+    assert socketcli._should_create_scm_diff("main") is False
+
+
+@pytest.mark.parametrize("override", ["enable_diff", "force_diff_mode"])
+def test_scm_branch_event_honors_diff_override(override):
+    options = {override: True}
+    assert socketcli._should_create_scm_diff("main", **options) is True
+
+
 # ---------------------------------------------------------------------------
 # Buildkite-aware infrastructure error formatting.
 # ---------------------------------------------------------------------------