runbooks 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

runbooks/vpc/config.py

@@ -81,24 +81,33 @@ class AWSCostModel:
     
     @staticmethod
     def _get_nat_gateway_hourly() -> float:
-        """Get NAT Gateway hourly cost from AWS Pricing API with universal compatibility."""
+        """Get NAT Gateway hourly cost from AWS Pricing API with enhanced enterprise fallback."""
         if AWS_PRICING_AVAILABLE:
             try:
-                return pricing_api.get_nat_gateway_monthly_cost() / (24 * 30)
-            except Exception:
-                pass
+                # Use enhanced pricing API with regional fallback and graceful degradation
+                current_region = os.getenv('AWS_DEFAULT_REGION', 'us-east-1')
+                monthly_cost = pricing_api.get_nat_gateway_monthly_cost(current_region)
+                return monthly_cost / (24 * 30)
+            except Exception as e:
+                print(f"⚠️ NAT Gateway pricing API fallback: {e}")
+        
         # Universal compatibility: standard AWS pricing when API unavailable
+        print("ℹ️ Using universal compatibility NAT Gateway rate")
         return 0.045  # AWS standard NAT Gateway hourly rate
     
     @staticmethod
     def _get_nat_gateway_monthly() -> float:
-        """Get NAT Gateway monthly cost from AWS Pricing API with universal compatibility."""
+        """Get NAT Gateway monthly cost from AWS Pricing API with enhanced enterprise fallback."""
         if AWS_PRICING_AVAILABLE:
             try:
-                return pricing_api.get_nat_gateway_monthly_cost()
-            except Exception:
-                pass
+                # Use enhanced pricing API with regional fallback and graceful degradation
+                current_region = os.getenv('AWS_DEFAULT_REGION', 'us-east-1')
+                return pricing_api.get_nat_gateway_monthly_cost(current_region)
+            except Exception as e:
+                print(f"⚠️ NAT Gateway monthly pricing API fallback: {e}")
+        
         # Universal compatibility: calculate from hourly rate
+        print("ℹ️ Calculating monthly cost from universal compatibility hourly rate")
         return AWSCostModel._get_nat_gateway_hourly() * 24 * 30
     
     @staticmethod
@@ -388,11 +397,29 @@ class VPCNetworkingConfig:
             return default_value
         return int(value)
 
-    # AWS Profiles
-    billing_profile: Optional[str] = field(default_factory=lambda: os.getenv("BILLING_PROFILE"))
-    centralized_ops_profile: Optional[str] = field(default_factory=lambda: os.getenv("CENTRALIZED_OPS_PROFILE"))
-    single_account_profile: Optional[str] = field(default_factory=lambda: os.getenv("SINGLE_ACCOUNT_PROFILE"))
-    management_profile: Optional[str] = field(default_factory=lambda: os.getenv("MANAGEMENT_PROFILE"))
+    # AWS Profiles - Universal compatibility with fallback to AWS_PROFILE or 'default'
+    billing_profile: Optional[str] = field(default_factory=lambda: (
+        os.getenv("BILLING_PROFILE") or 
+        os.getenv("AWS_PROFILE") or 
+        "default"
+    ))
+    centralized_ops_profile: Optional[str] = field(default_factory=lambda: (
+        os.getenv("CENTRALIZED_OPS_PROFILE") or 
+        os.getenv("CENTRALISED_OPS_PROFILE") or  # Alternative spelling
+        os.getenv("AWS_PROFILE") or 
+        "default"
+    ))
+    single_account_profile: Optional[str] = field(default_factory=lambda: (
+        os.getenv("SINGLE_ACCOUNT_PROFILE") or 
+        os.getenv("SINGLE_AWS_PROFILE") or  # Alternative naming
+        os.getenv("AWS_PROFILE") or 
+        "default"
+    ))
+    management_profile: Optional[str] = field(default_factory=lambda: (
+        os.getenv("MANAGEMENT_PROFILE") or 
+        os.getenv("AWS_PROFILE") or 
+        "default"
+    ))
 
     # Analysis Configuration - ENTERPRISE COMPLIANCE: No hardcoded defaults
     default_analysis_days: int = field(default_factory=lambda: VPCNetworkingConfig._get_required_env_int("DEFAULT_ANALYSIS_DAYS"))
@@ -445,8 +472,15 @@ def load_config(config_file: Optional[str] = None) -> VPCNetworkingConfig:
 
     # Validate configuration only in production (not during testing)
     is_testing = os.getenv("PYTEST_CURRENT_TEST") is not None or "pytest" in os.environ.get("_", "")
-    if not is_testing and config.enable_cost_approval_workflow and not config.billing_profile:
-        raise ValueError("BILLING_PROFILE required when cost approval workflow is enabled")
+    if not is_testing and config.enable_cost_approval_workflow:
+        # Universal compatibility - warn instead of failing
+        if not config.billing_profile or config.billing_profile == "default":
+            import warnings
+            warnings.warn(
+                "Cost approval workflow enabled but no specific BILLING_PROFILE set. "
+                "Using default profile. Set BILLING_PROFILE for enterprise multi-account setup.",
+                UserWarning
+            )
 
     return config
 

runbooks/vpc/cross_account_session.py

@@ -188,12 +188,16 @@ class CrossAccountSessionManager:
         account_id = account["id"]
         account_name = account.get("name", f"Account-{account_id}")
         
-        # Try multiple role patterns for different organization setups
+        # Try multiple role patterns for different organization setups - universal compatibility
         role_patterns = [
             self.role_name,  # Default: OrganizationAccountAccessRole
             "AWSControlTowerExecution",  # Control Tower pattern
             "OrganizationAccountAccess",  # Alternative naming
             "ReadOnlyAccess",  # Fallback for read-only operations
+            "PowerUserAccess",  # Common enterprise role
+            "AdminRole",  # Common enterprise role
+            "CrossAccountRole",  # Generic cross-account role
+            "AssumeRole",  # Generic assume role
         ]
         
         for role_name in role_patterns: