foreman-tasks 11.0.2 → 11.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14937b8abb913127b2f1ab4028a967e25ed56ae35a476dc99dfd4bce07d9ec2a
-  data.tar.gz: 124922626f20e21268d8fd2c341be934af3d17a1e1fe9df34a61d8a90718508f
+  metadata.gz: 8727c799c331337534ad6e826edfc65c25c5b76fff264065535e0bf6b0e6c7f9
+  data.tar.gz: d1e9f35147ad693323614d5b4c293a02d694135be01cf1d0bfca349441b2bac5
 SHA512:
-  metadata.gz: ed4850116bdc86ba5118a2c1a08e4d475285f3236dee047f8b3c98c24c5eb4030b31a409b0293e5016153e92522f90ef31fccca48e901c7ca30f56b95f55d06b
-  data.tar.gz: c93ab2b4c78fac530e6bef4efca4c0baee0d03931522b15726526406881f8e538cec47dbba5ad863f86faca1a3ec025585453b3b47560435cd56fb1cd6fffb20
+  metadata.gz: f75e8f7b86f28931be8e8b0d5c153f0386c17b05004bbe1c657f9bed4e52d6f1295fb0ea8923a531daf28b0c3abb8c8e1fa159f607428321e001a71ccc5a6603
+  data.tar.gz: f7d331cfa5d37aa0daf82a01aec928418d3a749c3bb5e36327954e11834d47cc9e94dbd3492eb28d24c2603eeec2bb4de6ba37c90744723f35c13277ee675a67

data/app/controllers/foreman_tasks/api/tasks_controller.rb

@@ -160,7 +160,7 @@ module ForemanTasks
         to_stop_length = to_stop.count
         skipped_length = total_length - to_stop_length
 
-        to_stop.find_each { |task| task.update(state: :stopped) }
+        to_stop.find_each(&:halt)
 
         if params[:search]
           notification = UINotifications::Tasks::TaskBulkStop.new(filtered_scope.first, to_stop_length, skipped_length)

data/app/models/foreman_tasks/triggering.rb

@@ -122,6 +122,7 @@ module ForemanTasks
     def can_start_future
       parse_start_before!
       parse_start_at!
+      return errors.add(:start_at, _('must be set')) if start_at.nil?
       errors.add(:start_before_raw, _('The task could not be started')) if !start_before.nil? && start_before < start_at
     end
 

data/lib/foreman_tasks/dynflow.rb

@@ -18,6 +18,11 @@ module ForemanTasks
           { _('Back to tasks') => "/#{ForemanTasks::TasksController.controller_path}" }
         end
         set(:world) { ::Rails.application.dynflow.world }
+        # Do not show Sinatra's pretty error pages in production
+        set(:show_exceptions) { ::Rails.env.development? }
+        # Let the errors propagate out from Sinatra to Rails.
+        # Without this, we'd only get a mostly blank 500 ISE page
+        set(:raise_errors) { !::Rails.env.development? }
       end
     end
   end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '11.0.2'.freeze
+  VERSION = '11.0.4'.freeze
 end

data/test/controllers/api/tasks_controller_test.rb

@@ -202,6 +202,47 @@ module ForemanTasks
           assert_equal({ 'result' => 'success' }, task.main_action.output['proxy_output'])
         end
       end
+
+      describe 'POST /api/tasks/bulk_stop' do
+        it 'requires search or task_ids parameter' do
+          post :bulk_stop
+          assert_response :bad_request
+          data = JSON.parse(response.body)
+          assert_includes data['error']['message'], 'Please provide at least one of search or task_ids parameters'
+        end
+
+        it 'stops tasks by task_ids and calls halt' do
+          task1 = FactoryBot.create(:task_with_locks, :user_create_task, state: 'running')
+          task2 = FactoryBot.create(:dynflow_task, :user_create_task, state: 'pending')
+          task3 = FactoryBot.create(:dynflow_task, :user_create_task, state: 'stopped')
+          post :bulk_stop, params: { task_ids: [task1.id, task2.id, task3.id] }
+          assert_response :success
+          data = JSON.parse(response.body)
+          assert_equal 3, data['total']
+          assert_equal 2, data['stopped_length']
+          assert_equal 1, data['skipped_length']
+          wait_for { task1.reload.state == 'stopped' }
+          wait_for { task2.reload.state == 'stopped' }
+          assert_predicate task1.locks, :empty?
+        end
+
+        it 'stops tasks by search query' do
+          task1 = FactoryBot.create(:task_with_locks, :user_create_task, state: 'running')
+          task2 = FactoryBot.create(:dynflow_task, :user_create_task, state: 'pending')
+
+          UINotifications::Tasks::TaskBulkStop.any_instance.expects(:deliver!)
+
+          post :bulk_stop, params: { search: 'label = Actions::User::Create' }
+          assert_response :success
+          data = JSON.parse(response.body)
+          assert_equal 2, data['total']
+          assert_equal 2, data['stopped_length']
+          assert_equal 0, data['skipped_length']
+          wait_for { task1.reload.state == 'stopped' }
+          wait_for { task2.reload.state == 'stopped' }
+          assert_predicate task1.locks, :empty?
+        end
+      end
     end
   end
 end

data/test/unit/triggering_test.rb

@@ -64,6 +64,14 @@ class TriggeringTest < ActiveSupport::TestCase
       Time.zone.expects(:now).never # No time comparisons should be done as nothing changed
       assert_predicate(triggering, :valid?)
     end
+
+    it 'requires start-at for future executions' do
+      triggering = ForemanTasks::Triggering.new_from_params({ :mode => "future" })
+      triggering.start_before = Time.zone.now + 1.hour
+      assert_not_predicate(triggering, :valid?)
+      triggering.start_at = Time.zone.now + 1.second
+      assert_predicate(triggering, :valid?)
+    end
   end
 
   it 'cannot have mode set to arbitrary value' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 11.0.2
+  version: 11.0.4
 platform: ruby
 authors:
 - Ivan Nečas