confctl 1.0.0 → 2.1.0

data/lib/confctl/cli/cluster.rb

@@ -110,7 +110,10 @@ module ConfCtl::Cli
     end
 
     def status
-      machines = select_machines(args[0]).managed
+      machines = select_machines(args[0]).managed.select do |_host, machine|
+        machine.target_host || machine.carried?
+      end
+
       raise 'No machines to check' if machines.empty?
 
       ask_confirmation! do
@@ -244,7 +247,7 @@ module ConfCtl::Cli
     end
 
     def test_connection
-      machines = select_machines_with_managed(args[0])
+      machines = select_machines_with_managed(args[0]).runnable
       raise 'No machines to test' if machines.empty?
 
       ask_confirmation! do
@@ -276,7 +279,7 @@ module ConfCtl::Cli
     end
 
     def ssh
-      machines = select_machines_with_managed(args[0])
+      machines = select_machines_with_managed(args[0]).runnable
       raise 'No machines to ssh to' if machines.empty?
 
       if opts['input-string'] && opts['input-file']
@@ -295,7 +298,7 @@ module ConfCtl::Cli
     end
 
     def cssh
-      machines = select_machines_with_managed(args[0])
+      machines = select_machines_with_managed(args[0]).runnable
       raise 'No machines to open cssh to' if machines.empty?
 
       ask_confirmation! do
@@ -330,7 +333,7 @@ module ConfCtl::Cli
 
       if opts[:interactive]
         host_generations.each do |host, gen|
-          if copy_to_host(nix, host, machines[host], gen.toplevel) == :skip
+          if copy_to_host(nix, host, machines[host], gen) == :skip
             puts Rainbow("Skipping #{host}").yellow
             skipped_copy << host
           end
@@ -348,7 +351,7 @@ module ConfCtl::Cli
           next
         end
 
-        if deploy_to_host(nix, host, machines[host], gen.toplevel, action) == :skip
+        if deploy_to_host(nix, host, machines[host], gen, action) == :skip
           puts Rainbow("Skipping #{host}").yellow
           skipped_activation << host
           next
@@ -393,14 +396,14 @@ module ConfCtl::Cli
       host_generations.each do |host, gen|
         machine = machines[host]
 
-        if copy_to_host(nix, host, machine, gen.toplevel) == :skip
+        if copy_to_host(nix, host, machine, gen) == :skip
           puts Rainbow("Skipping #{host}").yellow
           next
         end
 
         next if opts['copy-only']
 
-        if deploy_to_host(nix, host, machine, gen.toplevel, action) == :skip
+        if deploy_to_host(nix, host, machine, gen, action) == :skip
           puts Rainbow("Skipping #{host}").yellow
           next
         end
@@ -418,7 +421,7 @@ module ConfCtl::Cli
       end
     end
 
-    def copy_to_host(nix, host, machine, toplevel)
+    def copy_to_host(nix, host, machine, build_generation)
       puts Rainbow("Copying configuration to #{host} (#{machine.target_host})").yellow
 
       return :skip if opts[:interactive] && !ask_confirmation(always: true)
@@ -432,7 +435,7 @@ module ConfCtl::Cli
           width: 80
         )
 
-        ret = nix.copy(machine, toplevel) do |i, n, path|
+        ret = nix_copy(nix, machine, build_generation) do |i, n, path|
           lw << "[#{i}/#{n}] #{path}"
 
           lw.sync_console do
@@ -448,8 +451,10 @@ module ConfCtl::Cli
     end
 
     def concurrent_copy(machines, host_generations, nix)
+      sorted_generations = sort_generations_for_copy(machines, host_generations)
+
       LogView.open(
-        header: "#{Rainbow("Copying to #{host_generations.length} machines").bright}\n",
+        header: "#{Rainbow("Copying to #{sorted_generations.length} machines").bright}\n",
         title: Rainbow('Live view').bright
       ) do |lw|
         multibar = TTY::ProgressBar::Multi.new(
@@ -458,13 +463,13 @@ module ConfCtl::Cli
         )
         executor = ConfCtl::ParallelExecutor.new(opts['max-concurrent-copy'])
 
-        host_generations.each do |host, gen|
+        sorted_generations.each do |host, gen|
           pb = multibar.register(
             "#{host} [:bar] :current/:total (:percent)"
           )
 
           executor.add do
-            ret = nix.copy(machines[host], gen.toplevel) do |i, n, path|
+            ret = nix_copy(nix, machines[host], gen) do |i, n, path|
               lw << "#{host}> [#{i}/#{n}] #{path}"
 
               lw.sync_console do
@@ -501,13 +506,93 @@ module ConfCtl::Cli
       end
     end
 
-    def deploy_to_host(nix, host, machine, toplevel, action)
+    # Sort generations for copy to target machines
+    #
+    # This algorithm interleaves carried machines from different carriers,
+    # so that we copy to multiple carriers at the same time, and not many carried
+    # machines to one carrier.
+    def sort_generations_for_copy(machines, host_generations)
+      carried, standalone = machines.to_a.partition(&:carried?)
+
+      carried_groups = carried.group_by { |m| m.carrier_machine.name }
+
+      sorted_generations = standalone.map do |m|
+        [m.name, host_generations[m.name]]
+      end
+
+      until carried_groups.empty?
+        carried_groups.delete_if do |_, machines|
+          m = machines.shift
+          next(true) if m.nil?
+
+          sorted_generations << [m.name, host_generations[m.name]]
+
+          machines.empty?
+        end
+      end
+
+      if sorted_generations.length != host_generations.length
+        raise 'programming error: sorted generations length != original generations'
+      end
+
+      sorted_generations
+    end
+
+    def deploy_to_host(nix, host, machine, generation, action)
+      ret = nil
+
       LogView.open_with_logger(
         header: "#{Rainbow('Deploying to').bright} #{Rainbow(host).yellow}\n",
         title: Rainbow('Live view').bright,
         size: :auto,
         reserved_lines: 10
       ) do |lw|
+        ret =
+          if machine.carried?
+            deploy_carried_to_host(lw, nix, host, machine, generation, action)
+          else
+            deploy_standalone_to_host(lw, nix, host, machine, generation, action)
+          end
+
+        lw.flush
+      end
+
+      ret
+    end
+
+    def deploy_standalone_to_host(lw, nix, host, machine, generation, action)
+      return :skip if pre_host_activate(lw, nix, host, machine, generation, action) == :skip
+
+      # rubocop:disable Style/GuardClause
+
+      result =
+        if %w[test switch].include?(action) && enable_auto_rollback?(machine, generation)
+          nix.activate_with_rollback(machine, generation, action)
+        else
+          nix.activate(machine, generation, action)
+        end
+
+      raise "Error while activating configuration on #{host}" unless result
+
+      if %w[boot switch].include?(action) && !nix.set_profile(machine, generation.toplevel)
+        raise "Error while setting profile on #{host}"
+      end
+
+      # rubocop:enable Style/GuardClause
+    end
+
+    def deploy_carried_to_host(lw, nix, host, machine, generation, action)
+      return if action != 'switch'
+
+      # rubocop:disable Style/GuardClause
+      unless nix.set_carried_profile(machine, generation.toplevel)
+        raise "Error while setting carried profile for #{host} on #{machine.carrier_machine}"
+      end
+      # rubocop:enable Style/GuardClause
+    end
+
+    def pre_host_activate(lw, nix, host, machine, generation, action)
+      loop do
         if opts['dry-activate-first']
           lw.sync_console do
             puts Rainbow(
@@ -516,7 +601,9 @@ module ConfCtl::Cli
             ).yellow
           end
 
-          raise "Error while activating configuration on #{host}" unless nix.activate(machine, toplevel, 'dry-activate')
+          unless nix.activate(machine, generation, 'dry-activate')
+            raise "Error while activating configuration on #{host}"
+          end
         end
 
         lw.sync_console do
@@ -526,12 +613,25 @@ module ConfCtl::Cli
           ).yellow
         end
 
-        return :skip if opts[:interactive] && !ask_confirmation(always: true)
+        return unless opts[:interactive]
+
+        options = {}
+        options['y'] = 'Continue'
+        options['r'] = 'Retry' if opts['dry-activate-first']
+        options['s'] = 'Skip'
+        options['a'] = 'Abort'
 
-        raise "Error while activating configuration on #{host}" unless nix.activate(machine, toplevel, action)
+        answer = ask_action(options:, default: nil)
 
-        if %w[boot switch].include?(action) && !nix.set_profile(machine, toplevel)
-          raise "Error while setting profile on #{host}"
+        case answer
+        when 'y'
+          return
+        when 'r'
+          next
+        when 's'
+          return :skip
+        when 'a'
+          raise 'Aborting'
         end
       end
     end
@@ -540,6 +640,9 @@ module ConfCtl::Cli
       if machine.localhost?
         puts Rainbow("Skipping reboot of #{host} as it is localhost").yellow
         return :skip
+      elsif machine.carried?
+        puts Rainbow("Skipping reboot of carried machine #{host}").yellow
+        return :skip
       end
 
       puts Rainbow("Rebooting #{host} (#{machine.target_host})").yellow
@@ -761,22 +864,16 @@ module ConfCtl::Cli
       machines.each do |host, machine|
         mc = ConfCtl::MachineControl.new(machine)
 
-        begin
-          puts "#{host}:" unless aggregate
+        puts "#{host}:" unless aggregate
 
-          result = run_ssh_command_on_machine(mc, cmd)
+        result = run_ssh_command_on_machine(mc, cmd)
 
-          if aggregate
-            results[host] = result
-          else
-            puts result.out
-          end
-        rescue TTY::Command::ExitError => e
-          if aggregate
-            results[host] = e
-          else
-            puts e.message
-          end
+        if aggregate
+          results[host] = result
+        elsif result.success?
+          puts result.out
+        else
+          puts result.err
         end
 
         puts unless aggregate
@@ -808,12 +905,8 @@ module ConfCtl::Cli
           tw.add do
             mc = ConfCtl::MachineControl.new(machine)
 
-            begin
-              result = run_ssh_command_on_machine(mc, cmd)
-              results[host] = result
-            rescue TTY::Command::ExitError => e
-              results[host] = e
-            end
+            result = run_ssh_command_on_machine(mc, cmd)
+            results[host] = result
 
             lw.sync_console { pb.advance }
           end
@@ -830,7 +923,13 @@ module ConfCtl::Cli
 
       results.each do |host, result|
         puts "#{host}:"
-        puts result.out
+
+        if result.success?
+          puts result.out
+        else
+          puts result.err
+        end
+
         puts
       end
     end
@@ -844,7 +943,7 @@ module ConfCtl::Cli
         cmd_opts[:in] = opts['input-file']
       end
 
-      mc.execute(*cmd, **cmd_opts)
+      mc.execute!(*cmd, **cmd_opts)
     end
 
     def process_aggregated_results(results)
@@ -868,12 +967,15 @@ module ConfCtl::Cli
     def find_generations(machines, generation_name)
       host_generations = {}
       missing_hosts = []
+      generation_offset = generation_name.to_i if /\A-?\d+\z/ =~ generation_name
 
       machines.each_key do |host|
         list = ConfCtl::Generation::BuildList.new(host)
 
         gen =
-          if generation_name == 'current'
+          if generation_offset
+            list.at_offset(generation_offset)
+          elsif generation_name == 'current'
             list.current
           else
             list[generation_name]
@@ -888,8 +990,17 @@ module ConfCtl::Cli
 
       raise 'No generation found' if host_generations.empty?
 
+      puts 'Resolved host generations:'
+      list_generations(host_generations, missing_hosts:)
+
+      if opts[:interactive]
+        ask_confirmation!
+      else
+        puts
+      end
+
       if missing_hosts.any?
-        ask_confirmation! do
+        ask_confirmation!(always: opts[:interactive]) do
           puts "Generation '#{generation_name}' was not found on the following hosts:"
           missing_hosts.each { |host| puts "  #{host}" }
           puts
@@ -900,21 +1011,59 @@ module ConfCtl::Cli
       host_generations
     end
 
+    def list_generations(host_generations, missing_hosts:)
+      swpin_names = []
+
+      host_generations.each_value do |gen|
+        gen.swpin_names.each do |name|
+          swpin_names << name unless swpin_names.include?(name)
+        end
+      end
+
+      rows = host_generations.map do |host, gen|
+        row = {
+          'name' => host,
+          'generation' => gen.name,
+          'kernel' => gen.kernel_version
+        }
+
+        gen.swpin_specs.each do |name, spec|
+          row[name] = spec.version
+        end
+
+        row
+      end
+
+      missing_hosts.each do |host|
+        rows << { 'name' => host, 'generation' => 'not found' }
+      end
+
+      OutputFormatter.print(
+        rows,
+        %w[name generation kernel] + swpin_names,
+        layout: :columns,
+        sort: %w[name generation]
+      )
+    end
+
     def do_build(machines)
       nix = ConfCtl::Nix.new(
         show_trace: opts['show-trace'],
-        max_jobs: opts['max-jobs']
+        max_jobs: opts['max-jobs'],
+        cores: opts['cores']
       )
-      hosts_swpin_paths = {}
 
       autoupdate_swpins(machines)
       host_swpin_specs = check_swpins(machines)
 
       raise 'one or more swpins need to be updated' unless host_swpin_specs
 
-      machines.each do |host, d|
-        puts Rainbow("Evaluating swpins for #{host}...").bright
-        hosts_swpin_paths[host] = nix.eval_host_swpins(host).update(d.nix_paths)
+      puts Rainbow("Evaluating swpins for #{machines.length} machines...").bright
+
+      hosts_swpin_paths = nix.eval_host_swpins(machines.map { |host, _| host })
+
+      machines.each do |host, m|
+        hosts_swpin_paths[host].update(m.nix_paths)
       end
 
       grps = swpin_build_groups(hosts_swpin_paths)
@@ -996,7 +1145,7 @@ module ConfCtl::Cli
           'Fetching [:bar] :current/:total (:percent)'
         )
 
-        built_generations = nix.build_toplevels(
+        built_generations = nix.build_attributes(
           hosts:,
           swpin_paths:,
           time:,
@@ -1244,5 +1393,21 @@ module ConfCtl::Cli
 
       raise ArgumentError, "invalid time duration '#{interval}'"
     end
+
+    # @param nix [Nix]
+    # @param machine [Machine]
+    # @param generation [Generation::Build]
+    def nix_copy(nix, machine, generation, &)
+      paths = [generation.toplevel]
+      paths << generation.auto_rollback if enable_auto_rollback?(machine, generation)
+
+      nix.copy(machine, paths, &)
+    end
+
+    def enable_auto_rollback?(machine, generation)
+      !opts['disable-auto-rollback'] \
+        && (opts['enable-auto-rollback'] || machine.auto_rollback?) \
+        && generation.auto_rollback
+    end
   end
 end

data/lib/confctl/cli/configuration.rb

@@ -1,8 +1,11 @@
+require_relative '../hook'
 require 'fileutils'
 require 'securerandom'
 
 module ConfCtl::Cli
   class Configuration < Command
+    ConfCtl::Hook.register :configuration_rediscover
+
     DIR_MODE = 0o755
     FILE_MODE = 0o644
 
@@ -238,6 +241,8 @@ module ConfCtl::Cli
 
         f.puts(']')
       end
+
+      ConfCtl::Hook.call(:configuration_rediscover)
     end
 
     protected
@@ -251,8 +256,8 @@ module ConfCtl::Cli
 
         entry_rel_path = File.join(*[rel_path, v].compact)
 
-        if File.exist?(File.join(entry_abs_path, 'module.nix')) \
-           && File.exist?(File.join(entry_abs_path, 'config.nix'))
+        if File.exist?(File.join(entry_abs_path, 'module.nix')) &&
+           File.exist?(File.join(entry_abs_path, 'config.nix'))
           ret << entry_rel_path
         end
 

data/lib/confctl/cli/gen_data.rb

@@ -78,10 +78,28 @@ module ConfCtl::Cli
         q.echo = false
       end.to_s
 
-      @vpsadmin_client.authenticate(:basic, user:, password:)
+      @vpsadmin_client.authenticate(:token, user:, password:, lifetime: 'fixed', interval: 60) do |_action, params|
+        ret = {}
+
+        params.each do |name, desc|
+          ret[name] = read_auth_param(name, desc)
+        end
+
+        ret
+      end
+
       @vpsadmin_client
     end
 
+    def read_auth_param(name, p)
+      prompt = "#{p[:label] || name}: "
+
+      ask(prompt) do |q|
+        q.default = nil
+        q.echo = !p[:protected]
+      end
+    end
+
     def update_file(relpath, &)
       abs = File.join(data_dir, relpath)
       tmp = "#{abs}.new"

data/lib/confctl/cli/generation.rb

@@ -11,6 +11,7 @@ module ConfCtl::Cli
     def remove
       machines = select_machines(args[0])
       gens = select_generations(machines, args[1])
+      changed_hosts = []
 
       if gens.empty?
         puts 'No generations found'
@@ -27,21 +28,36 @@ module ConfCtl::Cli
       gens.each do |gen|
         puts "Removing #{gen.presence_str} generation #{gen.host}@#{gen.name}"
         gen.destroy
+
+        changed_hosts << gen.host unless changed_hosts.include?(gen.host)
       end
 
       return unless opts[:remote] && opts[:gc]
 
-      machines_gc = machines.select do |host, _machine|
-        gens.detect { |gen| gen.host == host }
+      machines_gc = {}
+
+      machines.each do |host, machine|
+        next unless changed_hosts.include?(host)
+
+        m =
+          if machine.carried?
+            machine.carrier_machine
+          else
+            machine
+          end
+
+        machines_gc[m.name] = m if m.target_host
       end
 
-      run_gc(machines_gc)
+      run_gc(ConfCtl::MachineList.new(machines: machines_gc))
     end
 
     def rotate
       machines = select_machines(args[0])
 
       to_delete = []
+      changed_hosts = []
+      enable_gc = opts[:remote] && opts[:gc]
 
       to_delete.concat(host_generations_rotate(machines)) if opts[:remote]
 
@@ -56,33 +72,41 @@ module ConfCtl::Cli
         puts 'The following generations will be removed:'
         OutputFormatter.print(to_delete, %i[host name type id], layout: :columns)
         puts
-        puts "Garbage collection: #{opts[:remote] ? 'when enabled in configuration' : 'no'}"
+        puts "Garbage collection: #{enable_gc ? 'when enabled in configuration' : 'no'}"
       end
 
       to_delete.each do |gen|
         puts "Removing #{gen[:type]} generation #{gen[:host]}@#{gen[:name]}"
         gen[:generation].destroy
+
+        changed_hosts << gen[:host] unless changed_hosts.include?(gen[:host])
       end
 
-      return unless opts[:remote]
+      return unless enable_gc
 
       global = ConfCtl::Settings.instance.host_generations
+      machines_gc = {}
+
+      machines.each do |host, machine|
+        next unless changed_hosts.include?(host)
 
-      machines_gc = machines.select do |_host, machine|
-        gc = machine['buildGenerations']['collectGarbage']
+        m =
+          if machine.carried?
+            machine.carrier_machine
+          else
+            machine
+          end
 
-        if gc.nil?
-          global['collectGarbage']
-        else
-          gc
-        end
+        next if !m.target_host || (!m['buildGenerations']['collectGarbage'] && !global['collectGarbage'])
+
+        machines_gc[m.name] = m
       end
 
-      run_gc(machines_gc) if machines_gc.any?
+      run_gc(ConfCtl::MachineList.new(machines: machines_gc)) if machines_gc.any?
     end
 
     def collect_garbage
-      machines = select_machines(args[0])
+      machines = select_machines(args[0]).runnable
 
       raise 'No machines to collect garbage on' if machines.empty?
 
@@ -131,12 +155,16 @@ module ConfCtl::Cli
       select_older_than =
         (Time.now - (::Regexp.last_match(1).to_i * 24 * 60 * 60) if !select_old && /\A(\d+)d\Z/ =~ pattern)
 
+      gen_at = gens.at_offset(pattern.to_i) if /\A-?\d+\z/ =~ pattern
+
       if pattern
         gens.delete_if do |gen|
           if select_old
             gen.current
           elsif select_older_than
             gen.date >= select_older_than
+          elsif gen_at
+            gen != gen_at
           else
             !ConfCtl::Pattern.match?(pattern, gen.name)
           end
@@ -295,6 +323,8 @@ module ConfCtl::Cli
         retvals = executor.run
         failed = retvals.compact
 
+        lw.flush
+
         raise "Gargabe collection failed on: #{failed.join(', ')}" if failed.any?
       end
     end
@@ -314,7 +344,8 @@ module ConfCtl::Cli
           'name' => gen.name,
           'id' => gen.id,
           'presence' => gen.presence_str,
-          'current' => gen.current_str
+          'current' => gen.current_str,
+          'kernel' => gen.kernel_version
         }
 
         gen.swpin_specs.each do |name, spec|
@@ -326,7 +357,7 @@ module ConfCtl::Cli
 
       OutputFormatter.print(
         rows,
-        %w[host name id presence current] + swpin_names,
+        %w[host name id presence current kernel] + swpin_names,
         layout: :columns,
         sort: %w[name host]
       )