Merge remote-tracking branch 'origin/main' into tmp-improve

Author: DevForge Engineer

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Coding-Dev-Tools

.gitignore

@@ -71,6 +71,7 @@ Thumbs.db
 research/
 fixtures/generated/
 .ruff_cache/
+.secrets.baseline
 
 # Merge artifacts and cache (added by workspace stabilization)
 *.pyc

AGENTS.md

@@ -0,0 +1,35 @@
+# deploydiff
+
+## Purpose
+Compare deployment configurations across environments. Detect drift between staging and production configs. Preview infrastructure changes with human-readable diffs, cost impact estimation, and rollback commands.
+
+## Build & Test Commands
+- Install: `pip install -e .` or `pip install deploydiff`
+- Test: `pytest tests/` (or `python -m pytest tests/ -v --tb=short`)
+- Lint: `ruff check .`
+- Build: `pip install build twine && python -m build && twine check dist/*`
+- CLI check: `deploydiff --help`
+
+## Architecture
+Key directories:
+- `src/deploydiff/` — Main package (CLI, diff engine, cost estimator, rollback generator)
+- `tests/` — Test suite
+- `.github/workflows/` — CI/CD (auto-code-review.yml, ci.yml, pages.yml, publish.yml)
+- `dist/` — Built distributions
+- `scripts/` — Automation scripts
+
+## Conventions
+- Language: Python 3.10+
+- Test framework: pytest
+- CI: GitHub Actions (auto-code-review.yml, ci.yml, pages.yml, publish.yml)
+- Linting: ruff
+- Build system: setuptools
+- Package layout: src/ layout
+- Dependencies: click, rich, pyyaml, tomli, jinja2
+- CLI entry point: deploydiff.cli:cli
+- Default branch: main
+- Versioning: Semantic versioning (semver)
+- Documentation: Markdown
+
+## Contributing
+See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed contribution guidelines and development workflow.

pyproject.toml

@@ -9,12 +9,14 @@ description = "Preview infrastructure changes (Terraform, CloudFormation, Pulumi
 readme = "README.md"
 requires-python = ">=3.10"
 license = "MIT"
-authors = [{name = "Revenue Holdings"}]
+authors = [{name = "DevForge"}]
 
 dependencies = [
     "click>=8.1",
     "rich>=13.0",
     "pyyaml>=6.0",
+    "tomli>=2.0",
+    "jinja2>=3.1",
 ]
 keywords = ["infrastructure", "terraform", "cloudformation", "pulumi", "cost", "diff", "cli"]
 classifiers = [
@@ -25,6 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 
 [project.optional-dependencies]

src/deploydiff/__main__.py

@@ -1,4 +1,5 @@
 """Allow running as python -m deploydiff."""
+
 from deploydiff.cli import main
 
 main()

src/deploydiff/cli.py

@@ -15,6 +15,7 @@
 
 try:
     from revenueholdings_license import require_license
+
     _HAS_RH_LICENSE = True
 except ImportError:
     _HAS_RH_LICENSE = False
@@ -25,26 +26,64 @@
 @click.group()
 @click.version_option(package_name="deploydiff")
 @click.option("--no-gate", is_flag=True, help="Skip license gating check.")
+@click.option(
+    "--require-license",
+    "require_license_flag",
+    is_flag=True,
+    envvar="REVENUEHOLDINGS_REQUIRE_LICENSE",
+    help=(
+        "Exit with an error if revenueholdings-license is not installed "
+        "or if the license check fails. "
+        "Also enabled via REVENUEHOLDINGS_REQUIRE_LICENSE=1."
+    ),
+)
 @click.pass_context
-def main(ctx, no_gate) -> None:
+def main(ctx, no_gate, require_license_flag) -> None:
     """DeployDiff - Preview infrastructure changes with cost impact and rollback."""
     ctx.ensure_object(dict)
     ctx.obj["no_gate"] = no_gate
-    if _HAS_RH_LICENSE and not no_gate:
-        require_license("deploydiff")
+    ctx.obj["require_license_flag"] = require_license_flag
+    if not no_gate:
+        if _HAS_RH_LICENSE:
+            require_license("deploydiff")
+        elif require_license_flag:
+            console.print(
+                "[bold red]Error:[/bold red] revenueholdings-license is not installed. "
+                "Install it with: pip install revenueholdings-license"
+            )
+            raise SystemExit(1)
 
 
 @main.command()
-@click.option("--tf", "terraform_file", type=click.Path(exists=True), help="Terraform plan JSON file")
-@click.option("--cfn", "cloudformation_file", type=click.Path(exists=True), help="CloudFormation change set JSON file")
-@click.option("--pulumi", "pulumi_file", type=click.Path(exists=True), help="Pulumi preview JSON file")
-@click.option("-v", "--verbose", is_flag=True, help="Show before/after details for each change")
+@click.option(
+    "--tf",
+    "terraform_file",
+    type=click.Path(exists=True),
+    help="Terraform plan JSON file",
+)
+@click.option(
+    "--cfn",
+    "cloudformation_file",
+    type=click.Path(exists=True),
+    help="CloudFormation change set JSON file",
+)
+@click.option(
+    "--pulumi",
+    "pulumi_file",
+    type=click.Path(exists=True),
+    help="Pulumi preview JSON file",
+)
+@click.option(
+    "-v", "--verbose", is_flag=True, help="Show before/after details for each change"
+)
 @click.option(
     "--exit-on-destroy",
     is_flag=True,
     help="Exit with code 1 if the plan contains destructive changes (deletes or replaces)",
 )
-def preview(terraform_file, cloudformation_file, pulumi_file, verbose, exit_on_destroy) -> None:
+def preview(
+    terraform_file, cloudformation_file, pulumi_file, verbose, exit_on_destroy
+) -> None:
     """Preview infrastructure changes from a plan file."""
     plan = _load_plan(terraform_file, cloudformation_file, pulumi_file)
     if plan is None:
@@ -62,20 +101,43 @@ def preview(terraform_file, cloudformation_file, pulumi_file, verbose, exit_on_d
 
 
 @main.command()
-@click.option("--tf", "terraform_file", type=click.Path(exists=True), help="Terraform plan JSON file")
-@click.option("--cfn", "cloudformation_file", type=click.Path(exists=True), help="CloudFormation change set JSON file")
-@click.option("--pulumi", "pulumi_file", type=click.Path(exists=True), help="Pulumi preview JSON file")
-@click.option("--pricing", "pricing_file", type=click.Path(exists=True), help="Custom pricing JSON file")
+@click.option(
+    "--tf",
+    "terraform_file",
+    type=click.Path(exists=True),
+    help="Terraform plan JSON file",
+)
+@click.option(
+    "--cfn",
+    "cloudformation_file",
+    type=click.Path(exists=True),
+    help="CloudFormation change set JSON file",
+)
+@click.option(
+    "--pulumi",
+    "pulumi_file",
+    type=click.Path(exists=True),
+    help="Pulumi preview JSON file",
+)
+@click.option(
+    "--pricing",
+    "pricing_file",
+    type=click.Path(exists=True),
+    help="Custom pricing JSON file",
+)
 @click.option(
     "--threshold",
     type=float,
     default=None,
     help="Exit with code 1 if total monthly cost delta exceeds this value (e.g. 500 for $500)",
 )
-def cost(terraform_file, cloudformation_file, pulumi_file, pricing_file, threshold) -> None:
+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 import require_tier
+
         require_tier("pro", "deploydiff cost")
     plan = _load_plan(terraform_file, cloudformation_file, pulumi_file)
     if plan is None:
@@ -95,13 +157,29 @@ def cost(terraform_file, cloudformation_file, pulumi_file, pricing_file, thresho
 
 
 @main.command()
-@click.option("--tf", "terraform_file", type=click.Path(exists=True), help="Terraform plan JSON file")
-@click.option("--cfn", "cloudformation_file", type=click.Path(exists=True), help="CloudFormation change set JSON file")
-@click.option("--pulumi", "pulumi_file", type=click.Path(exists=True), help="Pulumi preview JSON file")
+@click.option(
+    "--tf",
+    "terraform_file",
+    type=click.Path(exists=True),
+    help="Terraform plan JSON file",
+)
+@click.option(
+    "--cfn",
+    "cloudformation_file",
+    type=click.Path(exists=True),
+    help="CloudFormation change set JSON file",
+)
+@click.option(
+    "--pulumi",
+    "pulumi_file",
+    type=click.Path(exists=True),
+    help="Pulumi preview JSON file",
+)
 def rollback(terraform_file, cloudformation_file, pulumi_file) -> None:
     """Generate rollback commands for infrastructure changes. (Pro feature)"""
     if _HAS_RH_LICENSE:
         from revenueholdings_license import require_tier
+
         require_tier("pro", "deploydiff rollback")
     plan = _load_plan(terraform_file, cloudformation_file, pulumi_file)
     if plan is None:
@@ -113,7 +191,6 @@ def rollback(terraform_file, cloudformation_file, pulumi_file) -> None:
         console.print(cmd)
 
 
-
 def _load_plan(
     terraform_file: str | None,
     cloudformation_file: str | None,
@@ -126,7 +203,9 @@ def _load_plan(
     if len(provided) == 0:
         return None
     if len(provided) > 1:
-        console.print("[red]Error: Provide only one source file (--tf, --cfn, or --pulumi)[/red]")
+        console.print(
+            "[red]Error: Provide only one source file (--tf, --cfn, or --pulumi)[/red]"
+        )
         raise SystemExit(1)
 
     if terraform_file:
@@ -139,7 +218,9 @@ def _load_plan(
     return None
 
 
-def _render_costs(estimates: list[CostEstimate], plan: DeployPlan, console: Console) -> None:
+def _render_costs(
+    estimates: list[CostEstimate], plan: DeployPlan, console: Console
+) -> None:
     """Render cost estimates to the console."""
     from rich import box
     from rich.table import Table
@@ -172,7 +253,9 @@ def _render_costs(estimates: list[CostEstimate], plan: DeployPlan, console: Cons
     if total > 0:
         console.print(f"\n[bold red]Total monthly increase: +${total:.2f}[/bold red]")
     elif total < 0:
-        console.print(f"\n[bold green]Total monthly decrease: -${abs(total):.2f}[/bold green]")
+        console.print(
+            f"\n[bold green]Total monthly decrease: -${abs(total):.2f}[/bold green]"
+        )
     else:
         console.print("\n[bold]Total monthly change: $0.00[/bold]")
 
@@ -188,8 +271,7 @@ def mcp() -> None:
         from .mcp_server import run_for_app
     except ImportError as exc:
         console.print(
-            "[red]Error: click-to-mcp is not installed.[/red]\n"
-            "Install it with: [bold]pip install click-to-mcp[/bold]"
+            "[red]Error: click-to-mcp is not installed.[/red]\nInstall it with: [bold]pip install click-to-mcp[/bold]"
         )
         raise SystemExit(1) from exc
 

src/deploydiff/cloudformation_parser.py

@@ -50,8 +50,12 @@ def parse_cloudformation_changeset(changeset_json: str | dict[str, Any]) -> Depl
     changes_list = data.get("Changes", data.get("changes", []))
 
     for change_entry in changes_list:
-        resource_change_data = change_entry.get("ResourceChange", change_entry.get("resource_change", {}))
-        action_str = change_entry.get("Action", resource_change_data.get("Action", "Modify"))
+        resource_change_data = change_entry.get(
+            "ResourceChange", change_entry.get("resource_change", {})
+        )
+        action_str = change_entry.get(
+            "Action", resource_change_data.get("Action", "Modify")
+        )
 
         action = CFN_ACTION_MAP.get(action_str, ChangeAction.UPDATE)
 
@@ -60,11 +64,16 @@ def parse_cloudformation_changeset(changeset_json: str | dict[str, Any]) -> Depl
         if CFN_REPLACEMENT_MAP.get(str(replacement), False):
             action = ChangeAction.REPLACE
 
-        resource_type = resource_change_data.get("Type", resource_change_data.get("ResourceType", "unknown"))
+        resource_type = resource_change_data.get(
+            "Type", resource_change_data.get("ResourceType", "unknown")
+        )
         resource_name = resource_change_data.get(
-        "LogicalResourceId", resource_change_data.get("PhysicalResourceId", "unknown")
-    )
-        address = resource_change_data.get("LogicalResourceId", f"{resource_type}.{resource_name}")
+            "LogicalResourceId",
+            resource_change_data.get("PhysicalResourceId", "unknown"),
+        )
+        address = resource_change_data.get(
+            "LogicalResourceId", f"{resource_type}.{resource_name}"
+        )
 
         # Scope details for update changes
         resource_change_data.get("Scope", [])

src/deploydiff/cost_estimator.py

@@ -153,7 +153,9 @@
 }
 
 
-def estimate_costs(plan: DeployPlan, pricing_file: str | Path | None = None) -> list[CostEstimate]:
+def estimate_costs(
+    plan: DeployPlan, pricing_file: str | Path | None = None
+) -> list[CostEstimate]:
     """Estimate monthly cost impact for each resource change in a plan.
 
     Args:
@@ -197,7 +199,10 @@ def _estimate_resource_cost(
     # If deleting, after cost is 0; if creating, before cost is 0
     if before and change.action == ChangeAction.CREATE:
         return 0.0
-    if not before and change.action in (ChangeAction.DELETE, ChangeAction.DELETE_BEFORE_CREATE):
+    if not before and change.action in (
+        ChangeAction.DELETE,
+        ChangeAction.DELETE_BEFORE_CREATE,
+    ):
         return 0.0
 
     resource_type = change.resource_type
@@ -206,7 +211,14 @@ def _estimate_resource_cost(
     # Try to find an instance type / size key in the resource config
     data = change.before if before else change.after
     if data and isinstance(data, dict):
-        for field in ("instance_type", "InstanceType", "node_type", "NodeType", "volume_type", "engine"):
+        for field in (
+            "instance_type",
+            "InstanceType",
+            "node_type",
+            "NodeType",
+            "volume_type",
+            "engine",
+        ):
             val = data.get(field, "")
             if val and str(val) in type_pricing:
                 return type_pricing[str(val)]
@@ -224,7 +236,9 @@ def _build_cost_description(change: ResourceChange, before: float, after: float)
     return "no change"
 
 
-def _load_pricing(pricing_file: str | Path | None = None) -> dict[str, dict[str, float]]:
+def _load_pricing(
+    pricing_file: str | Path | None = None,
+) -> dict[str, dict[str, float]]:
     """Load pricing data from a custom file, falling back to defaults."""
     if pricing_file is None:
         return DEFAULT_PRICING.copy()
@@ -233,7 +247,7 @@ def _load_pricing(pricing_file: str | Path | None = None) -> dict[str, dict[str,
     if not path.exists():
         return DEFAULT_PRICING.copy()
 
-    with open(path) as f:
+    with path.open() as f:
         custom = json.load(f)
 
     # Merge with defaults (custom overrides)