Polish infrastructure portfolio projects

migration-validation-framework/cli.py

@@ -29,8 +29,8 @@ class MigrationValidator:
 
     def __init__(self, verbose: bool = False):
         self.verbose = verbose
-        self.setup_logging()
         self.ensure_directories()
+        self.setup_logging()
 
     def setup_logging(self):
         """Configure logging."""
@@ -97,13 +97,23 @@ class MigrationValidator:
 
     def load_snapshot(self, snapshot_id: str) -> Dict[str, Any]:
         """Load snapshot from disk."""
-        snapshot_file = SNAPSHOTS_DIR / f"{snapshot_id}.json"
+        snapshot_path = Path(snapshot_id)
+        snapshot_file = snapshot_path if snapshot_path.exists() else SNAPSHOTS_DIR / f"{snapshot_id}.json"
         if not snapshot_file.exists():
             raise FileNotFoundError(f"Snapshot {snapshot_id} not found")
 
         with open(snapshot_file, 'r') as f:
             return json.load(f)
 
+    def collect_to_file(self, output_file: str, systems: List[str]) -> str:
+        """Collect a snapshot and write it to an explicit file path."""
+        snapshot = self.collect_system_data(systems)
+        with open(output_file, 'w') as f:
+            json.dump(snapshot, f, indent=2)
+            f.write("\n")
+        self.logger.info(f"Snapshot written: {output_file}")
+        return output_file
+
     def create_snapshot(self, env: str, label: str, systems: List[str]) -> str:
         """Create and save a system snapshot."""
         self.logger.info(f"Creating snapshot for environment: {env}, label: {label}")
@@ -136,6 +146,27 @@ class MigrationValidator:
         self.logger.info(f"Comparison saved: {output_id}")
         return comparison
 
+    def compare_files(self, before_file: str, after_file: str, output_file: Optional[str] = None) -> Dict[str, Any]:
+        """Compare two explicit JSON snapshot files."""
+        self.logger.info(f"Comparing files: {before_file} vs {after_file}")
+
+        before = self.load_snapshot(before_file)
+        after = self.load_snapshot(after_file)
+        comparison = compare.compare_snapshots(before, after)
+        comparison["metadata"] = {
+            "before": before_file,
+            "after": after_file,
+            "timestamp": datetime.now().isoformat()
+        }
+
+        if output_file:
+            with open(output_file, 'w') as f:
+                json.dump(comparison, f, indent=2)
+                f.write("\n")
+            self.logger.info(f"Comparison written: {output_file}")
+
+        return comparison
+
     def generate_report(self, comparison_id: str, format_type: str, output_file: Optional[str] = None) -> str:
         """Generate a report from comparison results."""
         self.logger.info(f"Generating {format_type} report for comparison: {comparison_id}")
@@ -169,14 +200,14 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog="""
 Examples:
-  # Create pre-migration snapshot
-  python cli.py snapshot --env production --label pre-migration --systems web01,db01
+  # Collect pre-migration snapshot
+  python3 cli.py collect --output before.json --systems web01,db01
 
-  # Compare snapshots
-  python cli.py compare pre-migration-snapshot post-migration-snapshot --output comparison_001
+  # Compare snapshot files
+  python3 cli.py compare before.json after.json --output diff.json
 
   # Generate HTML report
-  python cli.py report --comparison comparison_001 --format html
+  python3 cli.py report --comparison comparison_001 --format html
         """
     )
 
@@ -185,6 +216,11 @@ Examples:
 
     subparsers = parser.add_subparsers(dest='command', help='Available commands')
 
+    # Collect command
+    collect_parser = subparsers.add_parser('collect', help='Collect a system snapshot to a JSON file')
+    collect_parser.add_argument('--output', required=True, help='Output JSON file')
+    collect_parser.add_argument('--systems', default='localhost', help='Comma-separated list of systems')
+
     # Snapshot command
     snapshot_parser = subparsers.add_parser('snapshot', help='Create system snapshot')
     snapshot_parser.add_argument('--env', required=True, help='Target environment')
@@ -195,7 +231,7 @@ Examples:
     compare_parser = subparsers.add_parser('compare', help='Compare two snapshots')
     compare_parser.add_argument('snapshot1', help='First snapshot ID')
     compare_parser.add_argument('snapshot2', help='Second snapshot ID')
-    compare_parser.add_argument('--output', required=True, help='Comparison output ID')
+    compare_parser.add_argument('--output', help='Output comparison ID or JSON file')
 
     # Report command
     report_parser = subparsers.add_parser('report', help='Generate report from comparison')
@@ -217,7 +253,16 @@ Examples:
     validator = MigrationValidator(verbose=args.verbose)
 
     try:
-        if args.command == 'snapshot':
+        if args.command == 'collect':
+            systems = [system.strip() for system in args.systems.split(',') if system.strip()]
+            if args.dry_run:
+                print(f"DRY RUN: Would collect {systems} into {args.output}")
+                return
+
+            output_file = validator.collect_to_file(args.output, systems)
+            print(f"Snapshot written: {output_file}")
+
+        elif args.command == 'snapshot':
             systems = args.systems.split(',')
             if args.dry_run:
                 print(f"DRY RUN: Would create snapshot for systems: {systems}")
@@ -231,8 +276,16 @@ Examples:
                 print(f"DRY RUN: Would compare {args.snapshot1} vs {args.snapshot2}")
                 return
 
-            comparison = validator.compare_snapshots(args.snapshot1, args.snapshot2, args.output)
-            print(f"Comparison completed: {args.output}")
+            output = args.output
+            if output and output.endswith('.json'):
+                comparison = validator.compare_files(args.snapshot1, args.snapshot2, output)
+                result = "PASS" if comparison.get("validation_results", {}).get("passed") else "FAIL"
+                print(f"Comparison completed: {output} ({result})")
+            else:
+                output_id = output or datetime.now().strftime('%Y%m%d_%H%M%S')
+                comparison = validator.compare_snapshots(args.snapshot1, args.snapshot2, output_id)
+                result = "PASS" if comparison.get("validation_results", {}).get("passed") else "FAIL"
+                print(f"Comparison completed: {output_id} ({result})")
 
         elif args.command == 'report':
             if args.dry_run:
@@ -267,4 +320,4 @@ Examples:
         sys.exit(1)
 
 if __name__ == "__main__":
-    main()
+    main()