updating docs"

Author: RkSinghDeo

devolv/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.9"

devolv/cli.py

@@ -1,13 +1,25 @@
 import typer
-from devolv.iam.validator.cli import app as validate_app
+from devolv import __version__
+from devolv.iam.validator.cli import validate
 
 app = typer.Typer(help="Devolv CLI - Modular DevOps Toolkit")
-app.add_typer(validate_app, name="validate")
 
-if __name__ == "__main__":  # pragma: no cover
-    app()
+app.command("validate")(validate)
 
-@app.command("version")
-def version():
-    """Print CLI version."""
-    typer.echo("Devolv v0.1.0")
+@app.callback()
+def main(
+    version: bool = typer.Option(
+        None,
+        "--version",
+        "-v",
+        help="Show Devolv version and exit.",
+        callback=lambda value: _print_version(value),
+        is_eager=True,
+    )
+):
+    pass
+
+def _print_version(value: bool):
+    if value:
+        typer.echo(f"Devolv version: {__version__}")
+        raise typer.Exit()

devolv/iam/validator/cli.py

@@ -1,36 +1,38 @@
 import typer
 import os
+from typer import Exit
 from devolv.iam.validator.core import validate_policy_file
 from devolv.iam.validator.folder import validate_policy_folder
-app = typer.Typer(help="IAM Policy Validator CLI")
 
-@app.command("file")
-def validate_file(path: str):
-    """
-    Validate an AWS IAM policy file (JSON or YAML).
-    """
+def validate(
+    path: str,
+    json_output: bool = typer.Option(False, "--json", help="Output findings in JSON format"),
+    quiet: bool = typer.Option(False, "--quiet", help="Suppress debug logs"),
+):
     if not os.path.exists(path):
-        typer.secho(f"❌ File not found: {path}", fg=typer.colors.RED)
-        raise typer.Exit(code=1)
+        typer.secho(f"❌ Path not found: {path}", fg=typer.colors.RED)
+        raise Exit(code=1)
 
-    try:
+    if os.path.isfile(path):
         findings = validate_policy_file(path)
         if not findings:
             typer.secho("✅ Policy is valid and passed all checks.", fg=typer.colors.GREEN)
-        else:
-            for finding in findings:
-                typer.secho(f"❌ {finding['level'].upper()}: {finding['message']}", fg=typer.colors.RED)
-            raise typer.Exit(code=1)
-    except Exception as e:
-        typer.secho(f"❌ Error: {str(e)}", fg=typer.colors.RED)
-        raise typer.Exit(code=1)
+            raise Exit(code=0)
+        for finding in findings:
+            typer.secho(f"❌ {finding['level'].upper()}: {finding['message']}", fg=typer.colors.RED)
+        raise Exit(code=1)
 
+    elif os.path.isdir(path):
+        findings = validate_policy_folder(path)
+        if not findings:
+            typer.secho("✅ All policies passed validation.", fg=typer.colors.GREEN)
+            raise Exit(code=0)
+        for finding in findings:
+            typer.secho(f"❌ {finding['level'].upper()}: {finding['message']}", fg=typer.colors.RED)
+        if any(f["level"] == "error" for f in findings):
+            raise Exit(code=1)
+        raise Exit(code=0)
 
-@app.command("folder")
-def validate_folder(path: str):
-    """
-    Recursively validate all IAM policy files in a folder.
-    """
-    exit_code = validate_policy_folder(path)
-    raise typer.Exit(code=exit_code)
-
+    else:
+        typer.secho(f"❌ Unsupported path type: {path}", fg=typer.colors.RED)
+        raise Exit(code=1)

devolv/iam/validator/core.py

@@ -20,9 +20,12 @@ def validate_policy_file(path: str):
     for rule in RULES:
         result = rule["check"](data)
         if result:
-            findings.append({
+            finding = {
                 "id": rule["id"],
                 "level": rule["level"],
                 "message": result
-            })
+            }
+            findings.append(finding)
     return findings
+
+

devolv/iam/validator/folder.py

@@ -1,30 +1,30 @@
 from pathlib import Path
-from .core import validate_policy_file   # ✅ reusing logic from core.py
+from .core import validate_policy_file
 
-def validate_policy_folder(folder_path: str) -> int:
+def validate_policy_folder(folder_path: str) -> list:
     folder = Path(folder_path)
     if not folder.exists() or not folder.is_dir():
         print(f"❌ Folder '{folder_path}' not found or is not a directory.")
-        return 1
+        return [{"level": "error", "message": f"Folder '{folder_path}' not found or invalid."}]
 
     policy_files = list(folder.rglob("*.json")) + list(folder.rglob("*.yaml")) + list(folder.rglob("*.yml"))
     if not policy_files:
         print(f"⚠️ No policy files found in '{folder_path}'.")
-        return 1
+        return [{"level": "warning", "message": f"No policy files found in '{folder_path}'."}]
 
-    has_errors = False
+    all_findings = []
     for file in policy_files:
         print(f"\n🔍 Validating: {file}")
         try:
-            findings = validate_policy_file(str(file))  # ✅ core logic used here
+            findings = validate_policy_file(str(file))
             if not findings:
                 print("✅ Policy is valid.")
             else:
-                has_errors = True
+                all_findings.extend(findings)
                 for f in findings:
                     print(f"❌ {f['level'].upper()}: {f['message']}")
         except Exception as e:
-            has_errors = True
+            all_findings.append({"level": "error", "message": f"{file.name} failed: {str(e)}"})
             print(f"❌ ERROR parsing {file.name}: {str(e)}")
 
-    return 1 if has_errors else 0
+    return all_findings

docs/index.md

@@ -25,8 +25,7 @@ pip install devolv
 
 | Command                  | Status   | Description                                        |
 |--------------------------|----------|----------------------------------------------------|
-| `devolv validate file`   | ✅ Ready | Validate a single AWS IAM JSON/YAML policy file    |
-| `devolv validate folder` | ✅ Ready | Validate all policies inside a folder              |
+| `devolv validate file`   | ✅ Ready | Validate a AWS IAM JSON/YAML policy file/fodler    |
 | `devolv scan`            | 🔜 WIP   | Scan AWS accounts for live misconfigurations       |
 | `devolv generate`        | 🔜 WIP   | AI/Rule-based IAM policy generation                |
 | `devolv etl`             | 🔜 WIP   | Transform/clean policies for IAM pipelines         |

docs/validator.md

@@ -26,13 +26,13 @@ Statically validate AWS IAM policy files to detect:
 ### 🔹 Validate a Single File
 
 ```bash
-devolv validate file path/to/policy.json
+devolv validate path/to/policy.json
 ```
 
 ### 🔹 Validate a Folder
 
 ```bash
-devolv validate folder path/to/folder/
+devolv validate path/to/folder/
 ```
 
 > Scans all `.json`, `.yaml`, and `.yml` files in the folder recursively.

pyproject.toml

@@ -4,16 +4,19 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devolv"
-version = "0.1.6"
 description = "Modular DevOps Toolkit with IAM policy validation"
 readme = "README.md"
 requires-python = ">=3.8"
-license = { text = "MIT" }
+license = "MIT"
 authors = [{ name = "Devolv Dev", email = "devolv.dev@gmail.com" }]
 dependencies = ["typer>=0.9", "PyYAML"]
+dynamic = ["version"]  # ✔️ Only declare version here
 
 [project.optional-dependencies]
 dev = ["pytest"]
 
 [project.scripts]
 devolv = "devolv.cli:app"
+
+[tool.setuptools.dynamic]
+version = { attr = "devolv.__version__" }

tests/__init__.py

@@ -17,27 +17,33 @@ def make_policy_file(policy_dict):
 def test_validate_file_success():
     path = make_policy_file({
         "Version": "2012-10-17",
-        "Statement": [{"Effect": "Allow", "Action": "s3:GetObject", "Resource": "arn:aws:s3:::bucket/*"}]
+        "Statement": [{
+            "Effect": "Allow",
+            "Action": "s3:GetObject",
+            "Resource": "arn:aws:s3:::my-bucket/my-object.txt"
+
+        }]
     })
-    result = runner.invoke(app, ["validate", "file", path])
+    result = runner.invoke(app, ["validate", path])
     assert result.exit_code == 0
-    assert "✅" in result.output
     os.remove(path)
 
+
+
 def test_validate_file_error():
     path = make_policy_file({
         "Version": "2012-10-17",
         "Statement": [{"Effect": "Allow", "Action": "*", "Resource": "*"}]
     })
-    result = runner.invoke(app, ["validate", "file", path])
+    result = runner.invoke(app, ["validate", path])
     assert result.exit_code == 1
     assert "❌" in result.output
     os.remove(path)
 
 def test_validate_file_missing():
-    result = runner.invoke(app, ["validate", "file", "no_such_file.json"])
+    result = runner.invoke(app, ["validate", "no_such_file.json"])
     assert result.exit_code == 1
-    assert "File not found" in result.output
+    assert "not found" in result.output
 
 def test_validate_folder_all_valid(tmp_path):
     valid = {
@@ -48,7 +54,7 @@ def test_validate_folder_all_valid(tmp_path):
         path = tmp_path / f"v{i}.json"
         path.write_text(json.dumps(valid))
 
-    result = runner.invoke(app, ["validate", "folder", str(tmp_path)])
+    result = runner.invoke(app, ["validate", str(tmp_path)])
     assert result.exit_code == 0
     assert "✅" in result.output
 
@@ -64,7 +70,7 @@ def test_validate_folder_with_errors(tmp_path):
     (tmp_path / "good.json").write_text(json.dumps(good))
     (tmp_path / "bad.json").write_text(json.dumps(bad))
 
-    result = runner.invoke(app, ["validate", "folder", str(tmp_path)])
+    result = runner.invoke(app, ["validate", str(tmp_path)])
     assert result.exit_code == 1
     assert "❌" in result.output
 
@@ -76,9 +82,9 @@ def test_cli_help():
 def test_cli_root_help():
     result = runner.invoke(app, ["--help"])
     assert result.exit_code == 0
-    assert "Devolv CLI - Modular DevOps Toolkit" in result.output
+    assert "Modular DevOps Toolkit" in result.output
 
 def test_cli_version():
-    result = runner.invoke(app, ["version"])
+    result = runner.invoke(app, ["--version"])
     assert result.exit_code == 0
-    assert "v0.1.0" in result.output
+    assert "0.1." in result.output  # Adjust if dynamic version