foreman-tasks 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0111beaab4e9971f1039c81e0ccf31ad5cbb79e4
-  data.tar.gz: 0077b9efb0e93957f99a37fe4d08469b6f6b62d2
+SHA256:
+  metadata.gz: 464f9df51dc38a0d63e3e573e462f9f57bc5d091f0bdc0090327229d6b8ecffb
+  data.tar.gz: 5d2f0b357ce12025975c5cd62d2d31637d5cbcff20349e3af89edb213e8c553a
 SHA512:
-  metadata.gz: 0aff56c13e49c3cca9802a8ae63f0f4c024ba69a4b6bb07d9453e236de2571d284895906192c8b52cc2e8ed8300b083e3643d47bf8894fab8fbde55da5bc3364
-  data.tar.gz: 55255ff6e02f84e834b2ea8927364985830f13a0b456c64af503af56b0a76f286e1a94e5ec2fef04b3ee4da48fe905836a242b9baae4efd90f54afe04ee03944
+  metadata.gz: df01ce6f12aec5edd07cfe1ba355d86ad130df011be72c559dc100f92e2dabcfae356aa636bc73454393acd52aa02d569fe3addefe6d4940aa2d9ec2289a0a6d
+  data.tar.gz: 2e6da699d36a27a4f5727475e998ee52e07861e0a2eecd8a879a9b17f6b27121a225edb34f66338939c11e9110bb3fd53f0edc090b113fedb983db5bdd8798f6

data/.rubocop_todo.yml

@@ -1,74 +1,147 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-12-21 14:29:23 +0200 using RuboCop version 0.46.0.
+# on 2018-04-02 18:15:37 +0200 using RuboCop version 0.54.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-Lint/EmptyWhen:
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
   Exclude:
-    - 'app/lib/actions/proxy_action.rb'
+    - 'foreman-tasks.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingBlankLines:
+  Exclude:
+    - 'locale/action_names.rb'
 
-Lint/ShadowingOuterLocalVariable:
+# Offense count: 1
+Lint/EmptyWhen:
   Exclude:
-    - 'bin/dynflow-executor'
+    - 'app/lib/actions/proxy_action.rb'
 
+# Offense count: 2
 Lint/UselessAssignment:
   Exclude:
     - 'lib/foreman_tasks/tasks/export_tasks.rake'
 
+# Offense count: 32
 Metrics/AbcSize:
   Max: 41
 
-# Configuration parameters: CountComments.
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 105
+  Max: 32
 
+# Offense count: 13
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 230
 
+# Offense count: 9
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 9
 
+# Offense count: 482
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 244
+  Max: 211
 
+# Offense count: 54
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 37
+  Max: 29
 
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 170
+  Max: 167
 
+# Offense count: 1
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
 
+# Offense count: 4
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 9
+
+# Offense count: 3
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - 'app/controllers/foreman_tasks/recurring_logics_controller.rb'
+    - 'app/lib/actions/recurring_action.rb'
+    - 'lib/foreman_tasks_core/otp_manager.rb'
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/models/foreman_tasks/task/status_explicator.rb'
+
+# Offense count: 12
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - 'app/helpers/foreman_tasks/foreman_tasks_helper.rb'
+    - 'app/models/foreman_tasks/recurring_logic.rb'
 
+# Offense count: 3
+# Cop supports --auto-correct.
+Rails/ActiveRecordAliases:
+  Exclude:
+    - 'app/models/foreman_tasks/task/dynflow_task.rb'
+    - 'test/factories/task_factory.rb'
+
+# Offense count: 6
 # Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, lib/**/*.rb
-Rails/Exit:
+# Include: db/migrate/*.rb
+Rails/CreateTableWithTimestamps:
+  Exclude:
+    - 'db/migrate/20131205204140_create_foreman_tasks.rb'
+    - 'db/migrate/20131209122644_create_foreman_tasks_locks.rb'
+    - 'db/migrate/20150907124936_create_recurring_logic.rb'
+    - 'db/migrate/20150907131503_create_task_groups.rb'
+    - 'db/migrate/20151112152108_create_triggerings.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: numeric, symbolic
+Rails/HttpStatus:
   Exclude:
-    - 'lib/**/*.rake'
+    - 'app/controllers/foreman_tasks/concerns/hosts_controller_extension.rb'
 
+# Offense count: 1
 # Configuration parameters: Include.
 # Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
 Rails/Output:
   Exclude:
     - 'lib/foreman_tasks/cleaner.rb'
 
+# Offense count: 5
 Rails/OutputSafety:
   Exclude:
     - 'app/helpers/foreman_tasks/foreman_tasks_helper.rb'
 
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Offense count: 11
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
@@ -83,51 +156,37 @@ Style/ClassAndModuleChildren:
     - 'lib/foreman_tasks/dynflow/persistence.rb'
     - 'test/controllers/api/recurring_logics_controller_test.rb'
     - 'test/controllers/api/tasks_controller_test.rb'
-    - 'test/unit/actions/action_with_sub_plans_test.rb'
 
+# Offense count: 2
 Style/DoubleNegation:
   Exclude:
     - 'app/models/foreman_tasks/lock.rb'
     - 'app/models/foreman_tasks/recurring_logic.rb'
 
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
-Naming/FileName:
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/Encoding:
   Exclude:
-    - 'db/seeds.d/20-foreman_tasks_permissions.rb'
-    - 'db/seeds.d/60-dynflow_proxy_feature.rb'
-    - 'db/seeds.d/61-foreman_tasks_bookmarks.rb'
-    - 'lib/foreman-tasks.rb'
+    - 'foreman-tasks-core.gemspec'
+    - 'foreman-tasks.gemspec'
 
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: format, sprintf, percent
-Style/FormatString:
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
   Exclude:
-    - 'app/models/foreman_tasks/task/dynflow_task.rb'
-    - 'lib/foreman_tasks/tasks/export_tasks.rake'
+    - 'foreman-tasks-core.gemspec'
+    - 'foreman-tasks.gemspec'
+    - 'lib/foreman_tasks/engine.rb'
+    - 'script/rails'
 
+# Offense count: 32
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Naming/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/models/foreman_tasks/task/status_explicator.rb'
-
+# Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
   Exclude:
-    - 'lib/foreman_tasks/dynflow/console_authorizer.rb'
-
-# Configuration parameters: Methods.
-# Methods: {"reduce"=>["acc", "elem"]}, {"inject"=>["acc", "elem"]}
-Style/SingleLineBlockParams:
-  Exclude:
-    - 'app/models/foreman_tasks/concerns/action_subject.rb'
-    - 'app/models/foreman_tasks/lock.rb'
+    - 'app/models/foreman_tasks/concerns/action_triggering.rb'

data/README.md

@@ -24,7 +24,7 @@ Please see the Foreman manual for appropriate instructions:
 
 Set up the repo as explained in the link above, then run
 
-    # yum install ruby193-rubygem-foreman-tasks
+    # yum install tfm-rubygem-foreman-tasks
 
 ### Bundle (gem)
 
@@ -131,7 +131,7 @@ The executor process needs to be executed before the web server. You
 can run it by:
 
 ```
-foreman-rake foreman_tasks:dynflow:executor
+foreman-rake dynflow:executor
 ```
 
 Also, there is a possibility to run the executor in daemonized mode

data/app/controllers/foreman_tasks/concerns/hosts_controller_extension.rb

@@ -1,13 +1,7 @@
 module ForemanTasks
   module Concerns
     module HostsControllerExtension
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :facts, :dynflow
-      end
-
-      def facts_with_dynflow
+      def facts
         task = ForemanTasks.async_task(::Actions::Foreman::Host::ImportFacts,
                                        detect_host_type,
                                        params[:name],

data/app/lib/actions/helpers/with_continuous_output.rb

@@ -17,7 +17,12 @@ module Actions
 
       def fill_planning_errors_to_continuous_output(continuous_output)
         execution_plan.errors.map do |e|
-          continuous_output.add_exception(_('Failed to initialize'), e, task.started_at)
+          case e.exception
+          when ::Actions::ProxyAction::ProxyActionMissing
+            continuous_output.add_output(e.message, 'debug', task.started_at)
+          else
+            continuous_output.add_exception(_('Failed to initialize'), e.exception, task.started_at)
+          end
         end
       end
     end

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

@@ -0,0 +1,73 @@
+module Actions
+  module Middleware
+    class WatchDelegatedProxySubTasks < ::Dynflow::Middleware
+      class CheckOnProxyActions; end
+      # Poll the proxy every 10 minutes
+      POLL_INTERVAL = 600
+      BATCH_SIZE = 1000
+
+      def run(event = nil)
+        if event.nil?
+          set_clock
+        elsif event == CheckOnProxyActions
+          check_triggered
+          set_clock
+          action.send(:suspend)
+        end
+        pass event
+      end
+
+      private
+
+      def set_clock
+        action.world.clock.ping action.send(:suspended_action),
+                                POLL_INTERVAL,
+                                CheckOnProxyActions
+      end
+
+      def check_triggered
+        # Sort by proxy_url so there are less requests per proxy
+        source = remote_tasks.triggered.order(:proxy_url, :id)
+        source.find_in_batches(:batch_size => BATCH_SIZE) do |batch|
+          tasks = batch.group_by(&:proxy_url)
+                       .map { |(url, tasks)| poll_proxy_tasks(url, tasks) }
+                       .flatten
+          process_task_results tasks
+        end
+      end
+
+      def process_task_results(tasks)
+        missing, present = tasks.partition { |task| task.result.nil? }
+        notify ::Actions::ProxyAction::ProxyActionMissing.new, missing if missing.any?
+
+        stopped = present.select { |task| %w[stopped paused].include? task.result['state'] }
+        notify ::Actions::ProxyAction::ProxyActionStopped.new, stopped if stopped.any?
+      end
+
+      def notify(event, tasks)
+        tasks.each do |task|
+          action.world.event task.execution_plan_id,
+                             task.step_id,
+                             event
+        end
+      end
+
+      def remote_tasks
+        action.task.remote_sub_tasks
+      end
+
+      def poll_proxy_tasks(url, tasks)
+        proxy = ProxyAPI::ForemanDynflow::DynflowProxy.new(:url => url)
+        results = proxy.task_states(tasks.map(&:remote_task_id))
+        tasks.map do |task|
+          task.result = results[task.remote_task_id]
+          task
+        end
+      rescue => e
+        # We could not reach the remote task, we assume it's gone
+        action.action_logger.warn(_('Failed to check on tasks on proxy at %{url}: %{exception}') % { :url => url, :exception => e.message })
+        tasks
+      end
+    end
+  end
+end

data/app/lib/actions/proxy_action.rb

@@ -1,10 +1,12 @@
 module Actions
   class ProxyAction < Base
     include ::Dynflow::Action::Cancellable
-    include ::Dynflow::Action::Timeouts
 
     middleware.use ::Actions::Middleware::HideSecrets
 
+    execution_plan_hooks.use :clean_remote_task, :on => :stopped
+    execution_plan_hooks.use :wipe_secrets!, :on => :stopped
+
     class CallbackData
       attr_reader :data
 
@@ -13,6 +15,14 @@ module Actions
       end
     end
 
+    class ProxyActionMissing < RuntimeError
+      def backtrace
+        []
+      end
+    end
+
+    class ProxyActionStopped; end
+
     def plan(proxy, klass, options)
       options[:connection_options] ||= {}
       default_connection_options.each { |key, value| options[:connection_options][key] ||= value }
@@ -23,7 +33,7 @@ module Actions
       with_connection_error_handling(event) do |event|
         case event
         when nil
-          if output[:proxy_task_id]
+          if remote_task
             on_resume
           else
             trigger_proxy_task
@@ -37,38 +47,41 @@ module Actions
           abort_proxy_task
         when CallbackData
           on_data(event.data)
-        when ::Dynflow::Action::Timeouts::Timeout
-          check_task_status
+        when ProxyActionMissing
+          on_proxy_action_missing
+        when ProxyActionStopped
+          on_proxy_action_stopped
         else
           raise "Unexpected event #{event.inspect}"
         end
       end
     end
 
+    def remote_task
+      @remote_task ||= ForemanTasks::RemoteTask.find_by(:execution_plan_id => execution_plan_id, :step_id => run_step_id)
+    end
+
     def trigger_proxy_task
       suspend do |_suspended_action|
-        set_timeout! unless timeout_set?
         response = proxy.trigger_task(proxy_action_name,
                                       input.merge(:callback => { :task_id => task.id,
                                                                  :step_id => run_step_id }))
+        ::ForemanTasks::RemoteTask.new(:remote_task_id => response['task_id'], :execution_plan_id => execution_plan_id,
+                                       :state => 'triggered', :proxy_url => input[:proxy_url], :step_id => run_step_id).save!
         output[:proxy_task_id] = response['task_id']
       end
     end
 
     def check_task_status
-      if output[:proxy_task_id]
-        response = proxy.status_of_task(output[:proxy_task_id])
-        if %w[stopped paused].include? response['state']
-          if response['result'] == 'error'
-            raise ::Foreman::Exception, _('The smart proxy task %s failed.') % output[:proxy_task_id]
-          else
-            on_data(response['actions'].find { |block_action| block_action['class'] == proxy_action_name }['output'])
-          end
+      response = proxy.status_of_task(output[:proxy_task_id])
+      if %w[stopped paused].include? response['state']
+        if response['result'] == 'error'
+          raise ::Foreman::Exception, _('The smart proxy task %s failed.') % output[:proxy_task_id]
         else
-          suspend
+          on_data(response['actions'].find { |block_action| block_action['class'] == proxy_action_name }['output'])
         end
       else
-        process_timeout
+        suspend
       end
     end
 
@@ -95,12 +108,21 @@ module Actions
     # @override to put custom logic on event handling
     def on_data(data)
       output[:proxy_output] = data
-      wipe_secrets!
     end
 
-    def wipe_secrets!
+    # Removes the :secrets key from the action's input and output and saves the action
+    def wipe_secrets!(_execution_plan)
       input.delete(:secrets)
       output.delete(:secrets)
+      world.persistence.save_action(execution_plan_id, self)
+    end
+
+    def on_proxy_action_missing
+      error! ProxyActionMissing.new(_('Proxy task gone missing from the smart proxy'))
+    end
+
+    def on_proxy_action_stopped
+      check_task_status
     end
 
     # @override String name of an action to be triggered on server
@@ -113,8 +135,8 @@ module Actions
     end
 
     def proxy_output(live = false)
-      if output.key?(:proxy_output)
-        output.fetch(:proxy_output) || {}
+      if output.key?(:proxy_output) || state == :error
+        output.fetch(:proxy_output, {})
       elsif live && output[:proxy_task_id]
         proxy_data = proxy.status_of_task(output[:proxy_task_id])['actions'].detect { |action| action['class'] == proxy_action_name }
         proxy_data.fetch('output', {})
@@ -146,22 +168,15 @@ module Actions
       output[:metadata] = thing
     end
 
-    def timeout_set?
-      !metadata[:timeout].nil?
-    end
-
-    def set_timeout!
-      time = Time.zone.now + input[:connection_options][:timeout]
-      schedule_timeout(time)
-      metadata[:timeout] = time.to_s
-    end
-
     def default_connection_options
       # Fails if the plan is not finished within 60 seconds from the first task trigger attempt on the smart proxy
       # If the triggering fails, it retries 3 more times with 15 second delays
       { :retry_interval => Setting['foreman_tasks_proxy_action_retry_interval'] || 15,
-        :retry_count    => Setting['foreman_tasks_proxy_action_retry_count'] || 4,
-        :timeout        => Setting['foreman_tasks_proxy_action_start_timeout'] || 60 }
+        :retry_count    => Setting['foreman_tasks_proxy_action_retry_count'] || 4 }
+    end
+
+    def clean_remote_task(*_args)
+      remote_task.destroy! if remote_task
     end
 
     private
@@ -173,7 +188,7 @@ module Actions
     def with_connection_error_handling(event = nil)
       yield event
     rescue ::RestClient::Exception, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ETIMEDOUT => e
-      if event.class == CallbackData || event == ::Dynflow::Action::Timeouts::Timeout
+      if event.class == CallbackData
         raise e
       else
         handle_connection_exception(e, event)

data/app/lib/proxy_api/foreman_dynflow/dynflow_proxy.rb

@@ -34,6 +34,11 @@ module ProxyAPI
       def tasks_count(state)
         MultiJson.load(Task.new(@args).send(:get, "count?state=#{state}"))['count'].to_i
       end
+
+      def task_states(ids)
+        payload = MultiJson.dump(:task_ids => ids)
+        MultiJson.load(Task.new(@args).send(:post, payload, 'status'))
+      end
     end
   end
 end

data/app/models/foreman_tasks/remote_task.rb

@@ -0,0 +1,12 @@
+module ForemanTasks
+  class RemoteTask < ApplicationRecord
+    attr_accessor :result
+
+    belongs_to :task, :class_name  => 'ForemanTasks::Task',
+                      :primary_key => :external_id,
+                      :foreign_key => :execution_plan_id,
+                      :inverse_of  => :remote_tasks
+
+    scope :triggered, -> { where(:state => 'triggered') }
+  end
+end

data/app/models/foreman_tasks/task.rb

@@ -20,6 +20,10 @@ module ForemanTasks
     has_many :sub_tasks, :class_name => 'ForemanTasks::Task', :foreign_key => :parent_task_id, :dependent => :nullify
     has_many :locks, :dependent => :destroy
 
+    has_many :remote_sub_tasks, :class_name => 'ForemanTasks::RemoteTask', :through => :sub_tasks, :source => :remote_tasks
+
+    has_many :remote_tasks, :class_name => 'ForemanTasks::RemoteTask', :primary_key => :external_id, :foreign_key => :execution_plan_id, :dependent => :destroy
+
     has_many :task_group_members, :dependent => :destroy
     has_many :task_groups, :through => :task_group_members
     if Rails::VERSION::MAJOR < 4
@@ -210,7 +214,8 @@ module ForemanTasks
     end
 
     def action
-      super || to_label
+      return to_label if super.blank?
+      super
     end
 
     def to_label

data/app/models/foreman_tasks/task/dynflow_task.rb

@@ -15,11 +15,11 @@ module ForemanTasks
       self.start_at       = string_to_time(utc_zone, data[:start_at]) if data[:start_at]
       self.start_before   = string_to_time(utc_zone, data[:start_before]) if data[:start_before]
       self.parent_task_id ||= begin
-                                if main_action.caller_execution_plan_id
+                                if main_action.present? && main_action.caller_execution_plan_id
                                   DynflowTask.where(:external_id => main_action.caller_execution_plan_id).first!.id
                                 end
                               end
-      self.label          ||= main_action && main_action.class.name
+      self[:label]        ||= label
       changes = self.changes
       save!
       changes
@@ -69,12 +69,19 @@ module ForemanTasks
       execution_plan(false)
     end
 
+    def label
+      return execution_plan_action.input['job_class'] if active_job?
+      return main_action.class.name if main_action.present?
+      self[:label]
+    end
+
     def input
-      main_action.respond_to?(:task_input) && main_action.task_input
+      return execution_plan_action.input['job_arguments'] if active_job?
+      main_action.task_input if main_action.respond_to?(:task_input)
     end
 
     def output
-      main_action.respond_to?(:task_output) && main_action.task_output
+      main_action.task_output if main_action.respond_to?(:task_output)
     end
 
     def failed_steps
@@ -98,17 +105,47 @@ module ForemanTasks
 
     def main_action
       return @main_action if defined?(@main_action)
-      @main_action = execution_plan && execution_plan.root_plan_step.try(:action, execution_plan)
+      if active_job?
+        action = execution_plan_action
+        active_job_action(action.input['job_class'], action.input['job_arguments'])
+      else
+        @main_action = execution_plan && execution_plan.root_plan_step.try(:action, execution_plan)
+      end
+    end
+
+    # The class for ActiveJob jobs in Dynflow, JobWrapper is not expected to
+    # implement any humanized actions. Individual jobs are expected to implement
+    # humanized_* methods for foreman-tasks integration.
+    def active_job_action(klass, args)
+      return if klass.blank?
+      klass.constantize.new(*args)
+    end
+
+    def active_job?
+      return false unless execution_plan.present? &&
+                          execution_plan.root_plan_step.present?
+      execution_plan_action.class == ::Dynflow::ActiveJob::QueueAdapters::JobWrapper
+    end
+
+    def execution_plan_action
+      execution_plan.root_plan_step.action(execution_plan)
+    end
+
+    def execution_scheduled?
+      main_action.nil? || main_action.respond_to?(:execution_plan) &&
+        main_action.execution_plan.state == :scheduled ||
+        execution_plan.state == :scheduled
     end
 
     def get_humanized(method)
       @humanized_cache ||= {}
-      if [:name, :input, :output, :error].include?(method)
-        method = "humanized_#{method}".to_sym
-      end
+      method = find_humanize_method_kind(method)
       Match! method, :humanized_name, :humanized_input, :humanized_output, :humanized_errors
-      return N_('N/A') if method != :humanized_name && (main_action.nil? || main_action.execution_plan.state == :scheduled)
-      return N_(label) if method == :humanized_name && main_action.nil?
+      if method != :humanized_name && execution_scheduled?
+        return N_('N/A')
+      elsif method == :humanized_name && main_action.nil?
+        return N_(label)
+      end
       @humanized_cache[method] ||= begin
                                      if main_action.respond_to? method
                                        begin
@@ -120,6 +157,13 @@ module ForemanTasks
                                    end
     end
 
+    def find_humanize_method_kind(method)
+      return method if /humanized_.*/ =~ method
+      if [:name, :input, :output, :error].include?(method)
+        "humanized_#{method}".to_sym
+      end
+    end
+
     def self.consistency_check
       fixed_count = 0
       logger = Foreman::Logging.logger('foreman-tasks')

data/app/models/setting/foreman_tasks.rb

@@ -9,8 +9,7 @@ class Setting::ForemanTasks < Setting
         set('dynflow_enable_console', N_('Enable the dynflow console (/foreman_tasks/dynflow) for debugging'), true),
         set('dynflow_console_require_auth', N_('Require user to be authenticated as user with admin rights when accessing dynflow console'), true),
         set('foreman_tasks_proxy_action_retry_count', N_('Number of attempts to start a task on the smart proxy before failing'), 4),
-        set('foreman_tasks_proxy_action_retry_interval', N_('Time in seconds between retries'), 15),
-        set('foreman_tasks_proxy_action_start_timeout', N_('Time in second during which a task has to be started on the proxy'), 60)
+        set('foreman_tasks_proxy_action_retry_interval', N_('Time in seconds between retries'), 15)
       ].each { |s| create! s.update(:category => 'Setting::ForemanTasks') }
     end
 

data/db/migrate/20180207150921_add_remote_tasks.foreman_tasks.rb

@@ -0,0 +1,16 @@
+class AddRemoteTasks < ActiveRecord::Migration[5.0]
+  def change
+    create_table :foreman_tasks_remote_tasks do |t|
+      t.string :execution_plan_id, :null => false
+      t.integer :step_id, :null => false
+      t.string :state, :null => false, :default => 'new'
+
+      t.string :proxy_url, :null => false
+      t.string :remote_task_id
+
+      t.index [:execution_plan_id, :step_id], :name => 'index_foreman_tasks_plan_id_and_step_id'
+
+      t.datetime :created_at
+    end
+  end
+end

data/lib/foreman_tasks/cleaner.rb

@@ -100,6 +100,7 @@ module ForemanTasks
         with_batches(source, name) do |chunk|
           delete_tasks chunk
           delete_dynflow_plans chunk
+          delete_remote_tasks(chunk)
         end
       end
       delete_orphaned_dynflow_tasks
@@ -115,6 +116,10 @@ module ForemanTasks
       tasks.delete_all
     end
 
+    def delete_remote_tasks(chunk)
+      ForemanTasks::RemoteTask.where(:execution_plan_id => chunk.map(&:external_id)).delete_all
+    end
+
     def tasks_to_csv(dataset, backup_dir, file_name)
       with_backup_file(backup_dir, file_name) do |csv, appending|
         csv << ForemanTasks::Task.attribute_names.to_csv unless appending

data/lib/foreman_tasks/engine.rb

@@ -133,7 +133,7 @@ module ForemanTasks
     # to enable async Foreman operations using Dynflow
     if ENV['FOREMAN_TASKS_MONKEYS'] == 'true'
       config.to_prepare do
-        ::Api::V2::HostsController.send :include, ForemanTasks::Concerns::HostsControllerExtension
+        ::Api::V2::HostsController.send :prepend, ForemanTasks::Concerns::HostsControllerExtension
         ::Host::Base.send :include, ForemanTasks::Concerns::HostActionSubject
       end
     end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.13.0'.freeze
+  VERSION = '0.13.1'.freeze
 end

data/test/controllers/api/tasks_controller_test.rb

@@ -18,6 +18,33 @@ module ForemanTasks
           assert_response :success
           assert_template 'api/tasks/show'
         end
+
+        test_attributes :pid => 'a2a81ca2-63c4-47f5-9314-5852f5e2617f'
+        it 'search for non-existent task' do
+          get :show, params: { :id => 'abc123' }
+          assert_response :missing
+          assert_includes @response.body, 'Resource task not found by id'
+        end
+      end
+
+      describe 'GET /api/tasks/summary' do
+        class DummyTestSummaryAction < Support::DummyDynflowAction
+          # a dummy test action that do nothing
+          def run
+            # a dummy run method
+          end
+        end
+
+        test_attributes :pid => 'bdcab413-a25d-4fe1-9db4-b50b5c31ebce'
+        it 'get tasks summary' do
+          ForemanTasks.trigger(DummyTestSummaryAction)
+          get :summary
+          assert_response :success
+          response = JSON.parse(@response.body)
+          assert_kind_of Array, response
+          refute response.empty?
+          assert_kind_of Hash, response[0]
+        end
       end
 
       describe 'POST /tasks/callback' do

data/test/unit/actions/proxy_action_test.rb

@@ -26,7 +26,7 @@ module ForemanTasks
                            { 'foo' => 'bar',
                              'secrets' => secrets,
                              'connection_options' =>
-                                 { 'retry_interval' => 15, 'retry_count' => 4, 'timeout' => 60 },
+                                 { 'retry_interval' => 15, 'retry_count' => 4 },
                              'proxy_url' => 'proxy.example.com',
                              'proxy_action_name' => 'Proxy::DummyAction',
                              'callback' => { 'task_id' => Support::DummyProxyAction.proxy.uuid, 'step_id' => @action.run_step_id } }]
@@ -107,6 +107,13 @@ module ForemanTasks
       it 'wipes secrets' do
         @action.input[:secrets].must_equal secrets
         action = run_action(@action, ::Actions::ProxyAction::CallbackData.new('result' => 'success'))
+
+        # #wipe_secrets! gets called as a hook, hooks are not triggered when using action testing helpers
+        persistence = mock
+        persistence.stubs(:save_action)
+        action.world.stubs(:persistence).returns(persistence)
+        action.wipe_secrets!(nil)
+
         refute action.input.key?(:secrets)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -143,6 +143,7 @@ files:
 - app/lib/actions/middleware/keep_current_user.rb
 - app/lib/actions/middleware/rails_executor_wrap.rb
 - app/lib/actions/middleware/recurring_logic.rb
+- app/lib/actions/middleware/watch_delegated_proxy_sub_tasks.rb
 - app/lib/actions/proxy_action.rb
 - app/lib/actions/recurring_action.rb
 - app/lib/actions/serializers/active_record_serializer.rb
@@ -152,6 +153,7 @@ files:
 - app/models/foreman_tasks/concerns/host_action_subject.rb
 - app/models/foreman_tasks/lock.rb
 - app/models/foreman_tasks/recurring_logic.rb
+- app/models/foreman_tasks/remote_task.rb
 - app/models/foreman_tasks/task.rb
 - app/models/foreman_tasks/task/dynflow_task.rb
 - app/models/foreman_tasks/task/status_explicator.rb
@@ -203,6 +205,7 @@ files:
 - db/migrate/20160924213030_change_tasks_widget_names.rb
 - db/migrate/20161003091412_add_missing_indexes.rb
 - db/migrate/20171026082635_add_task_action.foreman_tasks.rb
+- db/migrate/20180207150921_add_remote_tasks.foreman_tasks.rb
 - db/migrate/20180216092715_use_uuid.rb
 - db/seeds.d/20-foreman_tasks_permissions.rb
 - db/seeds.d/60-dynflow_proxy_feature.rb
@@ -283,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resoruces and users