foreman_discovery 22.0.2 → 23.0.0

data/app/controllers/discovered_hosts_controller.rb

@@ -35,7 +35,7 @@ class DiscoveredHostsController < ::ApplicationController
       :discovery_attribute_set
     ], {:interfaces => :subnet})
     fact_array = @hosts.collect do |host|
-      [host.id, Hash[host.fact_values.joins(:fact_name).where('fact_names.name' => Setting::Discovered.discovery_fact_column_array).pluck(:name, :value)]]
+      [host.id, Hash[host.fact_values.joins(:fact_name).where('fact_names.name' => Setting['discovery_fact_column']).pluck(:name, :value)]]
     end
     @host_facts = Hash[fact_array]
   end
@@ -198,6 +198,10 @@ class DiscoveredHostsController < ::ApplicationController
     end
   end
 
+  def resource_class
+    Host::Discovered
+  end
+
   private
 
   def setup_host_class_variables

data/app/helpers/discovered_hosts_helper.rb

@@ -94,8 +94,15 @@ module DiscoveredHostsHelper
   end
 
   def host_path(host)
-    return super unless controller_name == 'discovered_hosts'
-    discovered_host_path(host)
+    return discovered_host_path(host) if controller_name == 'discovered_hosts'
+    # This is a hack to fix the hostgroup selection on the discovered host edit page
+    # The hostgroup onChange action is replacing the form url from `/discovered_hosts/:id`
+    # to `/hosts/:id``, which is not correct (in this case) and it breaks the form submission
+    return discovered_host_path(host) if controller_name == 'hosts' &&
+                                         action_name == 'process_hostgroup' &&
+                                         Host::Discovered.find_by(id: host[:id])
+
+    super
   end
 
   def discovery_doc_version

data/app/models/host/discovered.rb

@@ -63,15 +63,15 @@ class Host::Discovered < ::Host::Base
     bootif_mac = FacterUtils::bootif_mac(facts).try(:downcase)
     hostname = ''
     if Setting[:discovery_naming] == 'MAC-name'
-      hostname_mac = return_first_valid_mac(Setting::Discovered.discovery_hostname_fact_array, facts) || bootif_mac
+      hostname_mac = return_first_valid_mac(Setting['discovery_hostname'], facts) || bootif_mac
       hostname = NameGenerator.new.generate_next_mac_name(hostname_mac)
     elsif Setting[:discovery_naming] == 'Random-name'
       hostname = NameGenerator.new.generate_next_random_name
     else
       prefix_from_settings = Setting[:discovery_prefix]
       hostname_prefix = prefix_from_settings if prefix_from_settings.present? && prefix_from_settings.match(/^[a-zA-Z].*/)
-      name_fact = return_first_valid_fact(Setting::Discovered.discovery_hostname_fact_array, facts)
-      raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"), Setting::Discovered.discovery_hostname_fact_array.join(', '))) unless name_fact && name_fact.present?
+      name_fact = return_first_valid_fact(Setting['discovery_hostname'], facts)
+      raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"), Setting['discovery_hostname'].join(', '))) unless name_fact && name_fact.present?
       hostname = normalize_string_for_hostname("#{hostname_prefix}#{name_fact}")
     end
     Rails.logger.warn "Hostname does not start with an alphabetical character" unless hostname.downcase.match(/^[a-z]/)

data/app/services/foreman_discovery/import_hooks/lock_templates.rb

@@ -3,7 +3,7 @@ module ForemanDiscovery
   module ImportHooks
     class LockTemplates < ImportHook
       def after_populate
-        lock_templates if Setting::Discovered.discovery_lock? && host.subnet.tftp?
+        lock_templates if Setting['discovery_lock'] && host.subnet.tftp?
       end
 
       def lock_templates

data/app/services/foreman_discovery/node_api/node_resource.rb

@@ -1,8 +1,8 @@
 module ForemanDiscovery::NodeAPI
   class NodeResource
     def initialize(args)
-      raise ArgumentError, "Options must be hash" unless args.is_a?(Hash)
-      raise ArgumentError, "Option 'url' must be provided" unless args[:url]
+      raise ArgumentError, _("Options must be hash") unless args.is_a?(Hash)
+      raise ArgumentError, _("Option 'url' must be provided") unless args[:url]
       @args = args
       @connect_params = {
         :headers => { :accept => :json },
@@ -38,19 +38,19 @@ module ForemanDiscovery::NodeAPI
     def scheme
       URI.parse(url).scheme
     rescue Exception => e
-      raise ArgumentError, "Option 'url' must be valid URI: #{e}"
+      raise ArgumentError, _("Option 'url' must be valid URI: %s") % e
     end
 
     def port
       URI.parse(url).port
     rescue Exception => e
-      raise ArgumentError, "Option 'url' must be valid URI: #{e}"
+      raise ArgumentError, _("Option 'url' must be valid URI: %s") % e
     end
 
     def root_path
       URI.parse(url).path
     rescue Exception => e
-      raise ArgumentError, "Option 'url' must be valid URI: #{e}"
+      raise ArgumentError, _("Option 'url' must be valid URI: %s") % e
     end
 
     def is_proxy?

data/app/services/foreman_discovery/ui_notifications/failed_discovery.rb

@@ -21,7 +21,7 @@ module ForemanDiscovery
         Notification.create!(
           initiator: initiator,
           audience: ::Notification::AUDIENCE_ADMIN,
-          message: _("One or more hosts with failed discovery due to error: #{@message}"),
+          message: _("One or more hosts with failed discovery due to error: %s") % @message,
           notification_blueprint: blueprint,
         )
       end

data/app/views/discovered_hosts/_discovered_host.html.erb

@@ -6,7 +6,7 @@
 <td class="hidden-tablet hidden-xs"><%= discovery_attribute(host, :disk_count) %></td>
 <td class="hidden-tablet hidden-xs"><%= number_to_human_size(discovery_attribute(host, :disks_size, 0) * 1024 * 1024) %></td>
 <%
-  Setting::Discovered.discovery_fact_column_array.each do |name|
+  Setting['discovery_fact_column'].each do |name|
 %>
 <td class="hidden-tablet hidden-xs"><%= @host_facts[host.id][name] || 'N/A' %></td>
 <% end %>

data/app/views/discovered_hosts/_discovered_hosts_list.html.erb

@@ -10,7 +10,7 @@
       <th class="hidden-tablet hidden-xs"><%= sort :memory, :as => _('Memory') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :disk_count, :as => _('Disk Count') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :disks_size, :as => _('Disks Size') %></th>
-      <% Setting::Discovered.discovery_fact_column_array.each do |fact_column| %>
+      <% Setting['discovery_fact_column'].each do |fact_column| %>
         <th class="hidden-tablet hidden-xs"><%= fact_column.capitalize %></th>
       <% end %>
       <th class="hidden-tablet hidden-xs"><%= sort :location, :as => _('Location') %></th>

data/db/migrate/20221102065954_fix_discovery_settings_category_to_dsl.rb

@@ -3,7 +3,7 @@
 class FixDiscoverySettingsCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
     # rubocop:disable Rails/SkipsModelValidations
-    Setting.where(category: 'Setting::Discovered').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::Discovered').update_all(category: 'Setting') if column_exists?(:settings, :category)
     # rubocop:enable Rails/SkipsModelValidations
   end
 end

data/db/migrate/20221102075151_migrate_discovery_hostname_and_fact_column_to_array.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class MigrateDiscoveryHostnameAndFactColumnToArray < ActiveRecord::Migration[6.0]
+  def up
+    ['discovery_hostname', 'discovery_fact_column'].each do |setting_name|
+      setting = Setting.find_by(name: setting_name)
+      if !setting.nil? && setting.value.is_a?(String)
+        setting.value = setting.value.split(",").map(&:strip)
+        setting.save
+      end
+    end
+  end
+end

data/extra/discover-host

@@ -6,7 +6,7 @@ require 'rest-client'
 def find_base name = "default"
   return name if File.exist?(name)
 
-  file = File.absolute_path(File.dirname(__FILE__) + "../../test/facts/#{name}.json")
+  file = File.absolute_path(File.dirname(__FILE__) + "/../test/facts/#{name}.json")
   raise "Unable to find file #{file}" unless File.exist?(file)
 
   file

data/lib/foreman_discovery/engine.rb

@@ -15,25 +15,12 @@ module ForemanDiscovery
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/services"]
 
-    # Load this before the Foreman config initializers, so that the Setting.descendants
-    # list includes the plugin STI setting class
-    initializer 'foreman_discovery.load_default_settings', :before => :load_config_initializers do |app|
-      require_dependency File.expand_path("../../../app/models/setting/discovered.rb", __FILE__) if (Setting.table_exists? rescue(false))
-    end
-
     initializer "foreman_discovery.add_rabl_view_path" do |app|
       Rabl.configure do |config|
         config.view_paths << ForemanDiscovery::Engine.root.join('app', 'views')
       end
     end
 
-    initializer 'foreman_discovery.register_gettext', :after => :load_config_initializers do |app|
-      locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
-      locale_domain = 'foreman_discovery'
-
-      Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
-    end
-
     # Add any db migrations
     initializer "foreman_discovery.load_app_instance_data" do |app|
       ForemanDiscovery::Engine.paths['db/migrate'].existent.each do |path|
@@ -43,7 +30,8 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 3.3'
+        requires_foreman '>= 3.8'
+        register_gettext
 
         # settings
         settings do
@@ -85,10 +73,10 @@ module ForemanDiscovery
               description: N_("Clean all reported facts during provisioning (except discovery facts)")
 
             setting "discovery_hostname",
-              type: :string,
-              default: "discovery_bootif",
+              type: :array,
+              default: ["discovery_bootif"],
               full_name: N_("Hostname facts"),
-              description: N_("List of facts to use for the hostname (separated by comma, first wins)")
+              description: N_("List of facts to use for the hostname (first wins)")
 
             validates "discovery_hostname", presence: true
 
@@ -113,10 +101,10 @@ module ForemanDiscovery
             validates "discovery_prefix", presence: true
 
             setting "discovery_fact_column",
-              type: :string,
-              default: "",
+              type: :array,
+              default: [],
               full_name: N_("Fact columns"),
-              description: N_("Extra facter columns to show in host lists (separate by comma)")
+              description: N_("Extra facter columns to show in host lists")
 
             setting "discovery_facts_highlights",
               type: :string,

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "22.0.2"
+  VERSION = "23.0.0"
 end