foreman-tasks 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b653c4a46abfb110f3a5c1ff0f130814110475989e364d39aa2756bc76c4ae2
-  data.tar.gz: b7ad044c96a9cd2f7f7dbf10416ce42b88e5f2ddaf4fe5cbed696cfde39dee32
+  metadata.gz: c5d611523d1262879b33177bf9c1f4c394142fee8433c2fda798cb4063b60f99
+  data.tar.gz: 1e7974c6fde725d0fe46dcffd6793c7f4b078c3c6e2e3429dce42180e61e4044
 SHA512:
-  metadata.gz: b0525a6e659bf05476e86b69c6147600463f16274e71fc15b1ccee628011a785dc53fc6b8cad0ef5f3439cac8c6581a73cea7a1175c4489778f5204fe3914c76
-  data.tar.gz: feab08efc57055c27fab6010dd1f5dac438f74091dee9c239da5722a7236eacf467433f17838066e3ef707f2268e39e2f3130615a25a9094286a9c65d66b2485
+  metadata.gz: 6f358b767cf2c8f2f6d31a43aa6c1fca27a6db053311d4540cea15d11c7c76758db192d5b39ecef17fcfc9d89e9e99a233c6b3d14fadd41efcca709aea37704b
+  data.tar.gz: 9c08bf19e2f8bdc05add76a9b8e9b783407b03ba99f0c47325454468a4654e44296f8dafd87e40a5d58ed771edb58900c0ac41738202efce5043193b5580a50c

data/.github/workflows/js_tests.yml

@@ -12,7 +12,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [10, 12]
+        node-version:
+          - 12
+          - 14
     steps:
       - uses: actions/checkout@v2
       - name: Setup Node

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/models/foreman_tasks/task/dynflow_task.rb

@@ -219,19 +219,24 @@ module ForemanTasks
     def self.consistency_check
       fixed_count = 0
       logger = Foreman::Logging.logger('foreman-tasks')
-      running.each do |task|
-        changes = task.update_from_dynflow(task.execution_plan)
+
+      # Dynflow execution plans which are not stopped at this point should
+      # eventually get moving and their tasks should eventually get back in sync
+      # as the execution plans run
+      joins('LEFT JOIN dynflow_execution_plans ON foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid::varchar')
+        .where('foreman_tasks_tasks.state_updated_at < dynflow_execution_plans.ended_at')
+        .find_each do |task|
+        changes = task.update_from_dynflow(task.execution_plan.to_hash)
         unless changes.empty?
           fixed_count += 1
           logger.warn('Task %s updated at consistency check: %s' % [task.id, changes.inspect])
         end
       rescue => e
-        # if we fail updating the data from dynflow, it usually means there is something
-        # odd with the data consistency and at this point it is not possible to resume, switching
-        # the task to stopped/error
         task.update(:state => 'stopped', :result => 'error')
         Foreman::Logging.exception("Failed at consistency check for task #{task.id}", e, :logger => 'foreman-tasks')
       end
+      # Wipe tasks left behind by now stopped tasks
+      ForemanTasks::Lock.left_joins(:task).merge(where(:state => 'stopped')).destroy_all
       fixed_count
     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/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,10 @@ 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
+      ::ForemanTasks.dynflow.config.on_init(true) do
+        ::ForemanTasks::Task::DynflowTask.consistency_check
       end
     end
 

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '7.1.0'.freeze
+  VERSION = '7.2.0'.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")