Remove unnecessary backwards compat logic

Signed-off-by: lelia <lelia@socket.dev>

Author: lelia

socketsecurity/config.py

@@ -81,7 +81,6 @@ class CliConfig:
     enable_json: bool = False
     enable_sarif: bool = False
     sarif_file: Optional[str] = None
-    sarif_reachable_only: bool = False
     sarif_scope: str = "diff"
     sarif_grouping: str = "instance"
     sarif_reachability: str = "all"
@@ -168,13 +167,6 @@ def from_args(cls, args_list: Optional[List[str]] = None) -> 'CliConfig':
         if args.sarif_file:
             args.enable_sarif = True
 
-        # Backward-compatible shim: --sarif-reachable-only => --sarif-reachability reachable
-        if args.sarif_reachable_only:
-            if args.sarif_reachability not in ("all", "reachable"):
-                logging.error("--sarif-reachable-only conflicts with --sarif-reachability")
-                exit(1)
-            args.sarif_reachability = "reachable"
-
         # Strip quotes from commit message if present
         commit_message = args.commit_message
         if commit_message and commit_message.startswith('"') and commit_message.endswith('"'):
@@ -199,7 +191,6 @@ def from_args(cls, args_list: Optional[List[str]] = None) -> 'CliConfig':
             'enable_json': args.enable_json,
             'enable_sarif': args.enable_sarif,
             'sarif_file': args.sarif_file,
-            'sarif_reachable_only': args.sarif_reachable_only,
             'sarif_scope': args.sarif_scope,
             'sarif_grouping': args.sarif_grouping,
             'sarif_reachability': args.sarif_reachability,
@@ -289,10 +280,6 @@ def from_args(cls, args_list: Optional[List[str]] = None) -> 'CliConfig':
             logging.error("--workspace-name requires --sub-path to be specified")
             exit(1)
 
-        # Validate that sarif_reachable_only requires reach
-        if args.sarif_reachable_only and not args.reach:
-            logging.error("--sarif-reachable-only requires --reach to be specified")
-            exit(1)
         if args.sarif_scope == "full" and not args.reach:
             logging.error("--sarif-scope full requires --reach to be specified")
             exit(1)
@@ -586,12 +573,6 @@ def create_argument_parser() -> argparse.ArgumentParser:
         default=None,
         help="Output file path for SARIF report (implies --enable-sarif)"
     )
-    output_group.add_argument(
-        "--sarif-reachable-only",
-        dest="sarif_reachable_only",
-        action="store_true",
-        help="Filter SARIF output to only include reachable findings (requires --reach)"
-    )
     output_group.add_argument(
         "--sarif-scope",
         dest="sarif_scope",

tests/unit/test_config.py

@@ -74,17 +74,11 @@ class TestCliConfigValidation:
 
     BASE_ARGS = ["--api-token", "test-token", "--repo", "test-repo"]
 
-    def test_sarif_reachable_only_without_reach_exits(self):
-        """--sarif-reachable-only without --reach should exit with code 1"""
+    def test_sarif_reachable_only_is_not_supported(self):
+        """Legacy --sarif-reachable-only is removed; argparse should reject it."""
         with pytest.raises(SystemExit) as exc_info:
-            CliConfig.from_args(self.BASE_ARGS + ["--sarif-reachable-only"])
-        assert exc_info.value.code == 1
-
-    def test_sarif_reachable_only_with_reach_succeeds(self):
-        """--sarif-reachable-only with --reach should not raise"""
-        config = CliConfig.from_args(self.BASE_ARGS + ["--sarif-reachable-only", "--reach"])
-        assert config.sarif_reachable_only is True
-        assert config.reach is True
+            CliConfig.from_args(self.BASE_ARGS + ["--sarif-reachable-only", "--reach"])
+        assert exc_info.value.code == 2
 
     def test_sarif_file_implies_enable_sarif(self):
         """--sarif-file should automatically set enable_sarif=True"""
@@ -121,8 +115,8 @@ def test_sarif_grouping_alert_requires_full_scope(self):
             CliConfig.from_args(self.BASE_ARGS + ["--reach", "--sarif-grouping", "alert"])
         assert exc_info.value.code == 1
 
-    def test_legacy_sarif_reachable_only_maps_to_reachability(self):
-        config = CliConfig.from_args(self.BASE_ARGS + ["--reach", "--sarif-reachable-only"])
+    def test_sarif_reachability_reachable_with_reach_succeeds(self):
+        config = CliConfig.from_args(self.BASE_ARGS + ["--reach", "--sarif-reachability", "reachable"])
         assert config.sarif_reachability == "reachable"
 
     def test_config_file_toml_sets_defaults(self, tmp_path):
@@ -160,10 +154,11 @@ def test_cli_flag_overrides_config_file(self, tmp_path):
     def test_config_file_json_sets_defaults(self, tmp_path):
         config_path = tmp_path / "socketcli.json"
         config_path.write_text(
-            "{\"socketcli\": {\"reach\": true, \"sarif_scope\": \"full\", \"sarif_grouping\": \"alert\"}}",
+            "{\"socketcli\": {\"reach\": true, \"sarif_scope\": \"full\", \"sarif_grouping\": \"alert\", \"sarif_reachability\": \"reachable\"}}",
             encoding="utf-8",
         )
         config = CliConfig.from_args(self.BASE_ARGS + ["--config", str(config_path)])
         assert config.reach is True
         assert config.sarif_scope == "full"
         assert config.sarif_grouping == "alert"
+        assert config.sarif_reachability == "reachable"