foreman-tasks 7.1.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b653c4a46abfb110f3a5c1ff0f130814110475989e364d39aa2756bc76c4ae2
-  data.tar.gz: b7ad044c96a9cd2f7f7dbf10416ce42b88e5f2ddaf4fe5cbed696cfde39dee32
+  metadata.gz: aac3cfa51e86a12880e7cf4f12d8189f2b2c58dd50a18843d643dd926d089cf1
+  data.tar.gz: 140c1aa20f3d3ea8e41be0ac81ce317a90445e4d5fa224dfb259cfccac5d93e8
 SHA512:
-  metadata.gz: b0525a6e659bf05476e86b69c6147600463f16274e71fc15b1ccee628011a785dc53fc6b8cad0ef5f3439cac8c6581a73cea7a1175c4489778f5204fe3914c76
-  data.tar.gz: feab08efc57055c27fab6010dd1f5dac438f74091dee9c239da5722a7236eacf467433f17838066e3ef707f2268e39e2f3130615a25a9094286a9c65d66b2485
+  metadata.gz: b956214af8e654f7ce858c99ccab6572b7cc4bcfd6958a593a6330925884a4848bcf9c6a95a293e8cf278bfec2f4f119547c2963b60b177fa361b911d2545e38
+  data.tar.gz: 8b7ba00268393f535320409fbccd4ef9bae0233b965b12eed198698b87495e679f80143791897e3f98357f355a0cf677c3d89b610ba8fcd95d8632ea12841886

data/app/lib/actions/foreman/host/import_facts.rb

@@ -8,12 +8,7 @@ module Actions
 
         def plan(_host_type, host_name, facts, certname, proxy_id)
           facts['domain'].try(:downcase!)
-          host = if SETTINGS[:version].short > '1.16'
-                   ::Host::Managed.import_host(host_name, certname)
-                 else
-                   # backwards compatibility
-                   ::Host::Managed.import_host(host_name, facts['_type'], certname, proxy_id)
-                 end
+          host = ::Host::Managed.import_host(host_name, certname)
           host.save(:validate => false) if host.new_record?
           action_subject(host, :facts => facts.to_unsafe_h, :proxy_id => proxy_id)
           if host.build?

data/app/lib/actions/middleware/watch_delegated_proxy_sub_tasks.rb

@@ -51,7 +51,7 @@ module Actions
 
       def notify(event, tasks)
         tasks.each do |task|
-          action.plan_event(event, execution_plan_id: task.execution_plan_id, step_id: task.step_id)
+          action.plan_event(event, execution_plan_id: task.execution_plan_id, step_id: task.step_id, optional: true)
         end
       end
 

data/app/views/foreman_tasks/recurring_logics/index.html.erb

@@ -1,5 +1,5 @@
 <% title _("Recurring logics") %>
-<% title_actions SETTINGS[:version].short <= '1.13' ? help_path : help_button %>
+<% title_actions help_button %>
 
 <% if @errors %>
 <%= alert(:class => 'alert-info', :id => 'multiple-alert', :close => false, :header => '', :text => @errors) %>

data/config/routes.rb

@@ -72,7 +72,6 @@ Foreman::Application.routes.draw do
         require 'sidekiq/web'
         redis_url = ENV['DYNFLOW_REDIS_URL'] || SETTINGS.dig(:dynflow, :redis_url)
         Sidekiq.redis = { url: redis_url }
-        Sidekiq::Web.set :sessions, false
         mount Sidekiq::Web => '/sidekiq', :constraints => ForemanTasks::Dynflow::SidekiqConsoleConstraint.new
       end
     end

data/lib/foreman_tasks/cleaner.rb

@@ -84,7 +84,7 @@ module ForemanTasks
 
     def self.cleanup_settings
       return @cleanup_settings if @cleanup_settings
-      @cleanup_settings = SETTINGS[:'foreman-tasks'] && SETTINGS[:'foreman-tasks'][:cleanup] || {}
+      @cleanup_settings = SETTINGS.dig(:'foreman-tasks', :cleanup) || {}
     end
 
     def self.actions_by_rules(action_rules)

data/lib/foreman_tasks/dynflow/configuration.rb

@@ -16,7 +16,7 @@ module ForemanTasks
         :backup_deleted_plans => true,
         :backup_dir => default_backup_dir,
       }
-      settings = SETTINGS[:'foreman-tasks'] && SETTINGS[:'foreman-tasks'][:backup]
+      settings = SETTINGS.dig(:'foreman-tasks', :backup)
       backup_options.merge!(settings) if settings
       @backup_settings = with_environment_override backup_options
     end

data/lib/foreman_tasks/engine.rb

@@ -166,7 +166,7 @@ module ForemanTasks
         world.middleware.use Actions::Middleware::KeepCurrentUser, :before => ::Dynflow::Middleware::Common::Transaction
         world.middleware.use Actions::Middleware::KeepCurrentTimezone
         world.middleware.use Actions::Middleware::KeepCurrentRequestID
-        world.middleware.use ::Actions::Middleware::LoadSettingValues if Gem::Version.new(::SETTINGS[:version]) >= Gem::Version.new('2.5')
+        world.middleware.use ::Actions::Middleware::LoadSettingValues
       end
     end
 

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '7.1.0'.freeze
+  VERSION = '7.1.1'.freeze
 end

data/lib/tasks/gettext.rake

@@ -16,6 +16,7 @@ if gettext_find_task
                  .all_action_names
                  .uniq
                  .map { |n| %[_("#{n}")] }
+                 .sort
                  .join("\n")
     end
   end

data/locale/action_names.rb

@@ -1,5 +1,4 @@
 # Autogenerated!
-_("Import Puppet classes")
-_("Import facts")
 _("Action with sub plans")
-_("Remote action:")
+_("Import Puppet classes")
+_("Import facts")