runbooks 1.1.9__py3-none-any.whl → 1.1.10__py3-none-any.whl

runbooks/cli/commands/operate.py

@@ -78,15 +78,27 @@ def create_operate_group():
         """Start EC2 instances with universal profile support."""
         try:
             from runbooks.operate import EC2Operations
+            from runbooks.operate.base import OperationContext
+            from runbooks.inventory.models.account import AWSAccount
             from runbooks.common.profile_utils import get_profile_for_operation
 
             # Use ProfileManager for dynamic profile resolution
             resolved_profile = get_profile_for_operation("operational", profile)
 
+            # Create operation context
+            account = AWSAccount(account_id="current", account_name="cli-execution")
+            operation_context = OperationContext(
+                account=account,
+                region=region,
+                operation_type="start_instances",
+                resource_types=["ec2:instance"],
+                dry_run=dry_run
+            )
+
             # Delegate to operate module with resolved profile
             ec2_ops = EC2Operations(profile=resolved_profile, region=region, dry_run=dry_run)
 
-            return ec2_ops.start_instances(list(instance_ids))
+            return ec2_ops.start_instances(operation_context, list(instance_ids))
 
         except ImportError as e:
             console.print(f"[red]❌ EC2 operations module not available: {e}[/red]")
@@ -109,14 +121,26 @@ def create_operate_group():
         """Stop EC2 instances with universal profile support."""
         try:
             from runbooks.operate import EC2Operations
+            from runbooks.operate.base import OperationContext
+            from runbooks.inventory.models.account import AWSAccount
             from runbooks.common.profile_utils import get_profile_for_operation
 
             # Use ProfileManager for dynamic profile resolution
             resolved_profile = get_profile_for_operation("operational", profile)
 
+            # Create operation context
+            account = AWSAccount(account_id="current", account_name="cli-execution")
+            operation_context = OperationContext(
+                account=account,
+                region=region,
+                operation_type="stop_instances",
+                resource_types=["ec2:instance"],
+                dry_run=dry_run
+            )
+
             ec2_ops = EC2Operations(profile=resolved_profile, region=region, dry_run=dry_run)
 
-            return ec2_ops.stop_instances(list(instance_ids))
+            return ec2_ops.stop_instances(operation_context, list(instance_ids))
 
         except ImportError as e:
             console.print(f"[red]❌ EC2 operations module not available: {e}[/red]")
@@ -144,14 +168,27 @@ def create_operate_group():
         """Create S3 bucket with enterprise configurations and universal profile support."""
         try:
             from runbooks.operate import S3Operations
+            from runbooks.operate.base import OperationContext
+            from runbooks.inventory.models.account import AWSAccount
             from runbooks.common.profile_utils import get_profile_for_operation
 
             # Use ProfileManager for dynamic profile resolution
             resolved_profile = get_profile_for_operation("operational", profile)
 
+            # Create operation context
+            account = AWSAccount(account_id="current", account_name="cli-execution")
+            operation_context = OperationContext(
+                account=account,
+                region=region,
+                operation_type="create_bucket",
+                resource_types=["s3:bucket"],
+                dry_run=dry_run
+            )
+
             s3_ops = S3Operations(profile=resolved_profile, region=region, dry_run=dry_run)
 
             return s3_ops.create_bucket(
+                operation_context,
                 bucket_name=bucket_name,
                 encryption=encryption,
                 versioning=versioning,
@@ -182,14 +219,26 @@ def create_operate_group():
         """Create VPC with enterprise configurations and universal profile support."""
         try:
             from runbooks.operate import VPCOperations
+            from runbooks.operate.base import OperationContext
+            from runbooks.inventory.models.account import AWSAccount
             from runbooks.common.profile_utils import get_profile_for_operation
 
             # Use ProfileManager for dynamic profile resolution
             resolved_profile = get_profile_for_operation("operational", profile)
 
+            # Create operation context
+            account = AWSAccount(account_id="current", account_name="cli-execution")
+            operation_context = OperationContext(
+                account=account,
+                region=region,
+                operation_type="create_vpc",
+                resource_types=["vpc"],
+                dry_run=dry_run
+            )
+
             vpc_ops = VPCOperations(profile=resolved_profile, region=region, dry_run=dry_run)
 
-            return vpc_ops.create_vpc(cidr_block=cidr_block, vpc_name=vpc_name)
+            return vpc_ops.create_vpc(operation_context, cidr_block=cidr_block, vpc_name=vpc_name)
 
         except ImportError as e:
             console.print(f"[red]❌ VPC operations module not available: {e}[/red]")
@@ -216,14 +265,26 @@ def create_operate_group():
         """Deploy CloudFormation stack with universal profile support."""
         try:
             from runbooks.operate import CloudFormationOperations
+            from runbooks.operate.base import OperationContext
+            from runbooks.inventory.models.account import AWSAccount
             from runbooks.common.profile_utils import get_profile_for_operation
 
             # Use ProfileManager for dynamic profile resolution
             resolved_profile = get_profile_for_operation("operational", profile)
 
+            # Create operation context
+            account = AWSAccount(account_id="current", account_name="cli-execution")
+            operation_context = OperationContext(
+                account=account,
+                region=region,
+                operation_type="deploy_stack",
+                resource_types=["cloudformation:stack"],
+                dry_run=dry_run
+            )
+
             cf_ops = CloudFormationOperations(profile=resolved_profile, region=region, dry_run=dry_run)
 
-            return cf_ops.deploy_stack(template_file=template_file, stack_name=stack_name, parameters=parameters)
+            return cf_ops.deploy_stack(operation_context, template_file=template_file, stack_name=stack_name, parameters=parameters)
 
         except ImportError as e:
             console.print(f"[red]❌ CloudFormation operations module not available: {e}[/red]")

runbooks/cloudops/cost_optimizer.py

@@ -124,9 +124,7 @@ class CostOptimizer(CloudOpsBase):
             return time.time() - self.operation_start_time
         else:
             # Fallback if start time not tracked
-            import time
-
-            return time.time() - time.time()  # Returns ~0.0
+            return 0.0  # Returns ~0.0
 
     def _suggest_smaller_instance_type(self, instance_type: str) -> Optional[str]:
         """

runbooks/common/cli_decorators.py

@@ -48,22 +48,24 @@ def common_output_options(f: Callable) -> Callable:
     Standard output options for all runbooks commands.
 
     Provides consistent output formatting and export options:
-    - --output-format: JSON, CSV, table, PDF output formats
+    - -f, --format, --output-format: JSON, CSV, table, PDF output formats (triple alias)
     - --output-dir: Output directory for generated files
     - --export: Enable multi-format export capability
 
     Usage:
         @common_output_options
         @click.command()
-        def my_command(output_format, output_dir, export, **kwargs):
-            # Your command logic here
+        def my_command(format, output_dir, export, **kwargs):
+            # Your command logic here (parameter name is 'format')
     """
 
     @click.option(
+        "-f",
+        "--format",
         "--output-format",
         type=click.Choice(["json", "csv", "table", "pdf", "markdown"], case_sensitive=False),
         default="table",
-        help="Output format for results display",
+        help="Output format for results display (-f/--format preferred, --output-format legacy)",
     )
     @click.option(
         "--output-dir",