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

runbooks/inventory/Tests/common_test_data.py

@@ -1086,7 +1086,7 @@ account_and_region_specific_function_response_data = [
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                             "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                             "LOG_LEVEL": "INFO",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1119,7 +1119,7 @@ account_and_region_specific_function_response_data = [
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                             "COMPONENT_TABLE": "AccountAssessmentStack-TrustedAccessTable495B447A-GTR0RYDUJU5Q",
                             "LOG_LEVEL": "INFO",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1190,7 +1190,7 @@ account_and_region_specific_function_response_data = [
                             "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                             "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1223,7 +1223,7 @@ account_and_region_specific_function_response_data = [
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                             "COMPONENT_TABLE": "AccountAssessmentStack-DelegatedAdminsTable29E80916-F34FK4FZGFP5",
                             "LOG_LEVEL": "INFO",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1291,7 +1291,7 @@ account_and_region_specific_function_response_data = [
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                             "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                             "LOG_LEVEL": "INFO",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1341,7 +1341,7 @@ account_and_region_specific_function_response_data = [
                             "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                             "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1395,7 +1395,7 @@ account_and_region_specific_function_response_data = [
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                             "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                             "LOG_LEVEL": "INFO",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1425,7 +1425,7 @@ account_and_region_specific_function_response_data = [
                             "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                             "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                             "LOG_LEVEL": "INFO",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1450,12 +1450,12 @@ account_and_region_specific_function_response_data = [
                     "Version": "$LATEST",
                     "Environment": {
                         "Variables": {
-                            "CONFIG": '{"SrcBucket":"solutions-us-east-1","SrcPath":"account-assessment-for-aws-organizations/v1.0.3/webui/","WebUIBucket":"accountassessmentstack-s3bucket07682993-1qnr9dfvuvn8m","awsExports":{"API":{"endpoints":[{"name":"AccountAssessmentApi","endpoint":"https://5ugessads8.execute-api.us-east-1.amazonaws.com/prod"}]},"loggingLevel":"INFO","Auth":{"region":"us-east-1","userPoolId":"us-east-1_4y5EH6RX3","userPoolWebClientId":"10hrrgcdjum45c4jmre3kv7r7d","mandatorySignIn":true,"oauth":{"domain":"paulbaye-amzn.auth.us-east-1.amazoncognito.com","scope":["openid","profile","email","aws.cognito.signin.user.admin"],"redirectSignIn":"https://d12i33hlb8s7se.cloudfront.net/","redirectSignOut":"https://d12i33hlb8s7se.cloudfront.net/","responseType":"code","clientId":"10hrrgcdjum45c4jmre3kv7r7d"}}}}',
+                            "CONFIG": '{"SrcBucket":"solutions-us-east-1","SrcPath":"account-assessment-for-aws-organizations/latest version/webui/","WebUIBucket":"accountassessmentstack-s3bucket07682993-1qnr9dfvuvn8m","awsExports":{"API":{"endpoints":[{"name":"AccountAssessmentApi","endpoint":"https://5ugessads8.execute-api.us-east-1.amazonaws.com/prod"}]},"loggingLevel":"INFO","Auth":{"region":"us-east-1","userPoolId":"us-east-1_4y5EH6RX3","userPoolWebClientId":"10hrrgcdjum45c4jmre3kv7r7d","mandatorySignIn":true,"oauth":{"domain":"paulbaye-amzn.auth.us-east-1.amazoncognito.com","scope":["openid","profile","email","aws.cognito.signin.user.admin"],"redirectSignIn":"https://d12i33hlb8s7se.cloudfront.net/","redirectSignOut":"https://d12i33hlb8s7se.cloudfront.net/","responseType":"code","clientId":"10hrrgcdjum45c4jmre3kv7r7d"}}}}',
                             "POWERTOOLS_SERVICE_NAME": "DeployWebUI",
                             "SEND_ANONYMOUS_DATA": "Yes",
                             "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                             "LOG_LEVEL": "INFO",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1508,7 +1508,7 @@ account_and_region_specific_function_response_data = [
                             "TIME_TO_LIVE_IN_DAYS": "90",
                             "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                             "TABLE_RESOURCE_BASED_POLICY": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                         }
                     },
@@ -1579,7 +1579,7 @@ account_and_region_specific_function_response_data = [
                             "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                             "COMPONENT_TABLE": "AccountAssessmentStack-TrustedAccessTable495B447A-GTR0RYDUJU5Q",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -1609,7 +1609,7 @@ account_and_region_specific_function_response_data = [
                             "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                             "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                             "COMPONENT_TABLE": "AccountAssessmentStack-DelegatedAdminsTable29E80916-F34FK4FZGFP5",
-                            "SOLUTION_VERSION": "v1.0.3",
+                            "SOLUTION_VERSION": "latest version",
                         }
                     },
                     "TracingConfig": {"Mode": "Active"},
@@ -2043,7 +2043,7 @@ account_and_region_specific_function_response_data = [
                             "CONFIG_AGGREGATOR": "aws-perspective-us-east-1-444444444444-aggregator",
                             "VERSION": "1.0",
                             "ANONYMOUS_METRIC_OPT_OUT": "No",
-                            "DEPLOYMENT_BUCKET_KEY": "aws-perspective/v1.0.1",
+                            "DEPLOYMENT_BUCKET_KEY": "aws-perspective/latest version",
                             "DISCOVERY_BUCKET": "aws-perspective-discoverybucket-qjlwypzo5eg1",
                             "WEBUI_BUCKET": "aws-perspective-webuibucket-1xylrsdi5wwn2",
                         }
@@ -2312,7 +2312,7 @@ function_response_data = {
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                     "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                     "LOG_LEVEL": "INFO",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2345,7 +2345,7 @@ function_response_data = {
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                     "COMPONENT_TABLE": "AccountAssessmentStack-TrustedAccessTable495B447A-GTR0RYDUJU5Q",
                     "LOG_LEVEL": "INFO",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2416,7 +2416,7 @@ function_response_data = {
                     "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                     "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2449,7 +2449,7 @@ function_response_data = {
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                     "COMPONENT_TABLE": "AccountAssessmentStack-DelegatedAdminsTable29E80916-F34FK4FZGFP5",
                     "LOG_LEVEL": "INFO",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2514,7 +2514,7 @@ function_response_data = {
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                     "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                     "LOG_LEVEL": "INFO",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2564,7 +2564,7 @@ function_response_data = {
                     "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                     "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2618,7 +2618,7 @@ function_response_data = {
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                     "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                     "LOG_LEVEL": "INFO",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2648,7 +2648,7 @@ function_response_data = {
                     "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                     "COMPONENT_TABLE": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                     "LOG_LEVEL": "INFO",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2673,12 +2673,12 @@ function_response_data = {
             "Version": "$LATEST",
             "Environment": {
                 "Variables": {
-                    "CONFIG": '{"SrcBucket":"solutions-us-east-1","SrcPath":"account-assessment-for-aws-organizations/v1.0.3/webui/","WebUIBucket":"accountassessmentstack-s3bucket07682993-1qnr9dfvuvn8m","awsExports":{"API":{"endpoints":[{"name":"AccountAssessmentApi","endpoint":"https://5ugessads8.execute-api.us-east-1.amazonaws.com/prod"}]},"loggingLevel":"INFO","Auth":{"region":"us-east-1","userPoolId":"us-east-1_4y5EH6RX3","userPoolWebClientId":"10hrrgcdjum45c4jmre3kv7r7d","mandatorySignIn":true,"oauth":{"domain":"paulbaye-amzn.auth.us-east-1.amazoncognito.com","scope":["openid","profile","email","aws.cognito.signin.user.admin"],"redirectSignIn":"https://d12i33hlb8s7se.cloudfront.net/","redirectSignOut":"https://d12i33hlb8s7se.cloudfront.net/","responseType":"code","clientId":"10hrrgcdjum45c4jmre3kv7r7d"}}}}',
+                    "CONFIG": '{"SrcBucket":"solutions-us-east-1","SrcPath":"account-assessment-for-aws-organizations/latest version/webui/","WebUIBucket":"accountassessmentstack-s3bucket07682993-1qnr9dfvuvn8m","awsExports":{"API":{"endpoints":[{"name":"AccountAssessmentApi","endpoint":"https://5ugessads8.execute-api.us-east-1.amazonaws.com/prod"}]},"loggingLevel":"INFO","Auth":{"region":"us-east-1","userPoolId":"us-east-1_4y5EH6RX3","userPoolWebClientId":"10hrrgcdjum45c4jmre3kv7r7d","mandatorySignIn":true,"oauth":{"domain":"paulbaye-amzn.auth.us-east-1.amazoncognito.com","scope":["openid","profile","email","aws.cognito.signin.user.admin"],"redirectSignIn":"https://d12i33hlb8s7se.cloudfront.net/","redirectSignOut":"https://d12i33hlb8s7se.cloudfront.net/","responseType":"code","clientId":"10hrrgcdjum45c4jmre3kv7r7d"}}}}',
                     "POWERTOOLS_SERVICE_NAME": "DeployWebUI",
                     "SEND_ANONYMOUS_DATA": "Yes",
                     "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                     "LOG_LEVEL": "INFO",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2731,7 +2731,7 @@ function_response_data = {
                     "TIME_TO_LIVE_IN_DAYS": "90",
                     "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                     "TABLE_RESOURCE_BASED_POLICY": "AccountAssessmentStack-ResourceBasedPolicyTable7277C643-13R1K510AXFDB",
                 }
             },
@@ -2802,7 +2802,7 @@ function_response_data = {
                     "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                     "COMPONENT_TABLE": "AccountAssessmentStack-TrustedAccessTable495B447A-GTR0RYDUJU5Q",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2832,7 +2832,7 @@ function_response_data = {
                     "STACK_ID": "arn:aws:cloudformation:us-east-1:111122223333:stack/AccountAssessmentStack/bc6befc0-dacb-11ed-921f-0a41af233cd7",
                     "TABLE_JOBS": "AccountAssessmentStack-JobHistoryTableE4B293DD-1QRBBBDKUU8G9",
                     "COMPONENT_TABLE": "AccountAssessmentStack-DelegatedAdminsTable29E80916-F34FK4FZGFP5",
-                    "SOLUTION_VERSION": "v1.0.3",
+                    "SOLUTION_VERSION": "latest version",
                 }
             },
             "TracingConfig": {"Mode": "Active"},
@@ -2923,7 +2923,7 @@ mock_instances_3 = {
                     "Placement": {"AvailabilityZone": "us-west-2b"},
                     "PublicIpAddress": "22.23.24.25",
                     "PublicDnsName": "ec2-22-23-24-25.us-west-2.compute.amazonaws.com",
-                    "PrivateIpAddress": "10.0.9.1",
+                    "PrivateIpAddress": "10.latest version",
                     "State": {"Name": "running"},
                     "Tags": [
                         {"Key": "Account", "Value": "555566667777"},
@@ -3080,7 +3080,7 @@ mock_instances_7 = {
                     "InstanceType": "c5d.18xlarge",
                     "Placement": {"AvailabilityZone": "eu-west-2a"},
                     "PublicIpAddress": "22.23.24.27",
-                    "PrivateIpAddress": "10.0.9.3",
+                    "PrivateIpAddress": "10.latest version",
                     "State": {"Name": "running"},
                     "Tags": [
                         {"Key": "Account", "Value": "777755556666"},
@@ -3228,7 +3228,7 @@ mock_instances_11 = {
                     "InstanceType": "c5d.12xlarge",
                     "Placement": {"AvailabilityZone": "us-east-2c"},
                     "PublicIpAddress": "22.23.24.26",
-                    "PrivateIpAddress": "10.0.9.2",
+                    "PrivateIpAddress": "10.latest version",
                     "State": {"Name": "running"},
                     "Tags": [
                         {"Key": "Account", "Value": "111122223333"},

runbooks/inventory/collectors/aws_comprehensive.py

@@ -1,6 +1,6 @@
 """
 Comprehensive AWS Resource Collector for Multi-Account Organizations
-Sprint 1: Discovery & Assessment - Enhanced for parallel processing
+Phase 1: Discovery & Assessment - Enhanced for parallel processing
 Supports any organization size: 10, 60, 200+ accounts dynamically
 """
 
@@ -14,12 +14,13 @@ import boto3
 from botocore.exceptions import ClientError, NoCredentialsError
 
 from runbooks.inventory.collectors.base import BaseResourceCollector
+from runbooks.common.aws_profile_manager import AWSProfileManager, get_current_account_id
 
 
 class ComprehensiveCollector(BaseResourceCollector):
     """
     Collect all AWS resources across multi-account organization with parallel processing.
-    Optimized for Sprint 1 discovery goals.
+    Optimized for Phase 1 discovery goals.
     """
 
     def __init__(self, profile: str = None, parallel_workers: int = 10):
@@ -100,7 +101,7 @@ class ComprehensiveCollector(BaseResourceCollector):
         # Generate summary statistics
         results["summary"] = self._generate_summary(results["resources"])
 
-        # Save results to Sprint 1 artifacts
+        # Save results to Phase 1 artifacts
         self._save_results(results)
 
         return results
@@ -215,7 +216,7 @@ class ComprehensiveCollector(BaseResourceCollector):
         """
         html_content = self._create_visualization_html(results)
 
-        output_path = "artifacts/sprint-1/inventory/visualization.html"
+        output_path = "artifacts/phase-1/inventory/visualization.html"
         with open(output_path, "w") as f:
             f.write(html_content)
 
@@ -228,7 +229,7 @@ class ComprehensiveCollector(BaseResourceCollector):
         <!DOCTYPE html>
         <html>
         <head>
-            <title>AWS Multi-Account Inventory - Sprint 1</title>
+            <title>AWS Multi-Account Inventory - Phase 1</title>
             <script src="https://d3js.org/d3.v7.min.js"></script>
             <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
             <style>
@@ -243,7 +244,7 @@ class ComprehensiveCollector(BaseResourceCollector):
         </head>
         <body>
             <h1>🏗️ AWS Organization Inventory Dashboard</h1>
-            <h2>Sprint 1: Discovery & Assessment</h2>
+            <h2>Phase 1: Discovery & Assessment</h2>
             
             <div class="metrics">
                 <div class="metric">
@@ -292,16 +293,32 @@ class ComprehensiveCollector(BaseResourceCollector):
         return html
 
     def _save_results(self, results: Dict):
-        """Save results to Sprint 1 artifacts directory."""
-        output_path = "artifacts/sprint-1/inventory/resources.json"
+        """Save results to Phase 1 artifacts directory."""
+        output_path = "artifacts/phase-1/inventory/resources.json"
         with open(output_path, "w") as f:
             json.dump(results, f, indent=2, default=str)
         print(f"Inventory saved: {output_path}")
 
     def _discover_all_accounts(self) -> List[str]:
         """Discover all accounts in the organization (enhanced for multi-account org)."""
-        # Enhanced mock for comprehensive organization discovery
-        base_accounts = ["123456789012", "234567890123", "345678901234"]
+        try:
+            # Try real organization discovery first
+            profile_manager = AWSProfileManager(self.profile)
+            org_accounts = profile_manager.discover_organization_accounts()
+
+            if org_accounts:
+                account_ids = [acc['Id'] for acc in org_accounts]
+                print(f"🏢 Organization Discovery: {len(account_ids)} accounts found")
+                return account_ids
+        except Exception as e:
+            print(f"⚠️ Organization discovery failed, using mock: {e}")
+
+        # Fallback to mock organization for testing
+        profile_manager = AWSProfileManager(self.profile)
+        current_account = profile_manager.get_account_id()
+
+        # Include current account plus simulated additional accounts
+        base_accounts = [current_account, "234567890123", "345678901234"]
 
         # Generate additional accounts to simulate large organization
         additional_accounts = []
@@ -310,7 +327,7 @@ class ComprehensiveCollector(BaseResourceCollector):
             additional_accounts.append(account_id)
 
         all_accounts = base_accounts + additional_accounts
-        print(f"🏢 Organization Discovery: {len(all_accounts)} accounts found")
+        print(f"🏢 Mock Organization Discovery: {len(all_accounts)} accounts simulated")
         return all_accounts
 
     def _get_account_session(self, account_id: str):

runbooks/inventory/collectors/aws_networking.py

@@ -319,7 +319,7 @@ class NetworkTopologyCollector(BaseResourceCollector):
         if not regions:
             regions = ["us-east-1", "us-west-2", "eu-west-1"]  # Default enterprise regions
             
-        print_header("Network Topology Discovery", "v0.9.1")
+        print_header("Network Topology Discovery", "latest version")
         topology = {
             "account_id": account.account_id,
             "timestamp": datetime.utcnow().isoformat(),
@@ -531,7 +531,7 @@ class TransitGatewayCollector(BaseResourceCollector):
         if not regions:
             regions = ["us-east-1", "us-west-2", "eu-west-1"]
             
-        print_header("Transit Gateway Discovery", "v0.9.1")
+        print_header("Transit Gateway Discovery", "latest version")
         tgw_analysis = {
             "account_id": account.account_id,
             "timestamp": datetime.utcnow().isoformat(),

runbooks/inventory/discovery.md

@@ -203,8 +203,8 @@ python find_orphaned_stacks.py --filename Drift_Detection -v --profile $MANAGEME
 
 ```bash
 # Business scenarios with proven savings (TESTED ✅)
-runbooks finops --scenario workspaces      # FinOps-24: $13,020 annual
-runbooks finops --scenario snapshots       # FinOps-23: $119,700 annual  
+runbooks finops --scenario workspaces      # FinOps-24: significant annual savings
+runbooks finops --scenario snapshots       # FinOps-23: significant annual savings  
 runbooks finops --scenario nat-gateway     # FinOps-26: $8K-$12K potential
 runbooks finops --scenario elastic-ip      # FinOps-EIP: $3.65/month per IP
 runbooks finops --scenario ebs             # FinOps-EBS: 15-20% storage optimization

runbooks/inventory/find_ec2_security_groups.py

@@ -615,7 +615,7 @@ if __name__ == "__main__":
                     "Protocol": {"DisplayOrder": 1, "Heading": "In Protocol"},
                     "FromPort": {"DisplayOrder": 2, "Heading": "Port From", "Delimiter": False},
                     "ToPort": {"DisplayOrder": 3, "Heading": "Port To", "Delimiter": False},
-                    "From": {"DisplayOrder": 4, "Heading": "From", "Condition": ["10.1.1.0/24"]},
+                    "From": {"DisplayOrder": 4, "Heading": "From", "Condition": ["10.latest version/24"]},
                     # 'UserIdGroupPairs': {'DisplayOrder': 5, 'Heading': 'Group Pairs'},
                     # 'Description'     : {'DisplayOrder': 6, 'Heading': 'Description'}
                 },

runbooks/inventory/organizations_discovery.py

@@ -1138,7 +1138,7 @@ class EnhancedOrganizationsDiscovery:
             medium_spend_accounts = {
                 k: round(v, 2)
                 for k, v in cost_by_account.items()
-                if 100 <= v <= 1000  # $100-$1000/month
+                if 100 <= v <= 1000  # significant value range$1000/month
             }
 
             logger.info(f"✅ Cost validation complete: ${total_cost:.2f} across {len(cost_by_account)} accounts")

runbooks/inventory/vpc_analyzer.py

@@ -157,7 +157,7 @@ class VPCAnalyzer:
         self.last_awso_analysis = None
         self.landing_zone_sessions = []  # Enhanced: Store cross-account sessions
         
-        print_header(f"VPC Analyzer v0.9.9", "Multi-Organization Landing Zone Enhanced")
+        print_header(f"VPC Analyzer latest version", "Multi-Organization Landing Zone Enhanced")
         
         if self.enable_multi_account:
             print_info(f"🎯 Target: 60-account Multi-Organization Landing Zone discovery")

runbooks/inventory/vpc_flow_analyzer.py

@@ -20,7 +20,7 @@ Features:
 
 Author: CloudOps Runbooks Team
 Version: 0.7.8
-Enhanced for Sprint 2 VPC Scope Expansion with Traffic Analysis
+Enhanced for Phase 2 VPC Scope Expansion with Traffic Analysis
 """
 
 import ipaddress
@@ -736,7 +736,7 @@ class VPCFlowAnalyzer(BaseInventory):
 
         # Strategy 1: VPC Endpoints
         if monthly_cost > 50:
-            vpc_endpoint_savings = min(monthly_cost * 0.3, 100)  # Max $100 savings
+            vpc_endpoint_savings = min(monthly_cost * 0.3, 100)  # Max substantial savings
             strategies.append(
                 {
                     "strategy": "VPC_ENDPOINTS",