From 2aa71022ad2d9379cf38db522194f38c05115d26 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Mon, 25 May 2026 21:09:23 +0300
Subject: refactor(manager): move dry-run/resume logic into VmLifecycle; thin
 Manager facade

- Manager is now a thin facade (~160 lines) that delegates VM lifecycle,
  provisioning, testing, and cleanup to focused collaborators.
- Moved replace/resume/dry-run handling and presentation helpers from Manager
  into VmLifecycle where they belong.
- Fixed operator-precedence bug: instance && instance['id'].
- Fixed status fallback to return public_ip from state on API error.
- Fixed LocalWireGuard delegation bug (removed @local_wireguard.show_local_wireguard
  call which did not exist; now routes through Manager#show_local_wireguard).
- Removed dead code: unused ensure_security_rules and legacy_litellm from VmLifecycle.
- ProvisioningOrchestrator: removed spurious show_local_wireguard call and added
  legacy_litellm_rules cleanup with proper warn_out helper.
- Added missing require statements (json, fileutils, provisioning).
- Removed dead attr_reader :config from InferenceTester.
- Renamed shadowed variable in cleanup_local_access.
---
 lib/hyperstack/manager.rb | 50 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 13 deletions(-)

(limited to 'lib/hyperstack/manager.rb')

diff --git a/lib/hyperstack/manager.rb b/lib/hyperstack/manager.rb
index 2150554..cecf11d 100644
--- a/lib/hyperstack/manager.rb
+++ b/lib/hyperstack/manager.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'provisioning'
 require_relative 'ssh_runner'
 require_relative 'vm_lifecycle'
 require_relative 'wireguard_setup'
@@ -69,26 +70,19 @@ module HyperstackVM
 
     def create(replace: false, dry_run: false, install_vllm: nil, install_ollama: nil,
                flavor_name: nil, vllm_preset: nil)
-      raise Error, "DRY RUN is not supported." if dry_run
-
-      if replace
-        existing = @state_store.load
-        if existing && existing['vm_id']
-          @vm_lifecycle.delete(vm_id: existing['vm_id'])
-        end
-      end
-
       install_vllm   = @config.vllm_install_enabled?   if install_vllm.nil?
       install_ollama = @config.ollama_install_enabled? if install_ollama.nil?
 
       state = @vm_lifecycle.create(
+        replace: replace,
+        dry_run: dry_run,
         flavor_name: flavor_name,
         vllm_preset: vllm_preset,
         install_vllm: install_vllm,
         install_ollama: install_ollama
-      ) do |s|
-        @local_wireguard.show_local_wireguard(s['public_ip'])
-      end
+      ) { |s| show_local_wireguard([s['public_ip']].compact) }
+
+      return if state.nil?
 
       @orchestrator.run(
         state,
@@ -112,7 +106,7 @@ module HyperstackVM
 
     def status(include_local_wireguard: true)
       ip = @vm_lifecycle.status
-      @local_wireguard.show_local_wireguard(ip) if include_local_wireguard
+      show_local_wireguard([ip].compact) if include_local_wireguard
       ip
     end
 
@@ -132,5 +126,35 @@ module HyperstackVM
     def list_models
       @vm_lifecycle.list_models
     end
+
+    def cleanup_local_access(dry_run:, hostnames:, allowed_ips:)
+      peers = @local_wireguard.remove_peers_by_allowed_ips(allowed_ips, dry_run: dry_run)
+      removed_hosts = @local_wireguard.remove_hostnames(hostnames, dry_run: dry_run)
+      { peers: peers, hostnames: removed_hosts }
+    end
+
+    def report_local_cleanup(output, cleanup, dry_run:)
+      peer_summary = cleanup[:peers].map { |peer| peer['AllowedIPs'] || peer['Endpoint'] }.join(', ')
+      host_summary = cleanup[:hostnames].join(', ')
+
+      if dry_run
+        if cleanup[:peers].empty? && cleanup[:hostnames].empty?
+          output.puts('DRY RUN: no matching local WireGuard peers or host entries would be removed.')
+          return
+        end
+        unless cleanup[:peers].empty?
+          output.puts("DRY RUN: local WireGuard peers would be removed for #{peer_summary}.")
+        end
+        unless cleanup[:hostnames].empty?
+          output.puts("DRY RUN: local host entries would be removed for #{host_summary}.")
+        end
+        return
+      end
+
+      output.puts('No matching local WireGuard peers needed removal.') if cleanup[:peers].empty?
+      output.puts('No matching local host entries needed removal.') if cleanup[:hostnames].empty?
+      output.puts("Local WireGuard peers removed for #{peer_summary}.") unless cleanup[:peers].empty?
+      output.puts("Local host entries removed for #{host_summary}.") unless cleanup[:hostnames].empty?
+    end
   end
 end
-- 
cgit v1.2.3