runbooks 1.1.3__py3-none-any.whl → 1.1.5__py3-none-any.whl

runbooks/operate/mcp_integration.py

@@ -681,7 +681,7 @@ class MCPIntegrationEngine:
                 "body": self._generate_github_issue_body(deployment_plan),
                 "labels": ["deployment", "production", "cost-optimization", "terminal-5"],
                 "assignees": ["deploy-agent"],
-                "milestone": "Sprint 2 - Cost Optimization",
+                "milestone": "Phase 2 - Cost Optimization",
             }
 
             server_config = self.mcp_servers["github"]

runbooks/operate/networking_cost_heatmap.py

@@ -33,6 +33,7 @@ import pandas as pd
 from botocore.exceptions import ClientError, NoCredentialsError
 
 from ..base import BaseOperation, OperationResult
+from ..common.aws_profile_manager import AWSProfileManager, get_current_account_id
 
 logger = logging.getLogger(__name__)
 
@@ -42,10 +43,19 @@ class NetworkingCostHeatMapConfig:
     """Configuration for networking cost heat map generation"""
 
     # AWS Profiles (READ-ONLY) - Universal environment support using proven profile pattern
-    billing_profile: str = field(default_factory=lambda: os.getenv("AWS_BILLING_PROFILE") or os.getenv("BILLING_PROFILE", "default"))
-    centralized_ops_profile: str = field(default_factory=lambda: os.getenv("AWS_CENTRALISED_OPS_PROFILE") or os.getenv("CENTRALISED_OPS_PROFILE", "default"))
-    single_account_profile: str = field(default_factory=lambda: os.getenv("AWS_SINGLE_ACCOUNT_PROFILE") or os.getenv("SINGLE_AWS_PROFILE", "default"))
-    management_profile: str = field(default_factory=lambda: os.getenv("AWS_MANAGEMENT_PROFILE") or os.getenv("MANAGEMENT_PROFILE", "default"))
+    billing_profile: str = field(
+        default_factory=lambda: os.getenv("AWS_BILLING_PROFILE") or os.getenv("BILLING_PROFILE", "default")
+    )
+    centralized_ops_profile: str = field(
+        default_factory=lambda: os.getenv("AWS_CENTRALISED_OPS_PROFILE")
+        or os.getenv("CENTRALISED_OPS_PROFILE", "default")
+    )
+    single_account_profile: str = field(
+        default_factory=lambda: os.getenv("AWS_SINGLE_ACCOUNT_PROFILE") or os.getenv("SINGLE_AWS_PROFILE", "default")
+    )
+    management_profile: str = field(
+        default_factory=lambda: os.getenv("AWS_MANAGEMENT_PROFILE") or os.getenv("MANAGEMENT_PROFILE", "default")
+    )
 
     # Analysis parameters
     regions: List[str] = field(
@@ -217,8 +227,9 @@ class NetworkingCostHeatMapOperation(BaseOperation):
     def _generate_single_account_heat_map(self) -> Dict:
         """Generate single account heat map"""
 
-        # Use environment-driven account ID for universal compatibility
-        account_id = os.getenv("AWS_ACCOUNT_ID", "123456789012")
+        # Use dynamic account ID resolution for universal compatibility
+        profile_manager = AWSProfileManager(self.config.single_account_profile)
+        account_id = profile_manager.get_account_id()
 
         if self._cost_explorer_available():
             return self._get_real_account_costs(account_id)
@@ -236,10 +247,22 @@ class NetworkingCostHeatMapOperation(BaseOperation):
 
         # Account categories for realistic distribution - dynamic from environment
         account_categories = {
-            "production": {"count": int(os.getenv("AWS_PROD_ACCOUNTS", "15")), "cost_multiplier": float(os.getenv("PROD_COST_MULTIPLIER", "5.0"))},
-            "staging": {"count": int(os.getenv("AWS_STAGING_ACCOUNTS", "15")), "cost_multiplier": float(os.getenv("STAGING_COST_MULTIPLIER", "2.0"))},
-            "development": {"count": int(os.getenv("AWS_DEV_ACCOUNTS", "20")), "cost_multiplier": float(os.getenv("DEV_COST_MULTIPLIER", "1.0"))},
-            "sandbox": {"count": int(os.getenv("AWS_SANDBOX_ACCOUNTS", "10")), "cost_multiplier": float(os.getenv("SANDBOX_COST_MULTIPLIER", "0.3"))},
+            "production": {
+                "count": int(os.getenv("AWS_PROD_ACCOUNTS", "15")),
+                "cost_multiplier": float(os.getenv("PROD_COST_MULTIPLIER", "5.0")),
+            },
+            "staging": {
+                "count": int(os.getenv("AWS_STAGING_ACCOUNTS", "15")),
+                "cost_multiplier": float(os.getenv("STAGING_COST_MULTIPLIER", "2.0")),
+            },
+            "development": {
+                "count": int(os.getenv("AWS_DEV_ACCOUNTS", "20")),
+                "cost_multiplier": float(os.getenv("DEV_COST_MULTIPLIER", "1.0")),
+            },
+            "sandbox": {
+                "count": int(os.getenv("AWS_SANDBOX_ACCOUNTS", "10")),
+                "cost_multiplier": float(os.getenv("SANDBOX_COST_MULTIPLIER", "0.3")),
+            },
         }
 
         # Generate aggregated heat map

runbooks/operate/privatelink_operations.py

@@ -20,7 +20,7 @@ Features:
 
 Author: CloudOps Runbooks Team
 Version: 0.7.8
-Enhanced for Sprint 2 VPC Scope Expansion with PrivateLink
+Enhanced for Phase 2 VPC Scope Expansion with PrivateLink
 """
 
 import json