cloudwire 0.2.12__tar.gz → 0.2.13__tar.gz

{cloudwire-0.2.12 → cloudwire-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudwire
-Version: 0.2.12
+Version: 0.2.13
 Summary: Scan and visualize your AWS infrastructure as an interactive graph
 License: MIT
 Project-URL: Homepage, https://github.com/Himanshu-370/cloudwire
@@ -24,21 +24,20 @@ Classifier: Topic :: System :: Systems Administration
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: fastapi>=0.100
+Requires-Dist: uvicorn>=0.20
+Requires-Dist: boto3>=1.26
+Requires-Dist: botocore>=1.29
+Requires-Dist: networkx>=2.6
+Requires-Dist: pydantic>=2.0
+Requires-Dist: click>=8.0
+Requires-Dist: python-multipart>=0.0.5
+Requires-Dist: python-hcl2>=4.3
 Provides-Extra: dev
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: ruff>=0.4; extra == "dev"
 Requires-Dist: mypy>=1.0; extra == "dev"
-Provides-Extra: dependencies
-Requires-Dist: fastapi>=0.100; extra == "dependencies"
-Requires-Dist: uvicorn>=0.20; extra == "dependencies"
-Requires-Dist: boto3>=1.26; extra == "dependencies"
-Requires-Dist: botocore>=1.29; extra == "dependencies"
-Requires-Dist: networkx>=2.6; extra == "dependencies"
-Requires-Dist: pydantic>=2.0; extra == "dependencies"
-Requires-Dist: click>=8.0; extra == "dependencies"
-Requires-Dist: python-multipart>=0.0.5; extra == "dependencies"
-Requires-Dist: python-hcl2>=4.3; extra == "dependencies"
 
 # CloudWire
 

{cloudwire-0.2.12 → cloudwire-0.2.13}/cloudwire/__init__.py

@@ -5,4 +5,4 @@ from importlib.metadata import version, PackageNotFoundError
 try:
     __version__ = version("cloudwire")
 except PackageNotFoundError:
-    __version__ = "0.2.12"  # fallback when running from source without pip install
+    __version__ = "0.2.13"  # fallback when running from source without pip install

{cloudwire-0.2.12 → cloudwire-0.2.13}/cloudwire/app/errors.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Dict, Optional
+from typing import Any, Dict, NoReturn, Optional
 
 from botocore.exceptions import (
     BotoCoreError,
@@ -63,8 +63,8 @@ def friendly_exception_message(exc: Exception) -> str:
     return "Unexpected server error."
 
 
-def handle_tagging_error(exc: Exception, region: str, operation: str):
-    """Convert AWS errors from tagging API to APIError."""
+def handle_tagging_error(exc: Exception, region: str, operation: str) -> NoReturn:
+    """Convert AWS errors from tagging API to APIError. Always raises."""
     from fastapi import status
 
     logger.warning("Tag API error in %s (region=%s): %s: %s", operation, region, type(exc).__name__, exc)

{cloudwire-0.2.12 → cloudwire-0.2.13}/cloudwire/app/graph_store.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import copy
 import logging
 from datetime import datetime, timezone
 from threading import Lock
@@ -73,9 +74,14 @@ class GraphStore:
         return payload
 
     def get_graph_payload(self) -> Dict[str, Any]:
+        """Return a deep copy of the cached graph payload.
+
+        The internal cache is never exposed directly — callers receive an
+        independent copy they can safely mutate without corrupting the cache.
+        """
         with self._lock:
             if self._cached_payload is not None:
-                return self._cached_payload
+                return copy.deepcopy(self._cached_payload)
             nodes = [self._serialize_node(node_id, attrs) for node_id, attrs in self.graph.nodes(data=True)]
             edges = [
                 self._serialize_edge(source, target, attrs)
@@ -86,7 +92,7 @@ class GraphStore:
             metadata["edge_count"] = len(edges)
             payload = {"nodes": nodes, "edges": edges, "metadata": metadata}
             self._cached_payload = payload
-            return payload
+            return copy.deepcopy(payload)
 
     def iter_nodes_by_service(self, service: str) -> List[Tuple[str, Dict[str, Any]]]:
         """Return a snapshot of (node_id, attrs_copy) pairs for a given service."""

{cloudwire-0.2.12 → cloudwire-0.2.13}/cloudwire/app/main.py

@@ -83,6 +83,8 @@ class SecurityHeadersMiddleware(BaseHTTPMiddleware):
         response = await call_next(request)
         response.headers["X-Content-Type-Options"] = "nosniff"
         response.headers["X-Frame-Options"] = "DENY"
+        # 'unsafe-inline' for styles is required by the React/Tailwind frontend.
+        # Acceptable for a localhost-only tool with no user-generated content.
         response.headers["Content-Security-Policy"] = "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline';"
         response.headers["Referrer-Policy"] = "strict-origin-when-cross-origin"
         return response

{cloudwire-0.2.12 → cloudwire-0.2.13}/cloudwire/app/scan_jobs.py

@@ -355,7 +355,9 @@ class ScanJobStore:
                 "finished_at": job.finished_at,
                 "error": job.error,
             }
-            graph_store = job.graph_store
+            graph_store = job.graph_store  # stable reference, set at construction and never reassigned
+        # Called outside the job store lock to avoid holding it during serialization.
+        # Thread-safe because GraphStore has its own internal lock.
         graph_payload = graph_store.get_graph_payload()
         metadata = graph_payload.get("metadata", {})
         return {

{cloudwire-0.2.12 → cloudwire-0.2.13}/cloudwire/app/scanner.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import json
 import logging
-import re
 from concurrent.futures import FIRST_COMPLETED, Future, ThreadPoolExecutor, wait
 from dataclasses import dataclass
 from threading import Lock
@@ -51,9 +50,6 @@ def _sanitize_exc(exc: Exception) -> str:
 from .scanners._utils import _safe_list
 
 
-_ARN_PATTERN = re.compile(r"^arn:aws:[a-z0-9-]+:")
-
-
 @dataclass
 class ScanExecutionOptions:
     mode: ScanMode = "quick"
@@ -679,7 +675,9 @@ class AWSGraphScanner(
 
         # Infer parent→child edges from ARN hierarchy.
         # E.g., arn:...:cluster/j-ABC is parent of arn:...:cluster/j-ABC/step/s-DEF
-        if len(discovered_arns) > 1:
+        # Capped at 1000 ARNs to avoid O(n²) blowup with large resource sets.
+        _MAX_ARNS_FOR_HIERARCHY = 1000
+        if 1 < len(discovered_arns) <= _MAX_ARNS_FOR_HIERARCHY:
             sorted_arns = sorted(discovered_arns)
             for i, arn in enumerate(sorted_arns):
                 for j in range(i + 1, len(sorted_arns)):
@@ -693,6 +691,9 @@ class AWSGraphScanner(
                     elif not candidate.startswith(arn[:arn.rfind("/") + 1] if "/" in arn else arn[:arn.rfind(":") + 1]):
                         # No more potential children — different prefix
                         break
+        elif len(discovered_arns) > _MAX_ARNS_FOR_HIERARCHY:
+            logger.info("%s: skipping ARN hierarchy inference (%d ARNs exceeds cap of %d)",
+                        service_name, len(discovered_arns), _MAX_ARNS_FOR_HIERARCHY)
 
         discovered = len(discovered_arns)
         if discovered == 0:

{cloudwire-0.2.12 → cloudwire-0.2.13}/cloudwire/cli.py

@@ -3,12 +3,11 @@
 from __future__ import annotations
 
 import os
-import socket
 import sys
 import threading
 import webbrowser
 
-_REQUIRED_PACKAGES = ["click", "uvicorn", "fastapi", "boto3", "pydantic", "networkx"]
+_REQUIRED_PACKAGES = ["click", "uvicorn", "fastapi", "boto3", "pydantic", "networkx", "multipart", "hcl2"]
 
 
 def _check_dependencies() -> None:
@@ -40,17 +39,6 @@ import uvicorn  # noqa: E402
 from . import __version__  # noqa: E402
 
 
-def _port_is_available(host: str, port: int) -> bool:
-    """Return True if the port is free to bind on the given host."""
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        try:
-            sock.bind((host, port))
-            return True
-        except OSError:
-            return False
-
-
 def _check_for_update(current: str, result: list) -> None:
     """Fetch the latest version from PyPI and store it in result[0]. Runs in a background thread."""
     try:
@@ -109,12 +97,6 @@ def main(port: int, host: str, profile: str | None, region: str, no_browser: boo
     # Only set region if not already in environment
     os.environ.setdefault("AWS_DEFAULT_REGION", region)
 
-    # Port conflict check — fail fast with a clear message
-    if not _port_is_available(host, port):
-        raise click.ClickException(
-            f"Port {port} is already in use. Try a different port with --port <number>."
-        )
-
     # Start background version check — finishes before uvicorn prints its own output
     _update_result: list = []
     _update_thread = threading.Thread(

{cloudwire-0.2.12 → cloudwire-0.2.13}/cloudwire.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudwire
-Version: 0.2.12
+Version: 0.2.13
 Summary: Scan and visualize your AWS infrastructure as an interactive graph
 License: MIT
 Project-URL: Homepage, https://github.com/Himanshu-370/cloudwire
@@ -24,21 +24,20 @@ Classifier: Topic :: System :: Systems Administration
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: fastapi>=0.100
+Requires-Dist: uvicorn>=0.20
+Requires-Dist: boto3>=1.26
+Requires-Dist: botocore>=1.29
+Requires-Dist: networkx>=2.6
+Requires-Dist: pydantic>=2.0
+Requires-Dist: click>=8.0
+Requires-Dist: python-multipart>=0.0.5
+Requires-Dist: python-hcl2>=4.3
 Provides-Extra: dev
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: ruff>=0.4; extra == "dev"
 Requires-Dist: mypy>=1.0; extra == "dev"
-Provides-Extra: dependencies
-Requires-Dist: fastapi>=0.100; extra == "dependencies"
-Requires-Dist: uvicorn>=0.20; extra == "dependencies"
-Requires-Dist: boto3>=1.26; extra == "dependencies"
-Requires-Dist: botocore>=1.29; extra == "dependencies"
-Requires-Dist: networkx>=2.6; extra == "dependencies"
-Requires-Dist: pydantic>=2.0; extra == "dependencies"
-Requires-Dist: click>=8.0; extra == "dependencies"
-Requires-Dist: python-multipart>=0.0.5; extra == "dependencies"
-Requires-Dist: python-hcl2>=4.3; extra == "dependencies"
 
 # CloudWire
 

{cloudwire-0.2.12 → cloudwire-0.2.13}/cloudwire.egg-info/requires.txt

@@ -1,5 +1,3 @@
-
-[dependencies]
 fastapi>=0.100
 uvicorn>=0.20
 boto3>=1.26

{cloudwire-0.2.12 → cloudwire-0.2.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cloudwire"
-version = "0.2.12"
+version = "0.2.13"
 description = "Scan and visualize your AWS infrastructure as an interactive graph"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -25,9 +25,6 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: System :: Systems Administration",
 ]
-[project.optional-dependencies]
-dev = ["twine", "build", "ruff>=0.4", "mypy>=1.0"]
-
 dependencies = [
     "fastapi>=0.100",
     "uvicorn>=0.20",
@@ -40,6 +37,9 @@ dependencies = [
     "python-hcl2>=4.3",
 ]
 
+[project.optional-dependencies]
+dev = ["twine", "build", "ruff>=0.4", "mypy>=1.0"]
+
 [project.scripts]
 cloudwire = "cloudwire.cli:main"