confctl 2.2.2 → 3.0.0

data/lib/confctl/cli/migrate.rb

@@ -0,0 +1,5 @@
+module ConfCtl::Cli
+  module Migrate; end
+end
+
+require_rel 'migrate'

data/lib/confctl/cli/output_formatter.rb

@@ -2,13 +2,13 @@ require 'rainbow'
 
 module ConfCtl::Cli
   class OutputFormatter
-    def self.to_s(*args)
-      f = new(*args)
+    def self.to_s(*)
+      f = new(*)
       f.to_s
     end
 
-    def self.print(*args, **kwargs)
-      f = new(*args, **kwargs)
+    def self.print(*, **)
+      f = new(*, **)
       f.print
     end
 
@@ -33,7 +33,7 @@ module ConfCtl::Cli
         @cols = parse_cols(cols)
 
       elsif @objects.is_a?(::Array)
-        if @objects.count == 0
+        if @objects.none?
           @cols = []
         else
           @cols ||= parse_cols(@objects.first.keys)
@@ -185,9 +185,7 @@ module ConfCtl::Cli
             v = o[i]
           end
 
-          # rubocop:disable Lint/FormatParameterMismatch
           line format("%#{w}s:  %s", c[:label], v)
-          # rubocop:enable Lint/FormatParameterMismatch
         end
 
         line

data/lib/confctl/cli/swpins/base.rb

@@ -5,6 +5,15 @@ module ConfCtl::Cli
   class Swpins::Base < Command
     include Swpins::Utils
 
+    def initialize(...)
+      super
+
+      return unless ConfCtl::ConfigType.flake?(ConfCtl::ConfDir.path)
+
+      raise ConfCtl::Error,
+            'swpins are not supported in flake configs; use `confctl inputs ls` / `confctl inputs update`'
+    end
+
     def update
       run_command(Swpins::Core, :update)
       run_command(Swpins::Channel, :update)

data/lib/confctl/cli/swpins/channel.rb

@@ -1,10 +1,7 @@
-require 'confctl/cli/command'
-require 'confctl/cli/swpins/utils'
+require 'confctl/cli/swpins/base'
 
 module ConfCtl::Cli
-  class Swpins::Channel < Command
-    include Swpins::Utils
-
+  class Swpins::Channel < Swpins::Base
     def list
       rows = []
 

data/lib/confctl/cli/swpins/cluster.rb

@@ -1,10 +1,7 @@
-require 'confctl/cli/command'
-require 'confctl/cli/swpins/utils'
+require 'confctl/cli/swpins/base'
 
 module ConfCtl::Cli
-  class Swpins::Cluster < Command
-    include Swpins::Utils
-
+  class Swpins::Cluster < Swpins::Base
     def list
       rows = []
 

data/lib/confctl/cli/swpins/core.rb

@@ -1,10 +1,7 @@
-require 'confctl/cli/command'
-require 'confctl/cli/swpins/utils'
+require 'confctl/cli/swpins/base'
 
 module ConfCtl::Cli
-  class Swpins::Core < Command
-    include Swpins::Utils
-
+  class Swpins::Core < Swpins::Base
     def list
       core = ConfCtl::Swpins::Core.get
 

data/lib/confctl/config_type.rb

@@ -0,0 +1,7 @@
+module ConfCtl
+  module ConfigType
+    def self.flake?(conf_dir)
+      File.exist?(File.join(conf_dir, 'flake.nix'))
+    end
+  end
+end

data/lib/confctl/flake_lock.rb

@@ -0,0 +1,78 @@
+require 'json'
+
+module ConfCtl
+  class FlakeLock
+    def self.load(path)
+      new(path, JSON.parse(File.read(path)))
+    end
+
+    def self.load_optional(path)
+      return nil unless File.exist?(path)
+
+      load(path)
+    end
+
+    attr_reader :path, :data
+
+    def initialize(path, data)
+      @path = path
+      @data = data
+    end
+
+    def root_inputs
+      inputs_map = data.dig('nodes', 'root', 'inputs') || {}
+      inputs_map.keys.sort
+    end
+
+    def node_for_input(input_name)
+      node_id = data.dig('nodes', 'root', 'inputs', input_name)
+
+      if node_id.is_a?(String)
+        return data.dig('nodes', node_id)
+      end
+
+      if node_id.is_a?(Array) && node_id[0].is_a?(String)
+        return data.dig('nodes', node_id[0])
+      end
+
+      nil
+    end
+
+    def input_info(input_name)
+      node = node_for_input(input_name) || {}
+      locked = node['locked'] || {}
+      original = node['original'] || {}
+
+      type = locked['type'] || original['type'] || '-'
+      rev = locked['rev']
+      short_rev = rev ? rev[0, 8] : nil
+      ref = original['ref'] || locked['ref']
+      url = derive_url(original, locked)
+
+      {
+        type: type,
+        rev: rev,
+        short_rev: short_rev,
+        ref: ref,
+        url: url,
+        locked: locked,
+        original: original
+      }
+    end
+
+    def derive_url(original, locked)
+      url = (locked && locked['url']) || (original && original['url'])
+      url = url.sub(/^git\+/, '') if url.is_a?(String)
+
+      if (locked && locked['type'] == 'github') || (original && original['type'] == 'github')
+        owner = (locked && locked['owner']) || (original && original['owner'])
+        repo = (locked && locked['repo']) || (original && original['repo'])
+        if owner && repo
+          return "https://github.com/#{owner}/#{repo}"
+        end
+      end
+
+      url
+    end
+  end
+end

data/lib/confctl/flake_lock_diff.rb

@@ -0,0 +1,36 @@
+module ConfCtl
+  class FlakeLockDiff
+    Change = Struct.new(
+      :name,
+      :old_info,
+      :new_info
+    ) do
+      def old_rev = old_info && old_info[:rev]
+      def new_rev = new_info && new_info[:rev]
+      def old_short_rev = old_info && old_info[:short_rev]
+      def new_short_rev = new_info && new_info[:short_rev]
+      def url = (new_info && new_info[:url]) || (old_info && old_info[:url])
+
+      def changed?
+        old_rev != new_rev
+      end
+    end
+
+    def self.diff(old_lock, new_lock, inputs: nil)
+      return [] if new_lock.nil?
+
+      names =
+        if inputs.nil?
+          new_lock.root_inputs
+        else
+          inputs
+        end
+
+      names.map do |name|
+        old_info = old_lock&.input_info(name)
+        new_info = new_lock.input_info(name)
+        Change.new(name: name, old_info: old_info, new_info: new_info)
+      end.select(&:changed?)
+    end
+  end
+end

data/lib/confctl/generation/build.rb

@@ -7,6 +7,9 @@ module ConfCtl
     # @return [String]
     attr_reader :host
 
+    # @return [String]
+    attr_reader :mode
+
     # @return [String]
     attr_reader :name
 
@@ -28,6 +31,12 @@ module ConfCtl
     # @return [Hash]
     attr_reader :swpin_specs
 
+    # @return [Hash, nil]
+    attr_reader :inputs_info
+
+    # @return [Hash, nil]
+    attr_reader :inputs
+
     # @param current [Boolean]
     # @return [Boolean]
     attr_accessor :current
@@ -45,14 +54,38 @@ module ConfCtl
     # @param swpin_paths [Hash]
     # @param swpin_specs [Hash]
     # @param date [Time]
-    def create(toplevel, auto_rollback, swpin_paths, swpin_specs, date: nil)
+    # @param inputs_info [Hash, nil]
+    # @param inputs [Hash, nil]
+    def create(toplevel, auto_rollback, swpin_paths, swpin_specs, date: nil, inputs_info: nil, inputs: nil)
+      @mode = 'swpins'
       @toplevel = toplevel
       @auto_rollback = auto_rollback
       @swpin_names = swpin_paths.keys
       @swpin_paths = swpin_paths
       @swpin_specs = swpin_specs
+      @inputs_info = inputs_info
+      @inputs = inputs
+      @date = date || Time.now
+      @name = @date.strftime('%Y-%m-%d--%H-%M-%S')
+      @kernel_version = extract_kernel_version
+    end
+
+    # @param toplevel [String]
+    # @param auto_rollback [String]
+    # @param inputs [Hash]
+    # @param inputs_info [Hash]
+    # @param date [Time]
+    def create_flake(toplevel, auto_rollback, inputs:, inputs_info:, date: nil)
+      @mode = 'flakes'
+      @toplevel = toplevel
+      @auto_rollback = auto_rollback
+      @inputs = inputs
+      @inputs_info = inputs_info
+      @swpin_names = []
+      @swpin_paths = {}
+      @swpin_specs = {}
       @date = date || Time.now
-      @name = date.strftime('%Y-%m-%d--%H-%M-%S')
+      @name = @date.strftime('%Y-%m-%d--%H-%M-%S')
       @kernel_version = extract_kernel_version
     end
 
@@ -61,6 +94,7 @@ module ConfCtl
       @name = name
 
       cfg = JSON.parse(File.read(config_path))
+      @mode = cfg['mode'] || 'swpins'
       @toplevel = cfg['toplevel']
       @auto_rollback = cfg['auto_rollback']
 
@@ -68,14 +102,22 @@ module ConfCtl
       @swpin_paths = {}
       @swpin_specs = {}
 
-      cfg['swpins'].each do |swpin_name, swpin|
-        @swpin_names << swpin_name
-        @swpin_paths[swpin_name] = swpin['path']
-        @swpin_specs[swpin_name] = Swpins::Spec.for(swpin['spec']['type'].to_sym).new(
-          swpin_name,
-          swpin['spec']['nix_options'],
-          swpin['spec']
-        )
+      if flakes_mode?
+        @inputs = cfg['inputs'] || {}
+        @inputs_info = cfg['inputs_info'] || cfg['inputsInfo'] || {}
+      else
+        cfg['swpins'].each do |swpin_name, swpin|
+          @swpin_names << swpin_name
+          @swpin_paths[swpin_name] = swpin['path']
+          @swpin_specs[swpin_name] = Swpins::Spec.for(swpin['spec']['type'].to_sym).new(
+            swpin_name,
+            swpin['spec']['nix_options'],
+            swpin['spec']
+          )
+        end
+
+        @inputs_info = cfg['inputs_info'] || cfg['inputsInfo']
+        @inputs = cfg['inputs']
       end
 
       @date = Time.iso8601(cfg['date'])
@@ -89,19 +131,45 @@ module ConfCtl
       File.symlink(toplevel, toplevel_path)
       File.symlink(auto_rollback, auto_rollback_path)
 
-      swpin_paths.each do |name, path|
-        File.symlink(path, swpin_path(name))
+      if flakes_mode?
+        (inputs || {}).each do |role, path|
+          File.symlink(path, input_path(role))
+        end
+      else
+        swpin_paths.each do |name, path|
+          File.symlink(path, swpin_path(name))
+        end
       end
 
       File.open(config_path, 'w') do |f|
-        f.puts(JSON.pretty_generate({
-          date: date.iso8601,
-          toplevel:,
-          auto_rollback:,
-          swpins: swpin_paths.to_h do |name, path|
-            [name, { path:, spec: swpin_specs[name].as_json }]
+        data =
+          if flakes_mode?
+            {
+              mode: 'flakes',
+              date: date.iso8601,
+              toplevel:,
+              auto_rollback:,
+              inputs: inputs || {},
+              inputs_info: inputs_info || {}
+            }
+          else
+            {
+              mode: 'swpins',
+              date: date.iso8601,
+              toplevel:,
+              auto_rollback:,
+              swpins: swpin_paths.to_h do |name, path|
+                [name, { path:, spec: swpin_specs[name].as_json }]
+              end
+            }
           end
-        }))
+
+        if swpins_mode?
+          data[:inputs_info] = inputs_info if inputs_info
+          data[:inputs] = inputs if inputs
+        end
+
+        f.puts(JSON.pretty_generate(data))
       end
 
       add_gcroot
@@ -117,7 +185,18 @@ module ConfCtl
         # Older generations might not have auto_rollback
       end
 
-      swpin_paths.each_key { |name| File.unlink(swpin_path(name)) }
+      if flakes_mode?
+        (inputs || {}).each_key do |role|
+          path = input_path(role)
+          File.unlink(path) if File.exist?(path) || File.symlink?(path)
+        end
+      else
+        swpin_paths.each_key do |name|
+          path = swpin_path(name)
+          File.unlink(path) if File.exist?(path) || File.symlink?(path)
+        end
+      end
+
       File.unlink(config_path)
       Dir.rmdir(dir)
     end
@@ -125,16 +204,28 @@ module ConfCtl
     def add_gcroot
       GCRoot.add(gcroot_name('toplevel'), toplevel_path)
       GCRoot.add(gcroot_name('auto_rollback'), auto_rollback_path)
-      swpin_paths.each_key do |name|
-        GCRoot.add(gcroot_name("swpin.#{name}"), toplevel_path)
+      if flakes_mode?
+        (inputs || {}).each_key do |role|
+          GCRoot.add(gcroot_name("input.#{role}"), input_path(role))
+        end
+      else
+        swpin_paths.each_key do |name|
+          GCRoot.add(gcroot_name("swpin.#{name}"), swpin_path(name))
+        end
       end
     end
 
     def remove_gcroot
       GCRoot.remove(gcroot_name('toplevel'))
       GCRoot.remove(gcroot_name('auto_rollback'))
-      swpin_paths.each_key do |name|
-        GCRoot.remove(gcroot_name("swpin.#{name}"))
+      if flakes_mode?
+        (inputs || {}).each_key do |role|
+          GCRoot.remove(gcroot_name("input.#{role}"))
+        end
+      else
+        swpin_paths.each_key do |name|
+          GCRoot.remove(gcroot_name("swpin.#{name}"))
+        end
       end
     end
 
@@ -142,6 +233,18 @@ module ConfCtl
       @dir ||= File.join(ConfDir.generation_dir, escaped_host, name)
     end
 
+    def swpins_mode?
+      mode != 'flakes'
+    end
+
+    def flakes_mode?
+      mode == 'flakes'
+    end
+
+    def pin_paths
+      flakes_mode? ? (inputs || {}) : (swpin_paths || {})
+    end
+
     protected
 
     def config_path
@@ -160,6 +263,10 @@ module ConfCtl
       File.join(dir, "#{name}.swpin")
     end
 
+    def input_path(role)
+      File.join(dir, "#{role}.input")
+    end
+
     def escaped_host
       @escaped_host ||= ConfCtl.safe_host_name(host)
     end

data/lib/confctl/generation/build_list.rb

@@ -87,11 +87,12 @@ module ConfCtl
     end
 
     # @param toplevel [String]
-    # @param swpin_paths [Hash]
+    # @param pin_paths [Hash]
+    # @param mode [String]
     # @return [Generation::Build, nil]
-    def find(toplevel, swpin_paths)
+    def find(toplevel, pin_paths, mode: 'swpins')
       generations.detect do |gen|
-        gen.toplevel == toplevel && gen.swpin_paths == swpin_paths
+        gen.toplevel == toplevel && gen.mode == mode && gen.pin_paths == pin_paths
       end
     end
 

data/lib/confctl/generation/unified.rb

@@ -76,7 +76,8 @@ module ConfCtl
 
       if build_generation && gen.is_a?(Generation::Build)
         build_generation.name == gen.name \
-          && build_generation.swpin_paths == gen.swpin_paths
+          && build_generation.mode == gen.mode \
+          && build_generation.pin_paths == gen.pin_paths
       else
         true
       end
@@ -88,6 +89,18 @@ module ConfCtl
       end
     end
 
+    def inputs_info
+      build_generation ? build_generation.inputs_info : nil
+    end
+
+    def inputs
+      build_generation ? build_generation.inputs : nil
+    end
+
+    def flakes_mode?
+      build_generation ? build_generation.flakes_mode? : false
+    end
+
     def current_str
       build = build_generation && build_generation.current
       host = host_generation && host_generation.current

data/lib/confctl/git_repo_mirror.rb

@@ -55,10 +55,10 @@ module ConfCtl
 
     attr_reader :cmd, :quiet
 
-    def git_repo(git_cmd, *args, **kwargs)
+    def git_repo(git_cmd, *, **kwargs)
       kwargs[:gopts] ||= []
       kwargs[:gopts] << '-C' << mirror_path
-      git(git_cmd, *args, **kwargs)
+      git(git_cmd, *, **kwargs)
     end
 
     def git(git_cmd, args: [], opts: [], gopts: [])

data/lib/confctl/health_checks/run_command.rb

@@ -1,4 +1,5 @@
 require 'confctl/health_checks/base'
+require 'shellwords'
 
 module ConfCtl
   class HealthChecks::RunCommand < HealthChecks::Base
@@ -82,14 +83,14 @@ module ConfCtl
       end
 
       def to_s
-        @command.join(' ')
+        Shellwords.join(@command)
       end
 
       protected
 
       def make_command(machine, args)
         args.map do |arg|
-          arg.gsub(/\{([^\}]+)\}/) do
+          arg.gsub(/\{([^}]+)\}/) do
             machine[::Regexp.last_match(1)]
           end
         end

data/lib/confctl/health_checks/systemd/properties.rb

@@ -34,7 +34,7 @@ module ConfCtl
         ret << 'systemd: '
       end
 
-      ret << @property_checks.map(&:to_s).join(', ')
+      ret << @property_checks.join(', ')
       ret
     end
 

data/lib/confctl/health_checks/systemd/property_list.rb

@@ -1,9 +1,9 @@
 module ConfCtl
   class HealthChecks::Systemd::PropertyList < Hash
-    def self.from_enumerator(it)
+    def self.from_enumerator(lines)
       hash = new
 
-      it.each do |line|
+      lines.each do |line|
         stripped = line.strip
         eq = line.index('=')
         next if eq.nil?