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

runbooks/finops/tests/test_finops_dashboard.py

@@ -45,9 +45,9 @@ class TestFinOpsConfig:
         config = FinOpsConfig()
 
         # Test default profile values
-        assert config.billing_profile == "ams-admin-Billing-ReadOnlyAccess-909135376185"
-        assert config.management_profile == "ams-admin-ReadOnlyAccess-909135376185"
-        assert config.operational_profile == "ams-centralised-ops-ReadOnlyAccess-335083429030"
+        assert config.billing_profile == "${BILLING_PROFILE}"
+        assert config.management_profile == "${MANAGEMENT_PROFILE}"
+        assert config.operational_profile == "${CENTRALISED_OPS_PROFILE}"
 
         # Test analysis parameters
         assert config.time_range_days == 30

runbooks/finops/tests/test_reference_images_validation.py

@@ -582,8 +582,8 @@ class TestReferenceImage5_ExportIntegration:
             "status": "completed",
             "available_profiles": ["profile1", "profile2"],
             "configured_profiles": {
-                "billing": "ams-admin-Billing-ReadOnlyAccess-909135376185",
-                "management": "ams-admin-ReadOnlyAccess-909135376185",
+                "billing": "${BILLING_PROFILE}",
+                "management": "${MANAGEMENT_PROFILE}",
             },
         }
 

runbooks/finops/tests/test_single_account_features.py

@@ -3,7 +3,7 @@
 Single Account FinOps Features Test Suite - Definition of Done Validation.
 
 This test suite validates the 5 key features for single account analysis
-using REAL AWS data for account 499201730520 (ams-shared-services-non-prod).
+using REAL AWS data for account ${ACCOUNT_ID} (ams-shared-services-non-prod).
 
 Purpose: Ensure comprehensive functionality validation against manager requirements.
 
@@ -16,7 +16,7 @@ Test Cases:
 
 Author: CloudOps Runbooks Team
 Version: 0.7.8 - Single Account Focus
-Target: Account 499201730520 (ams-shared-services-non-prod-ReadOnlyAccess)
+Target: Account ${ACCOUNT_ID} (ams-shared-services-non-prod-ReadOnlyAccess)
 """
 
 import json
@@ -30,9 +30,9 @@ import boto3
 import pytest
 
 # Set environment for single account testing
-os.environ["SINGLE_AWS_PROFILE"] = "ams-shared-services-non-prod-ReadOnlyAccess-499201730520"
+os.environ["SINGLE_AWS_PROFILE"] = "${SINGLE_AWS_PROFILE}"
 os.environ["AWS_PROFILE"] = os.environ["SINGLE_AWS_PROFILE"]
-os.environ["BILLING_PROFILE"] = "ams-admin-Billing-ReadOnlyAccess-909135376185"
+os.environ["BILLING_PROFILE"] = "${BILLING_PROFILE}"
 
 # Import FinOps components for testing
 from runbooks.finops.finops_dashboard import (
@@ -53,10 +53,10 @@ class SingleAccountFinOpsConfig(FinOpsConfig):
         super().__init__()
 
         # Override for single account operation
-        self.target_account = "ams-shared-services-non-prod-ReadOnlyAccess-499201730520"
+        self.target_account = "${SINGLE_AWS_PROFILE}"
 
         # Single account configuration
-        self.billing_profile = os.environ.get("BILLING_PROFILE", "ams-admin-Billing-ReadOnlyAccess-909135376185")
+        self.billing_profile = os.environ.get("BILLING_PROFILE", "${BILLING_PROFILE}")
         self.management_profile = self.target_account
         self.operational_profile = self.target_account
 
@@ -67,7 +67,7 @@ class SingleAccountFinOpsConfig(FinOpsConfig):
 
         # Single account specific settings
         self.single_account_mode = True
-        self.account_id = "499201730520"  # Extracted from profile name
+        self.account_id = "${ACCOUNT_ID}"  # Extracted from profile name
 
 
 class TestSingleAccountFeature1_CostTrendAnalysis:
@@ -75,7 +75,7 @@ class TestSingleAccountFeature1_CostTrendAnalysis:
     Feature 1: Single Account Cost Trend Analysis with Real AWS Data.
 
     Validates cost analysis functionality using real AWS Cost Explorer
-    for account 499201730520 with billing profile access.
+    for account ${ACCOUNT_ID} with billing profile access.
     """
 
     @pytest.fixture
@@ -211,7 +211,7 @@ class TestSingleAccountFeature2_ResourceUtilizationHeatmap:
     Feature 2: Single Account Resource Utilization Heatmap with Real AWS Data.
 
     Validates resource utilization analysis using real EC2, RDS, S3 data
-    for account 499201730520 with efficiency scoring and rightsizing.
+    for account ${ACCOUNT_ID} with efficiency scoring and rightsizing.
     """
 
     @pytest.fixture
@@ -374,7 +374,7 @@ class TestSingleAccountFeature3_ComplianceDashboard:
     Feature 3: Single Account Compliance Dashboard with Real AWS Config Data.
 
     Validates compliance audit functionality using real AWS Config
-    for account 499201730520 with risk assessment and findings.
+    for account ${ACCOUNT_ID} with risk assessment and findings.
     """
 
     @pytest.fixture
@@ -527,7 +527,7 @@ class TestSingleAccountFeature4_RightsizingRecommendations:
     Feature 4: Single Account Rightsizing Recommendations with Real CloudWatch Metrics.
 
     Validates rightsizing functionality using real CloudWatch data
-    for account 499201730520 with cost optimization recommendations.
+    for account ${ACCOUNT_ID} with cost optimization recommendations.
     """
 
     def test_rightsizing_with_real_metrics(self):
@@ -565,7 +565,7 @@ class TestSingleAccountFeature5_ExecutiveSummary:
     Feature 5: Single Account Executive Summary with Real Aggregated Data.
 
     Validates executive dashboard functionality combining all real data sources
-    for account 499201730520 with C-suite presentation format.
+    for account ${ACCOUNT_ID} with C-suite presentation format.
     """
 
     def test_executive_summary_with_real_data(self):
@@ -629,15 +629,15 @@ class TestSingleAccountNotebookIntegration:
     def test_notebook_environment_setup(self):
         """Test notebook environment is properly configured."""
         # Verify environment variables
-        assert os.environ.get("SINGLE_AWS_PROFILE") == "ams-shared-services-non-prod-ReadOnlyAccess-499201730520"
-        assert os.environ.get("BILLING_PROFILE") == "ams-admin-Billing-ReadOnlyAccess-909135376185"
+        assert os.environ.get("SINGLE_AWS_PROFILE") == "${SINGLE_AWS_PROFILE}"
+        assert os.environ.get("BILLING_PROFILE") == "${BILLING_PROFILE}"
 
         # Verify AWS connectivity
         try:
             session = boto3.Session(profile_name=os.environ["BILLING_PROFILE"])
             sts = session.client("sts")
             identity = sts.get_caller_identity()
-            assert identity["Account"] == "909135376185"  # Billing account
+            assert identity["Account"] == "${BILLING_ACCOUNT_ID}"  # Billing account
 
             print("✅ Notebook environment properly configured")
 
@@ -650,8 +650,8 @@ class TestSingleAccountNotebookIntegration:
 
         # Validate single account configuration
         assert config.single_account_mode is True
-        assert config.account_id == "499201730520"
-        assert config.target_account == "ams-shared-services-non-prod-ReadOnlyAccess-499201730520"
+        assert config.account_id == "${ACCOUNT_ID}"
+        assert config.target_account == "${SINGLE_AWS_PROFILE}"
         assert config.min_account_threshold == 1
         assert config.enable_cross_account is False
 

runbooks/finops/tests/validate_test_suite.py

@@ -64,7 +64,7 @@ def validate_functionality():
 
         config = FinOpsConfig()
 
-        assert config.billing_profile == "ams-admin-Billing-ReadOnlyAccess-909135376185"
+        assert config.billing_profile == "${BILLING_PROFILE}"
         assert config.dry_run is True
         assert config.target_savings_percent == 40
         print("✅ Configuration validation passed")

runbooks/finops/types.py

@@ -1,4 +1,4 @@
-"""Type definitions for CloudOps Runbooks FinOps Module."""
+"""Type definitions for CloudOps & FinOps Runbooks Module."""
 
 from typing import Dict, List, Optional, Tuple, TypedDict
 
@@ -33,7 +33,7 @@ class CostData(TypedDict):
 
 class DualMetricResult(TypedDict):
     """Type for dual-metric cost analysis results."""
-    
+
     unblended_costs: Dict[str, float]  # UnblendedCost data (technical perspective)
     amortized_costs: Dict[str, float]  # AmortizedCost data (financial perspective)
     technical_total: float  # Total UnblendedCost
@@ -51,7 +51,7 @@ class ProfileData(TypedDict):
 
     profile_name: str  # Updated field name for consistency
     account_id: str
-    current_month: float  # Primary metric: UnblendedCost (technical accuracy) 
+    current_month: float  # Primary metric: UnblendedCost (technical accuracy)
     previous_month: float  # Updated field name for consistency
     current_month_formatted: str  # Formatted display for primary metric
     previous_month_formatted: str  # Formatted display for primary metric