foreman_discovery 22.0.4 → 23.0.0

data/app/controllers/discovered_hosts_controller.rb

@@ -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/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/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

@@ -21,13 +21,6 @@ module ForemanDiscovery
       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|
@@ -37,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

data/lib/foreman_discovery/version.rb

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