thothctl 0.18.2__tar.gz → 0.18.4__tar.gz

{thothctl-0.18.2 → thothctl-0.18.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thothctl
-Version: 0.18.2
+Version: 0.18.4
 Summary: A CLI for Developer Control Plane. Accelerate your cloud IaC deployments.
 Project-URL: SourceCode, https://github.com/thothforge/thothctl
 Project-URL: HomePage, https://github.com/thothforge/thothctl

{thothctl-0.18.2 → thothctl-0.18.4}/docs/framework/commands/check/check_project_iac.md

@@ -19,6 +19,7 @@ Options:
                                   Project type: stack or module [default: stack]
   --org-policy TEXT               Organization policy source (Git URL or local path)
   --enforcement [soft|hard]       Enforcement mode: soft (report) or hard (fail pipeline)
+  --skip-org-policy               Skip organizational policy check (project exceptions)
   --help                          Show this message and exit.
 ```
 
@@ -26,9 +27,52 @@ Options:
 
 ThothCTL can enforce organizational standards that projects **cannot override**. This ensures all projects in your organization follow the same structure, naming, and tagging rules — regardless of what individual `.thothcf.toml` files contain.
 
+### Policy Resolution Order
+
+ThothCTL resolves the org policy source in this order:
+
+| Priority | Source | Example |
+|----------|--------|---------|
+| 1 | `--org-policy` flag | `--org-policy https://github.com/myorg/policies.git` |
+| 2 | `THOTH_ORG_POLICY` env var | `export THOTH_ORG_POLICY=https://github.com/myorg/policies.git` |
+| 3 | **Active space's `governance.policy_repo`** | Set via `thothctl space update <name> --policy-repo <url>` |
+| 4 | None (skip org policy) | No org rules applied |
+
+### Space Integration
+
+When a space is active and has a `policy_repo` configured, organizational rules are loaded **automatically** — no flags or env vars needed:
+
+```bash
+# 1. Configure your space with the org policy repo
+thothctl space update platform-team --policy-repo https://github.com/myorg/org-policies.git
+
+# 2. Activate the space
+thothctl space activate platform-team
+
+# 3. Run check — org rules load automatically
+thothctl check project iac -p stack
+
+# Output:
+# 📜 Loading org policy from: /home/user/.thothcf/.policy_cache/abc123
+# ✅ Organization policy check passed
+```
+
+### Skipping Org Policy (Project Exceptions)
+
+Projects that have explicit exceptions from organizational rules can skip the check:
+
+```bash
+thothctl check project iac -p stack --skip-org-policy
+```
+
+This is useful for:
+- Experimental/prototype projects not yet conforming to standards
+- Legacy projects with approved exceptions
+- Third-party imported projects
+
 ### How It Works
 
-1. Set `THOTH_ORG_POLICY` to your org policy Git repo (or pass `--org-policy`)
+1. ThothCTL resolves the policy source (see resolution order above)
 2. The repo contains `rules/base.toml` + `rules/<project_type>.toml`
 3. ThothCTL merges org rules with project rules — **mandatory org rules cannot be weakened**
 4. Violations are reported with enforcement level (mandatory = fail, recommended = warn)
@@ -36,7 +80,11 @@ ThothCTL can enforce organizational standards that projects **cannot override**.
 ### Usage
 
 ```bash
-# Via env var (CI/CD recommended)
+# Automatic via active space (preferred)
+thothctl space activate platform-team
+thothctl check project iac --enforcement hard
+
+# Via env var (CI/CD)
 export THOTH_ORG_POLICY=https://github.com/myorg/org-policies.git
 thothctl check project iac --enforcement hard
 
@@ -44,11 +92,8 @@ thothctl check project iac --enforcement hard
 export THOTH_ORG_POLICY=https://github.com/myorg/org-policies.git@v1.0
 thothctl check project iac --enforcement hard
 
-# Via flag
+# Via flag (explicit override)
 thothctl check project iac --org-policy /path/to/org-policies --enforcement hard
-
-# Local path (development)
-thothctl check project iac --org-policy ../org-iac-policies
 ```
 
 ### Enforcement Levels

{thothctl-0.18.2 → thothctl-0.18.4}/docs/framework/space_configuration.md

@@ -111,8 +111,16 @@ Update an existing space's configuration:
 
 ```bash
 thothctl space update my-space --vcs-provider github --orchestration-tool terragrunt
+thothctl space update my-space --policy-repo https://github.com/myorg/iac-policies.git
 ```
 
+Available options:
+- `-d, --description` — New description
+- `-vcs, --vcs-provider` — Version control provider (`azure_repos`, `github`, `gitlab`)
+- `-ot, --orchestration-tool` — Orchestration tool (`terragrunt`, `terramate`, `none`)
+- `-tr, --terraform-registry` — Terraform registry URL
+- `-pr, --policy-repo` — Git repository URL or local path for organization-level IaC policies
+
 ### Deleting a Space
 
 You can delete a space using the `thothctl remove space` command:

{thothctl-0.18.2 → thothctl-0.18.4}/docs/framework/use_cases/space_management.md

@@ -68,6 +68,29 @@ Usage: thothctl space show SPACE_NAME
   Show space configuration summary
 ```
 
+### Update Space Configuration
+
+```
+Usage: thothctl space update SPACE_NAME [OPTIONS]
+
+  Update an existing space's configuration
+
+Options:
+  -d, --description TEXT          New description for the space
+  -vcs, --vcs-provider [azure_repos|github|gitlab]
+  -ot, --orchestration-tool [terragrunt|terramate|none]
+  -tr, --terraform-registry TEXT  Terraform registry URL
+  -pr, --policy-repo TEXT         Git URL or path for IaC policies
+```
+
+### Activate a Space
+
+```
+Usage: thothctl space activate SPACE_NAME
+
+  Set a space as the active context
+```
+
 ### List Projects with Space Information
 
 ```

{thothctl-0.18.2 → thothctl-0.18.4}/src/thothctl/commands/check/commands/project/iac.py

@@ -188,7 +188,7 @@ class CheckProjectIaCCommand(ClickCommand):
         
         try:
             # Run org policy check if source is provided
-            org_violations = self._check_org_policy(directory, project_type, org_policy)
+            org_violations = self._check_org_policy(directory, project_type, org_policy, skip_org=kwargs.get('skip_org_policy', False))
 
             # Capture stdout to format it nicely
             captured_output = io.StringIO()
@@ -245,8 +245,12 @@ class CheckProjectIaCCommand(ClickCommand):
             self.logger.error(f"Failed to execute IaC project check: {str(e)}")
             raise
 
-    def _check_org_policy(self, directory: str, project_type: str, org_policy=None):
+    def _check_org_policy(self, directory: str, project_type: str, org_policy=None, skip_org: bool = False):
         """Check project against organizational policy if available."""
+        if skip_org:
+            self.console.print("[dim]📜 Org policy check skipped (--skip-org-policy)[/dim]")
+            return None
+
         from .....services.check.org_policy_loader import get_org_policy_path, resolve_rules_dir
         from .....services.check.rule_merger import load_org_rules, merge_with_project, evaluate
 
@@ -355,4 +359,10 @@ cli = CheckProjectIaCCommand.as_click_command(
         type=click.Choice(["soft", "hard"], case_sensitive=False),
         default="soft",
     ),
+    click.option(
+        "--skip-org-policy",
+        is_flag=True,
+        default=False,
+        help="Skip organizational policy check (use when project has explicit exceptions)",
+    ),
 )

{thothctl-0.18.2 → thothctl-0.18.4}/src/thothctl/commands/inventory/commands/iac.py

@@ -52,6 +52,7 @@ class IaCInvCommand(ClickCommand):
         framework_type: str = "auto",
         complete: bool = False,
         check_providers: bool = False,
+        check_provider_versions: bool = False,
         check_schema_compatibility: bool = False,
         provider_tool: str = "tofu",
         project_name: Optional[str] = None,
@@ -101,7 +102,7 @@ class IaCInvCommand(ClickCommand):
                         framework_type=framework_type,
                         complete=complete,
                         check_providers=check_providers,
-                        check_provider_versions=check_versions,  # Use unified flag for provider versions too
+                        check_provider_versions=check_provider_versions,
                         check_schema_compatibility=check_schema_compatibility,
                         provider_tool=provider_tool,
                         project_name=project_name,
@@ -181,8 +182,8 @@ class IaCInvCommand(ClickCommand):
                 self.ui.print_info("🔍 Schema compatibility analysis enabled - this may take additional time")
             
             with self.ui.status_spinner("Creating infrastructure inventory..."):
-                # When check_versions is enabled, automatically enable provider checking
-                effective_check_providers = check_providers or check_versions
+                # Enable provider checking if provider versions are requested
+                effective_check_providers = check_providers or check_provider_versions
                 
                 inventory = await self.inventory_service.create_inventory(
                     source_directory=source_dir,
@@ -192,7 +193,7 @@ class IaCInvCommand(ClickCommand):
                     framework_type=framework_type,
                     complete=complete,
                     check_providers=effective_check_providers,
-                    check_provider_versions=check_versions,
+                    check_provider_versions=check_provider_versions,
                     check_schema_compatibility=check_schema_compatibility,
                     provider_tool=provider_tool,
                     project_name=project_name,
@@ -510,7 +511,7 @@ cli = IaCInvCommand.as_click_command(
         "--check-versions",
         is_flag=True,
         default=False,
-        help="Check latest versions for modules and providers (includes provider version checking)",
+        help="Check latest versions for modules",
     ),
     click.option(
         "-updep",
@@ -557,7 +558,14 @@ cli = IaCInvCommand.as_click_command(
         "--check-providers",
         is_flag=True,
         default=False,
-        help="Check and report provider information for each stack (automatically enabled with --check-versions)",
+        help="Check and report provider information for each stack",
+    ),
+    click.option(
+        "--check-provider-versions",
+        "-cpv",
+        is_flag=True,
+        default=False,
+        help="Check latest versions for providers (can be used independently or with --check-versions)",
     ),
     click.option(
         "--check-schema-compatibility",

{thothctl-0.18.2 → thothctl-0.18.4}/src/thothctl/services/check/org_policy_loader.py

@@ -16,12 +16,17 @@ def get_org_policy_path(org_policy: Optional[str] = None) -> Optional[str]:
     Resolution:
         1. Explicit --org-policy argument
         2. THOTH_ORG_POLICY env var
-        3. None (no org policy)
+        3. Active space's governance.policy_repo
+        4. None (no org policy)
 
     Returns:
         Absolute path to cached org policy repo, or None.
     """
     source = org_policy or os.environ.get("THOTH_ORG_POLICY")
+
+    if not source:
+        source = _get_active_space_policy_repo()
+
     if not source:
         return None
 
@@ -36,6 +41,33 @@ def get_org_policy_path(org_policy: Optional[str] = None) -> Optional[str]:
     return None
 
 
+def _get_active_space_policy_repo() -> Optional[str]:
+    """Load policy_repo from the active space configuration."""
+    try:
+        import toml
+
+        active_file = Path.home() / ".thothcf" / "active_space"
+        if not active_file.exists():
+            return None
+
+        space_name = active_file.read_text(encoding="utf-8").strip()
+        if not space_name:
+            return None
+
+        config_path = Path.home() / ".thothcf" / "spaces.toml"
+        if not config_path.exists():
+            return None
+
+        config = toml.load(config_path)
+        space = config.get("spaces", {}).get(space_name, {})
+        policy_repo = space.get("governance", {}).get("policy_repo", "")
+
+        return policy_repo if policy_repo else None
+    except Exception as e:
+        logger.debug(f"Failed to load active space policy repo: {e}")
+        return None
+
+
 def resolve_rules_dir(org_path: str) -> Optional[str]:
     """Get the rules/ directory from an org policy repo."""
     rules_dir = os.path.join(org_path, "rules")

thothctl-0.18.4/src/thothctl/version.py

@@ -0,0 +1,2 @@
+"""Version module."""
+__version__ = "0.18.4"

thothctl-0.18.2/src/thothctl/version.py

@@ -1,2 +0,0 @@
-"""Version module."""
-__version__ = "0.18.2"