foreman_remote_execution 1.4.5 → 1.4.6

data/app/models/job_template.rb

@@ -1,10 +1,10 @@
 class JobTemplate < ::Template
-  include ForemanRemoteExecution::Exportable
+  include ::Exportable
 
   class NonUniqueInputsError < Foreman::Exception
   end
 
-  attr_exportable :name, :job_category, :description_format, :snippet, :template_inputs,
+  attr_exportable :job_category, :description_format, :template_inputs,
                   :foreign_input_sets, :provider_type, :kind => ->(template) { template.class.name.underscore }
 
   include Authorizable

data/app/models/remote_execution_feature.rb

@@ -1,9 +1,11 @@
 class RemoteExecutionFeature < ApplicationRecord
-  VALID_OPTIONS = [:provided_inputs, :description, :host_action_button].freeze
+  VALID_OPTIONS = [:provided_inputs, :description, :host_action_button, :notification_builder].freeze
   validates :label, :name, :presence => true, :uniqueness => true
 
   belongs_to :job_template
 
+  audited :only => :job_template_id
+
   extend FriendlyId
   friendly_id :label
 
@@ -27,19 +29,29 @@ class RemoteExecutionFeature < ApplicationRecord
     options[:host_action_button] = false unless options.key?(:host_action_button)
 
     feature = self.find_by(label: label)
+    builder = options[:notification_builder] ? options[:notification_builder].to_s : nil
 
-    attributes = { :name => name, :provided_input_names => options[:provided_inputs], :description => options[:description], :host_action_button => options[:host_action_button] }
+    attributes = { :name => name,
+                   :provided_input_names => options[:provided_inputs],
+                   :description => options[:description],
+                   :host_action_button => options[:host_action_button],
+                   :notification_builder => builder }
     # in case DB does not have the attribute created yet but plugin initializer registers the feature, we need to skip this attribute
-    unless self.attribute_names.include?('host_action_button')
-      attributes.delete(:host_action_button)
+    attrs = [ :host_action_button, :notification_builder ]
+    attrs.each do |attr|
+      unless self.attribute_names.include?(attr.to_s)
+        attributes.delete(attr)
+      end
     end
 
-    if feature.nil?
-      feature = self.create!({ :label => label }.merge(attributes))
-    else
-      feature.attributes = attributes
-      feature.save if feature.changed?
+    self.without_auditing do
+      if feature.nil?
+        feature = self.create!({ :label => label }.merge(attributes))
+      else
+        feature.attributes = attributes
+        feature.save if feature.changed?
+      end
+      return feature
     end
-    return feature
   end
 end

data/app/models/setting/remote_execution.rb

@@ -1,5 +1,8 @@
 class Setting::RemoteExecution < Setting
 
+  ::Setting::BLANK_ATTRS.concat %w{remote_execution_ssh_password remote_execution_ssh_key_passphrase}
+
+  # rubocop:disable Metrics/MethodLength
   def self.load_defaults
     # Check the table exists
     return unless super
@@ -9,42 +12,63 @@ class Setting::RemoteExecution < Setting
       [
         self.set('remote_execution_fallback_proxy',
                  N_('Search the host for any proxy with Remote Execution, useful when the host has no subnet or the subnet does not have an execution proxy'),
-                 false),
+                 false,
+                 N_('Fallback to Any Proxy')),
         self.set('remote_execution_global_proxy',
                  N_('Search for remote execution proxy outside of the proxies assigned to the host. ' +
                  "If locations or organizations are enabled, the search will be limited to the host's " +
                  'organization or location.'),
-                 true),
+                 true,
+                 N_('Enable Global Proxy')),
         self.set('remote_execution_without_proxy',
                  N_('When enabled, the remote execution will try to run the commands directly, when no
                      proxy with remote execution feature is configured for the host.'),
-                 false),
+                 false,
+                 N_('Fallback Without Proxy')),
         self.set('remote_execution_ssh_user',
                  N_('Default user to use for SSH.  You may override per host by setting a parameter called remote_execution_ssh_user.'),
-                 'root'),
+                 'root',
+                 N_('SSH User')),
         self.set('remote_execution_effective_user',
                  N_('Default user to use for executing the script. If the user differs from the SSH user, su or sudo is used to switch the user.'),
-                 'root'),
+                 'root',
+                 N_('Effective User')),
         self.set('remote_execution_effective_user_method',
                  N_('What command should be used to switch to the effective user. One of %s') % SSHExecutionProvider::EFFECTIVE_USER_METHODS.inspect,
                  'sudo',
-                 'remote_execution_effective_user_method',
+                 N_('Effective User Method'),
                  nil,
                  { :collection => proc { Hash[SSHExecutionProvider::EFFECTIVE_USER_METHODS.map { |method| [method, method] }] } }),
         self.set('remote_execution_sync_templates',
                  N_('Whether we should sync templates from disk when running db:seed.'),
-                 true),
+                 true,
+                 N_('Sync Job Templates')),
         self.set('remote_execution_ssh_port',
                  N_('Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port.'),
-                 '22'),
+                 '22',
+                 N_('SSH Port')),
         self.set('remote_execution_connect_by_ip',
                  N_('Should the ip addresses on host interfaces be preferred over the fqdn? '\
                  'It is useful, when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip.'),
-                 false)
+                 false,
+                 N_('Connect by IP')),
+        self.set('remote_execution_ssh_password',
+                 N_('Default password to use for SSH. You may override per host by setting a parameter called remote_execution_ssh_password'),
+                 nil,
+                 N_('Default SSH password'),
+                 nil,
+                 { :encrypted => true }),
+        self.set('remote_execution_ssh_key_passphrase',
+                 N_('Default key passphrase to use for SSH. You may override per host by setting a parameter called remote_execution_ssh_key_passphrase'),
+                 nil,
+                 N_('Default SSH key passphrase'),
+                 nil,
+                 { :encrypted => true })
       ].each { |s| self.create! s.update(:category => 'Setting::RemoteExecution') }
     end
 
     true
   end
-
+  # rubocop:enable AbcSize
+  # rubocop:enable Metrics/MethodLength
 end

data/app/models/ssh_execution_provider.rb

@@ -15,6 +15,14 @@ class SSHExecutionProvider < RemoteExecutionProvider
       true
     end
 
+    def ssh_password(host)
+      host_setting(host, :remote_execution_ssh_password)
+    end
+
+    def ssh_key_passphrase(host)
+      host_setting(host, :remote_execution_ssh_key_passphrase)
+    end
+
     private
 
     def ssh_user(host)

data/app/models/template_input.rb

@@ -1,5 +1,5 @@
 class TemplateInput < ApplicationRecord
-  include ForemanRemoteExecution::Exportable
+  include ::Exportable
 
   class ValueNotReady < ::Foreman::Exception
   end

data/app/views/api/v2/job_templates/base.json.rabl

@@ -1,3 +1,3 @@
 object @job_template
 
-attributes :id, :name, :job_category, :provider_type, :snippet, :description_format
+attributes :id, :name, :job_category, :provider_type, :snippet, :description_format, :created_at, :updated_at

data/app/views/job_invocations/_form.html.erb

@@ -7,6 +7,7 @@
 <%= form_for @composer.job_invocation, :html => {'data-refresh-url' => refresh_job_invocations_path, :id => 'job_invocation_form'} do |f| %>
 
   <%= selectable_f f, :job_category, @composer.available_job_categories, {}, :label => _('Job category') %>
+  <%= f.hidden_field(:remote_execution_feature_id, :value => @composer.remote_execution_feature_id) %>
 
   <% selected_templates_per_provider = {} %>
   <% @composer.displayed_provider_types.each do |provider_type| %>
@@ -72,13 +73,13 @@
 
                     <div class="advanced hidden">
                       <% if job_template.effective_user.overridable? %>
-                        <%= text_f job_template_fields, :effective_user, :value => @composer.template_invocation(job_template).try(:effective_user), :label => _('Effective user'), :help_inline => N_("A user to be used for executing the script. If it differs from the SSH user, su or sudo is used to switch the accounts.") %>
+                        <%= text_f job_template_fields, :effective_user, :value => @composer.template_invocation(job_template).try(:effective_user), :label => _('Effective user'), :label_help => N_("A user to be used for executing the script. If it differs from the SSH user, su or sudo is used to switch the accounts.") %>
                       <% end %>
                       <%= render :partial => 'description_fields', :locals => { :f => f, :job_template => job_template, :disabled => job_template != selected_templates_per_provider[provider_type] } %>
                     </div>
 
                     <div class="advanced hidden">
-                      <%= number_f job_template_fields, :execution_timeout_interval, :value => f.object.execution_timeout_interval || job_template.execution_timeout_interval, :label => _('Timeout to kill'), :help_inline => N_('Time in seconds from the start on the remote host after which the job should be killed.') %>
+                      <%= number_f job_template_fields, :execution_timeout_interval, :value => f.object.execution_timeout_interval || job_template.execution_timeout_interval, :label => _('Timeout to kill'), :label_help => N_('Time in seconds from the start on the remote host after which the job should be killed.') %>
                     </div>
                   <% end %>
                 </fieldset>
@@ -90,12 +91,17 @@
     <% end %>
 
     <div class="advanced hidden">
-      <%= number_f f, :concurrency_level, :label => _('Concurrency level'), :placeholder => 'N', :min => 1, :help_inline => N_("Run at most N tasks at a time") %>
-      <%= number_f f, :time_span, :label => _('Time span'), :placeholder => 'N', :min => 1, :help_inline => N_("Distribute execution over N seconds")  %>
+      <%= password_f f, :password, :placeholder => '*****', :label => _('Password'), :label_help => N_('Password is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution.') %>
+      <%= password_f f, :key_passphrase, :placeholder => '*****', :label => _('Private key passphrase'), :label_help => N_('Key passhprase is only applicable for SSH provider. Other providers ignore this field. <br> Passphrase is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution.') %>
+    </div>
+
+    <div class="advanced hidden">
+      <%= number_f f, :concurrency_level, :label => _('Concurrency level'), :placeholder => 'N', :min => 1, :label_help => N_("Run at most N tasks at a time") %>
+      <%= number_f f, :time_span, :label => _('Time span'), :placeholder => 'N', :min => 1, :label_help => N_("Distribute execution over N seconds")  %>
     </div>
 
     <div class="form-group advanced hidden">
-      <%= add_label({ :label => _('Type of query'), :label_help => _("Type has impact on when is the query evaulated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>") }, f, :targetting_type) %>
+      <%= add_label({ :label => _('Type of query'), :label_help => _("Type has impact on when is the query evaluated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>") }, f, :targetting_type) %>
 
       <div class="col-md-4">
         <%= radio_button_f targeting_fields, :targeting_type, :value => Targeting::STATIC_TYPE, :text => _(Targeting::TYPES[Targeting::STATIC_TYPE]) %>

data/app/views/job_invocations/_tab_hosts.html.erb

@@ -15,7 +15,7 @@
   <% end %>
   <br>
 
-  <table class="table table-bordered table-striped table-condensed">
+  <table class="<%= table_css_classes('table-condensed') %>">
     <thead>
     <tr>
       <th><%= sort :name, :as => _('Host') %></th>

data/app/views/job_invocations/index.html.erb

@@ -2,7 +2,7 @@
 
 <% title_actions(job_invocations_buttons) %>
 
-<table class="table table-bordered table-striped table-condensed table-fixed">
+<table class="<%= table_css_classes('table-condensed table-fixed') %>">
   <thead>
     <tr>
       <th><%= sort :description, :as => _('Description') %></th>

data/app/views/job_templates/index.html.erb

@@ -7,7 +7,7 @@
                  link_to_function(_('Import'), 'show_import_job_template_modal();', :class => 'btn btn-default'),
                  new_link(_("New Job Template"))) %>
 
-<table class="table table-bordered table-striped table-two-pane table-fixed">
+<table class="<%= table_css_classes('table-two-pane table-fixed') %>">
   <thead>
     <tr>
       <th class="col-md-6"><%= sort :name, :as => s_("JobTemplate|Name") %></th>

data/app/views/remote_execution_features/index.html.erb

@@ -1,6 +1,6 @@
 <% title _('Remote Execution Features') %>
 
-<table class="table table-bordered table-striped table-condensed">
+<table class="<%= table_css_classes('table-condensed') %>">
   <thead>
     <tr>
       <th><%= sort :label, :as => _('Label') %></th>

data/app/views/template_inputs/_invocation_form.html.erb

@@ -1,7 +1,7 @@
 <%= input_values_fields.fields_for input.id.to_s, composer.template_invocation_input_value_for(job_template, input) do |input_fields| %>
   <% unless input.options.blank? %>
-    <%= selectable_f input_fields, :value, input.options_array, {:include_blank => !input.required}, :require => input.required, :label => input.name, :help_inline => input.description, :id => input.name, :onchange => "regenerate_description(this);" %>
+    <%= selectable_f input_fields, :value, input.options_array, { :include_blank => !input.required }, :label_help => input.description, :require => input.required, :label => input.name, :id => input.name, :onchange => "regenerate_description(this);" %>
   <% else %>
-    <%= textarea_f input_fields, :value, :label => input.name, :help_inline => input.description, :required => input.required, :rows => 2, :onchange => "regenerate_description(this);", :id => input.name %>
+    <%= textarea_f input_fields, :value, :label => input.name, :label_help => input.description, :required => input.required, :rows => 2, :onchange => "regenerate_description(this);", :id => input.name %>
   <% end %>
 <% end %>

data/app/views/template_invocations/show.html.erb

@@ -9,7 +9,7 @@
                      link_to_function(_('Toggle STDERR'), '$("div.line.stderr").toggle()', :class => 'btn btn-default'),
                      link_to_function(_('Toggle STDOUT'), '$("div.line.stdout").toggle()', :class => 'btn btn-default'),
                      link_to_function(_('Toggle DEBUG'), '$("div.line.debug").toggle()', :class => 'btn btn-default')) %>
-    <%= button_group(template_invocation_task_buttons(@template_invocation_task)) %>
+    <%= button_group(template_invocation_task_buttons(@template_invocation_task, @template_invocation.job_invocation)) %>
   </div>
 </div>
 

data/config/routes.rb

@@ -24,6 +24,7 @@ Rails.application.routes.draw do
     end
     member do
       get 'rerun'
+      post 'cancel'
     end
   end
 
@@ -42,6 +43,10 @@ Rails.application.routes.draw do
         resources :hosts, :only => :none do
           get '/', :to => 'job_invocations#output'
         end
+        member do
+          post 'cancel'
+          post 'rerun'
+        end
       end
 
       resources :job_templates, :except => [:new, :edit] do

data/db/migrate/20160113162007_expand_all_template_invocations.rb

@@ -14,7 +14,7 @@ class ExpandAllTemplateInvocations < ActiveRecord::Migration[4.2]
     FakeTemplateInvocation.update_all 'host_id = NULL'
 
     # expand all pattern template invocations and link RunHostJob
-    JobInvocation.joins(:targeting).where("#{Targeting.table_name}.resolved_at IS NOT NULL").includes([ :pattern_template_invocations, :targeting, :sub_tasks => :locks ]).each do |job_invocation|
+    JobInvocation.joins(:targeting).where("#{Targeting.table_name}.resolved_at IS NOT NULL").includes([:pattern_template_invocations, :targeting]).each do |job_invocation|
       job_invocation.pattern_template_invocations.each do |pattern_template_invocation|
         job_invocation.targeting.hosts.each do |host|
           task = job_invocation.sub_tasks.find do |sub_task|

data/db/migrate/20171129103615_add_secrets_to_job_invocations.rb

@@ -0,0 +1,6 @@
+class AddSecretsToJobInvocations < ActiveRecord::Migration[4.2]
+  def change
+    add_column :job_invocations, :password, :string
+    add_column :job_invocations, :key_passphrase, :string
+  end
+end

data/db/migrate/20180202072115_add_notification_builder_to_remote_execution_feature.rb

@@ -0,0 +1,5 @@
+class AddNotificationBuilderToRemoteExecutionFeature < ActiveRecord::Migration[4.2]
+  def change
+    add_column :remote_execution_features, :notification_builder, :string
+  end
+end

data/db/migrate/20180202123215_add_feature_id_to_job_invocation.rb

@@ -0,0 +1,6 @@
+class AddFeatureIdToJobInvocation < ActiveRecord::Migration[4.2]
+  def change
+    add_column :job_invocations, :remote_execution_feature_id, :integer, :index => true
+    add_foreign_key :job_invocations, :remote_execution_features, :column => :remote_execution_feature_id
+  end
+end

data/db/migrate/20180226095631_change_task_id_to_uuid.rb

@@ -0,0 +1,31 @@
+class ChangeTaskIdToUuid < ActiveRecord::Migration[4.2]
+  def up
+    if on_postgresql?
+      change_table :job_invocations do |t|
+        t.change :task_id, :uuid, :using => 'task_id::uuid'
+      end
+
+      change_table :template_invocations do |t|
+        t.change :run_host_job_task_id, :uuid, :using => 'run_host_job_task_id::uuid'
+      end
+    end
+  end
+
+  def down
+    if on_postgresql?
+      change_table :job_invocations do |t|
+        t.change :task_id, :string, :limit => 255
+      end
+
+      change_table :template_invocations do |t|
+        t.change :run_host_job_task_id, :string, :limit => 255
+      end
+    end
+  end
+
+  private
+
+  def on_postgresql?
+    ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+  end
+end

data/foreman_remote_execution.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'deface'
   s.add_dependency 'dynflow', '~> 0.8.26'
   s.add_dependency 'foreman_remote_execution_core'
-  s.add_dependency 'foreman-tasks', '>= 0.9.5'
+  s.add_dependency 'foreman-tasks', '~> 0.12'
 
   s.add_development_dependency 'factory_bot_rails', '~> 4.8.0'
   s.add_development_dependency 'rubocop'

data/lib/foreman_remote_execution/engine.rb

@@ -53,10 +53,11 @@ module ForemanRemoteExecution
                                                :'api/v2/job_templates' => [:destroy] }, :resource_type => 'JobTemplate'
           permission :lock_job_templates, { :job_templates => [:lock, :unlock] }, :resource_type => 'JobTemplate'
           permission :create_job_invocations, { :job_invocations => [:new, :create, :refresh, :rerun, :preview_hosts],
-                                                'api/v2/job_invocations' => [:create] }, :resource_type => 'JobInvocation'
+                                                'api/v2/job_invocations' => [:create, :rerun] }, :resource_type => 'JobInvocation'
           permission :view_job_invocations, { :job_invocations => [:index, :show, :auto_complete_search], :template_invocations => [:show],
                                               'api/v2/job_invocations' => [:index, :show, :output] }, :resource_type => 'JobInvocation'
           permission :create_template_invocations, {}, :resource_type => 'TemplateInvocation'
+          permission :cancel_job_invocations, { :job_invocations => [:cancel], 'api/v2/job_invocations' => [:cancel] }, :resource_type => 'JobInvocation'
           # this permissions grants user to get auto completion hints when setting up filters
           permission :filter_autocompletion_for_template_invocation, { :template_invocations => [ :auto_complete_search, :index ] },
                      :resource_type => 'TemplateInvocation'
@@ -71,6 +72,7 @@ module ForemanRemoteExecution
           :view_smart_proxies
         ].freeze
         MANAGER_PERMISSIONS = USER_PERMISSIONS + [
+          :cancel_job_invocations,
           :destroy_job_templates,
           :edit_job_templates,
           :create_job_templates,

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.4.5'.freeze
+  VERSION = '1.4.6'.freeze
 end

data/test/factories/foreman_remote_execution_factories.rb

@@ -45,7 +45,13 @@ FactoryBot.define do
       after(:build) do |invocation, evaluator|
         invocation.pattern_template_invocations << FactoryBot.build(:template_invocation)
       end
+    end
 
+    trait :with_failed_task do
+      after(:build) do |invocation, _evaluator|
+        invocation.template_invocations << FactoryBot.build(:template_invocation, :with_failed_task, :with_host)
+        invocation.task = FactoryBot.build(:some_task)
+      end
     end
 
     trait :with_task do

data/test/functional/api/v2/job_invocations_controller_test.rb

@@ -23,45 +23,77 @@ module Api
         assert_equal template['job_category'], @invocation.job_category
       end
 
-      test 'should create valid with job_template_id' do
-        attrs = { :job_category => @template.job_category, :name => 'RandomName', :job_template_id => @template.id,
-                  :targeting_type => 'static_query', :search_query => 'foobar'}
-        post :create, params: { :job_invocation => attrs }
+      context 'creation' do
+        setup do
+          @attrs = { :job_category => @template.job_category,
+                     :name => 'RandomName',
+                     :job_template_id => @template.id,
+                     :targeting_type => 'static_query',
+                     :search_query => 'foobar' }
+        end
 
-        invocation = ActiveSupport::JSON.decode(@response.body)
-        assert_equal attrs[:job_category], invocation['job_category']
-        assert_response :success
-      end
+        test 'should create valid with job_template_id' do
+          post :create, params: { job_invocation: @attrs }
 
-      test 'should create with description format overridden' do
-        attrs = { :job_category => @template.job_category, :name => 'RandomName', :job_template_id => @template.id,
-                  :targeting_type => 'static_query', :search_query => 'foobar', :description_format => 'format' }
-        post :create, params: { :job_invocation => attrs }
+          invocation = ActiveSupport::JSON.decode(@response.body)
+          assert_equal @attrs[:job_category], invocation['job_category']
+          assert_response :success
+        end
 
-        invocation = ActiveSupport::JSON.decode(@response.body)
-        assert_equal attrs[:description_format], invocation['description']
-      end
+        test 'should create with description format overridden' do
+          @attrs[:description_format] = 'format'
+          post :create, params: { job_invocation: @attrs }
 
-      test 'should create with recurrence' do
-        attrs = { :job_category => @template.job_category, :name => 'RandomName',
-                  :job_template_id => @template.id,:targeting_type => 'static_query',
-                  :search_query => 'foobar', :recurrence => {:cron_line => '5 * * * *'}}
+          invocation = ActiveSupport::JSON.decode(@response.body)
+          assert_equal @attrs[:description_format], invocation['description']
+        end
 
-        post :create, params: { :job_invocation => attrs }
-        invocation = ActiveSupport::JSON.decode(@response.body)
-        assert_equal invocation['mode'], 'recurring'
-        assert_response :success
-      end
+        test 'should create with recurrence' do
+          @attrs[:recurrence] = { cron_line: '5 * * * *' }
+          post :create, params: { job_invocation: @attrs }
+          invocation = ActiveSupport::JSON.decode(@response.body)
+          assert_equal invocation['mode'], 'recurring'
+          assert_response :success
+        end
 
-      test 'should create with schedule' do
-        attrs = { :job_category => @template.job_category, :name => 'RandomName',
-                  :job_template_id => @template.id,:targeting_type => 'static_query',
-                  :search_query => 'foobar', :scheduling => {:start_at => Time.now.to_s}}
+        test 'should create with schedule' do
+          @attrs[:scheduling] = { start_at: Time.now.to_s }
+          post :create, params: { job_invocation: @attrs }
+          invocation = ActiveSupport::JSON.decode(@response.body)
+          assert_equal invocation['mode'], 'future'
+          assert_response :success
+        end
 
-        post :create, params: { :job_invocation => attrs }
-        invocation = ActiveSupport::JSON.decode(@response.body)
-        assert_equal invocation['mode'], 'future'
-        assert_response :success
+        context 'with_feature' do
+          setup do
+            @feature = FactoryBot.create(:remote_execution_feature,
+                                         :job_template => @template)
+            @attrs = {
+              feature: @feature.label
+            }
+          end
+
+          test 'host ids as array of FQDNs' do
+            host = FactoryBot.create(:host)
+            @attrs[:host_ids] = [host.fqdn]
+            post :create, params: { job_invocation: @attrs }
+            assert_response :success
+          end
+
+          test 'host ids as array of IDs' do
+            host = FactoryBot.create(:host)
+            host2 = FactoryBot.create(:host)
+            @attrs[:host_ids] = [host.id, host2.id]
+            post :create, params: { job_invocation: @attrs }
+            assert_response :success
+          end
+
+          test 'search_query' do
+            @attrs[:host_ids] = 'name = testfqdn'
+            post :create, params: { job_invocation: @attrs }
+            assert_response :success
+          end
+        end
       end
 
       test 'should provide output for delayed task' do
@@ -74,6 +106,81 @@ module Api
         assert_equal result['output'], []
         assert_response :success
       end
+
+      test 'should cancel a job' do
+        @invocation.task.expects(:cancellable?).returns(true)
+        @invocation.task.expects(:cancel).returns(true)
+        JobInvocation.expects(:from_param).with(@invocation.id.to_s).returns(@invocation)
+        post :cancel, :params => { :id => @invocation.id }
+        result = ActiveSupport::JSON.decode(@response.body)
+        assert_equal result['cancelled'], true
+        assert_equal result['id'], @invocation.id
+
+        assert_response :success
+      end
+
+      test 'should abort a job' do
+        @invocation.task.expects(:cancellable?).returns(true)
+        @invocation.task.expects(:abort).returns(true)
+        JobInvocation.expects(:from_param).with(@invocation.id.to_s).returns(@invocation)
+        post :cancel, :params => { :id => @invocation.id, :force => true }
+        result = ActiveSupport::JSON.decode(@response.body)
+        assert_equal result['cancelled'], true
+        assert_equal result['id'], @invocation.id
+
+        assert_response :success
+      end
+
+      test 'should error when trying to cancel a stopped job' do
+        @invocation.task.expects(:cancellable?).returns(false)
+        JobInvocation.expects(:from_param).with(@invocation.id.to_s).returns(@invocation)
+        post :cancel, :params => { :id => @invocation.id }
+        assert_response 422
+      end
+
+      test 'should rerun' do
+        JobInvocation.any_instance.expects(:generate_description)
+        JobInvocationComposer.any_instance
+                             .expects(:validate_job_category)
+                             .with(@invocation.job_category)
+                             .returns(@invocation.job_category)
+        post :rerun, params: { :id => @invocation.id }
+        assert_response :success
+        result = ActiveSupport::JSON.decode(@response.body)
+        targeting = Targeting.find(result['targeting_id'])
+        targeting.user_id.must_equal users(:admin).id
+        targeting.search_query.must_equal @invocation.targeting.search_query
+      end
+
+      test 'should not raise an exception when reruning failed has no hosts' do
+        JobInvocation.any_instance.expects(:generate_description)
+        JobInvocationComposer.any_instance
+                             .expects(:validate_job_category)
+                             .with(@invocation.job_category)
+                             .returns(@invocation.job_category)
+        post :rerun, params: { :id => @invocation.id, :failed_only => true }
+        assert_response :success
+        result = ActiveSupport::JSON.decode(@response.body)
+        targeting = Targeting.find(result['targeting_id'])
+        targeting.user_id.must_equal users(:admin).id
+        targeting.search_query.must_equal 'name ^ ()'
+      end
+
+      test 'should rerun failed only' do
+        @invocation = FactoryBot.create(:job_invocation, :with_template, :with_failed_task)
+        JobInvocation.any_instance.expects(:generate_description)
+        JobInvocationComposer.any_instance
+                             .expects(:validate_job_category)
+                             .with(@invocation.job_category)
+                             .returns(@invocation.job_category)
+        post :rerun, params: { :id => @invocation.id, :failed_only => true }
+        assert_response :success
+        result = ActiveSupport::JSON.decode(@response.body)
+        targeting = Targeting.find(result['targeting_id'])
+        hostnames = @invocation.template_invocations.map { |ti| ti.host.name }
+        targeting.user_id.must_equal users(:admin).id
+        targeting.search_query.must_equal "name ^ (#{hostnames.join(',')})"
+      end
     end
   end
 end