fix: use sys.modules mock for revenueholdings_license in conftest (was AttributeError on require_tier)

Author: Coding-Dev-Tools

src/deploydiff/cli.py

@@ -15,7 +15,7 @@
 from .terraform_parser import parse_terraform_plan
 
 try:
-    from revenueholdings_license.integration import rh_check
+    from revenueholdings_license import require_license
     _HAS_RH_LICENSE = True
 except ImportError:
     _HAS_RH_LICENSE = False
@@ -32,7 +32,7 @@ def main(ctx, no_gate) -> None:
     ctx.ensure_object(dict)
     ctx.obj["no_gate"] = no_gate
     if _HAS_RH_LICENSE and not no_gate:
-        rh_check("deploydiff")
+        require_license("deploydiff")
 
 
 @main.command()
@@ -76,8 +76,8 @@ def preview(terraform_file, cloudformation_file, pulumi_file, verbose, exit_on_d
 def cost(terraform_file, cloudformation_file, pulumi_file, pricing_file, threshold) -> None:
     """Estimate monthly cost impact of infrastructure changes. (Pro feature)"""
     if _HAS_RH_LICENSE:
-        from revenueholdings_license.license import Tier, require_tier
-        require_tier(Tier.PRO, "deploydiff cost")
+        from revenueholdings_license import require_tier
+        require_tier("pro", "deploydiff cost")
     plan = _load_plan(terraform_file, cloudformation_file, pulumi_file)
     if plan is None:
         console.print("[red]Error: Provide one of --tf, --cfn, or --pulumi[/red]")
@@ -102,8 +102,8 @@ def cost(terraform_file, cloudformation_file, pulumi_file, pricing_file, thresho
 def rollback(terraform_file, cloudformation_file, pulumi_file) -> None:
     """Generate rollback commands for infrastructure changes. (Pro feature)"""
     if _HAS_RH_LICENSE:
-        from revenueholdings_license.license import Tier, require_tier
-        require_tier(Tier.PRO, "deploydiff rollback")
+        from revenueholdings_license import require_tier
+        require_tier("pro", "deploydiff rollback")
     plan = _load_plan(terraform_file, cloudformation_file, pulumi_file)
     if plan is None:
         console.print("[red]Error: Provide one of --tf, --cfn, or --pulumi[/red]")
@@ -182,6 +182,6 @@ def mcp() -> None:
     """Start an MCP server exposing all CLI commands as AI-callable tools.
 
     Uses stdio transport compatible with Claude Code, Cursor, Codex, and
-    any MCP-compatible agent.  Run this from your MCP client configuration.
+    any MCP-compatible agent. Run this from your MCP client configuration.
     """
     run_for_app(main)

tests/conftest.py

@@ -1,42 +1,24 @@
 """Test configuration - mock license checks so tests run without a license."""
 
 import pytest
+import sys
 from unittest.mock import MagicMock
 
+# Replace revenueholdings_license with a mock BEFORE any src imports resolve it
+_mock_rl = MagicMock()
+_mock_rl.require_license = MagicMock(return_value=None)
+_mock_rl.require_tier = MagicMock(return_value=None)
+sys.modules["revenueholdings_license"] = _mock_rl
+sys.modules.setdefault("revenueholdings_license.integration", _mock_rl)
+sys.modules.setdefault("revenueholdings_license.rate_limiter", MagicMock())
+
 
 @pytest.fixture(autouse=True)
 def _mock_license(monkeypatch):
-    """Auto-mock revenueholdings_license so all CLI commands bypass tier checks."""
-    mock_require_tier = MagicMock()
-
-    mock_rh_check = MagicMock()
-    mock_ci_gate = MagicMock()
-
-    # Patch at the integration module level
-    try:
-        import revenueholdings_license.integration as integration_mod
-        monkeypatch.setattr(integration_mod, "rh_check", mock_rh_check)
-        monkeypatch.setattr(integration_mod, "ci_gate", mock_ci_gate)
-    except ImportError:
-        pass
-
-    # Patch at the license module level
-    try:
-        import revenueholdings_license.license as license_mod
-        monkeypatch.setattr(license_mod, "require_tier", mock_require_tier)
-    except ImportError:
-        pass
-
-    # Patch at the top-level gate module
-    try:
-        import revenueholdings_license.gate as gate_mod
-        mock_status = MagicMock()
-        mock_status.tier = "PRO"
-        mock_status.allowed = True
-        mock_status.remaining = 999
-        mock_status.daily_limit = 999
-        mock_status.error = None
-        mock_require_license = MagicMock(return_value=mock_status)
-        monkeypatch.setattr(gate_mod, "require_license", mock_require_license)
-    except (ImportError, AttributeError):
-        pass
+    """Ensure license checks stay mocked even if a test reimports."""
+    monkeypatch.setattr(
+        "revenueholdings_license.require_license", MagicMock(return_value=None)
+    )
+    monkeypatch.setattr(
+        "revenueholdings_license.require_tier", MagicMock(return_value=None)
+    )