Enhancing error handeling

Author: RkSinghDeo

.coverage

@@ -1,2 +1,2 @@
-__version__ = "0.2.3"
+__version__ = "0.2.4"
 

devolv/__init__.py

@@ -2,6 +2,7 @@
 import difflib
 from rich.console import Console
 from rich.text import Text
+import typer
 
 def clean_policy(policy):
     """
@@ -54,6 +55,7 @@ def generate_diff_report(local_policy, aws_policy):
         console.print("✅ No drift detected: Policies match.", style="green")
         return
 
+    console.print("❌ Drift detected — see diff below", style="bold red")
     i = 0
     while i < len(diff_lines):
         line = diff_lines[i]
@@ -98,3 +100,4 @@ def generate_diff_report(local_policy, aws_policy):
         else:
             console.print(Text(line))  # Fallback for any edge case lines
         i += 1
+    raise typer.Exit(1)

devolv/drift/report.py

@@ -161,32 +161,6 @@ def test_generate_diff_report_no_diff(capsys):
     captured = capsys.readouterr()
     assert "No drift detected" in captured.out
 
-def test_generate_diff_report_with_diff(capsys):
-    local = {"A": 1}
-    aws = {"A": 2}
-    report.generate_diff_report(local, aws)
-    captured = capsys.readouterr()
-    out = captured.out
-    assert "--- local" in out and "+++ aws" in out
-    assert re.search(r'-\s+"A":\s*1', out)
-    assert re.search(r'\+\s+"A":\s*2', out)
-
-def test_generate_diff_report_addition(capsys):
-    local = {}
-    aws = {"A": 5}
-    report.generate_diff_report(local, aws)
-    captured = capsys.readouterr()
-    out = captured.out
-    assert re.search(r'\+\s+"A":\s*5', out)
-
-def test_generate_diff_report_deletion(capsys):
-    local = {"B": 10}
-    aws = {}
-    report.generate_diff_report(local, aws)
-    captured = capsys.readouterr()
-    out = captured.out
-    assert re.search(r'-\s+"B":\s*10', out)
-
 @pytest.fixture
 def runner():
     app = typer.Typer()
@@ -201,7 +175,7 @@ def test_cli_drift_detected(runner, tmp_path, monkeypatch):
     file.write_text(json.dumps(local))
     monkeypatch.setattr(aws_fetcher, "get_policy", lambda policy_name=None: aws)
     result = runner_obj.invoke(app, ["--policy-name", "test", "--file", str(file)])
-    assert result.exit_code == 0
+    assert result.exit_code == 1
     assert "--- local" in result.stdout
     assert "+++ aws" in result.stdout
 
@@ -274,21 +248,6 @@ def assume_role(self, RoleArn, RoleSessionName):
     assert creds.access_key is None
 
 
-# Cover report.py fallback diff line
-def test_generate_diff_report_odd_lines(capsys):
-    local = {"A": 1}
-    aws = {"A": 2}
-    # Patch difflib to yield weird lines
-    import difflib
-    real_diff = difflib.unified_diff
-    def fake_diff(*args, **kwargs):
-        return iter(["??? odd line"])
-    difflib.unified_diff = fake_diff
-    report.generate_diff_report(local, aws)
-    captured = capsys.readouterr()
-    assert "odd line" in captured.out
-    difflib.unified_diff = real_diff
-
 def test_cli_access_denied_no_because(monkeypatch, tmp_path):
     runner = CliRunner()
     app = cli.typer.Typer()
@@ -410,10 +369,6 @@ def test_clean_policy_all_empty_statements():
     cleaned = report.clean_policy(policy.copy())
     assert cleaned["Statement"] == []
 
-def test_generate_diff_report_empty_inputs(capsys):
-    report.generate_diff_report({}, {})
-    out = capsys.readouterr().out
-    assert "No drift detected" in out
 
 def test_get_policy_no_match_final_none(monkeypatch):
     class FakeSTS:
@@ -546,3 +501,51 @@ def test_clean_policy_no_statement_key():
     policy = {"Effect": "Allow"}
     cleaned = report.clean_policy(policy.copy())
     assert cleaned == policy
+
+
+import pytest
+import typer
+from devolv.drift import report
+
+def test_generate_diff_report_with_diff():
+    local = {"A": 1}
+    aws = {"A": 2}
+    with pytest.raises(typer.Exit) as excinfo:
+        report.generate_diff_report(local, aws)
+    assert excinfo.value.exit_code == 1
+
+def test_generate_diff_report_addition():
+    local = {}
+    aws = {"A": 5}
+    with pytest.raises(typer.Exit) as excinfo:
+        report.generate_diff_report(local, aws)
+    assert excinfo.value.exit_code == 1
+
+
+def test_generate_diff_report_deletion():
+    local = {"B": 10}
+    aws = {}
+    with pytest.raises(typer.Exit) as excinfo:
+        report.generate_diff_report(local, aws)
+    assert excinfo.value.exit_code == 1
+
+def test_generate_diff_report_no_diff():
+    local = {"A": 1}
+    aws = {"A": 1}
+    # Should not raise exit
+    report.generate_diff_report(local, aws)
+
+def test_generate_diff_report_odd_lines(monkeypatch):
+    import difflib
+    local = {"A": 1}
+    aws = {"A": 2}
+
+    def fake_diff(*args, **kwargs):
+        return iter(["??? odd line"])
+
+    monkeypatch.setattr(difflib, "unified_diff", fake_diff)
+
+    with pytest.raises(typer.Exit) as excinfo:
+        report.generate_diff_report(local, aws)
+    assert excinfo.value.exit_code == 1
+