foreman-tasks 4.0.0 → 5.0.0

data/test/unit/actions/proxy_action_test.rb

@@ -14,6 +14,9 @@ module ForemanTasks
         Support::DummyProxyAction.any_instance.stubs(:with_batch_triggering?).returns(batch_triggering)
         Support::DummyProxyAction.reset
         RemoteTask.any_instance.stubs(:proxy).returns(Support::DummyProxyAction.proxy)
+        Setting.stubs(:[]).with('foreman_tasks_proxy_action_retry_interval')
+        Setting.stubs(:[]).with('foreman_tasks_proxy_action_retry_count')
+        Setting.stubs(:[]).with('foreman_tasks_proxy_batch_trigger')
         @action = create_and_plan_action(Support::DummyProxyAction,
                                          Support::DummyProxyAction.proxy,
                                          'Proxy::DummyAction',
@@ -107,7 +110,7 @@ module ForemanTasks
         _(action.world.clock.pending_pings.length).must_equal 1
         _(action.output[:metadata][:failed_proxy_tasks].length).must_equal 1
         2.times { action.output[:metadata][:failed_proxy_tasks] << {} }
-        _ { proc { action = run_stubbed_action.call action } }.must_raise(Errno::ECONNREFUSED)
+        _(proc { action = run_stubbed_action.call action }).must_raise(Errno::ECONNREFUSED)
         _(action.state).must_equal :error
       end
 

data/test/unit/task_test.rb

@@ -31,9 +31,9 @@ class TasksTest < ActiveSupport::TestCase
         assert_equal [@task_one], ForemanTasks::Task.search_for("user = #{@user_one.login}")
       end
 
-      test 'cannot search by arbitrary key' do
-        _ { proc { ForemanTasks::Task.search_for('user.my_key ~ 5') } }.must_raise(ScopedSearch::QueryNotSupported)
-        _ { proc { ForemanTasks::Task.search_for('user. = 5') } }.must_raise(ScopedSearch::QueryNotSupported)
+      it 'cannot search by arbitrary key' do
+        _(proc { ForemanTasks::Task.search_for('user.my_key ~ 5') }).must_raise(ScopedSearch::QueryNotSupported)
+        _(proc { ForemanTasks::Task.search_for('user. = 5') }).must_raise(ScopedSearch::QueryNotSupported)
       end
 
       test 'can search the tasks by negated user' do
@@ -59,8 +59,8 @@ class TasksTest < ActiveSupport::TestCase
       end
 
       test 'cannot glob on user\'s id' do
-        _ { proc { ForemanTasks::Task.search_for("user.id ~ something") } }.must_raise(ScopedSearch::QueryNotSupported)
-        _ { proc { ForemanTasks::Task.search_for("user.id ~ 5") } }.must_raise(ScopedSearch::QueryNotSupported)
+        _(proc { ForemanTasks::Task.search_for("user.id ~ something") }).must_raise(ScopedSearch::QueryNotSupported)
+        _(proc { ForemanTasks::Task.search_for("user.id ~ 5") }).must_raise(ScopedSearch::QueryNotSupported)
       end
 
       test 'can search the tasks by user with wildcards' do
@@ -126,17 +126,17 @@ class TasksTest < ActiveSupport::TestCase
       end
 
       it 'raises an exception if duration is unknown' do
-        _ { proc { ForemanTasks::Task.search_for('duration = "25 potatoes"') } }.must_raise ScopedSearch::QueryNotSupported
+        _(proc { ForemanTasks::Task.search_for('duration = "25 potatoes"') }).must_raise ScopedSearch::QueryNotSupported
       end
     end
 
     context 'by taxonomies' do
       test 'can search by taxonomies using IN' do
-        assert_nothing_raised(PG::SyntaxError) { ForemanTasks::Task.search_for('location_id ^ (1)').first }
-        assert_nothing_raised(PG::SyntaxError) { ForemanTasks::Task.search_for('organization_id ^ (1)').first }
-        assert_nothing_raised(PG::SyntaxError) { ForemanTasks::Task.search_for('location_id ^ (1,2)').first }
-        assert_nothing_raised(PG::SyntaxError) { ForemanTasks::Task.search_for('organization_id ^ (1,2)').first }
-        assert_nothing_raised(PG::SyntaxError) { ForemanTasks::Task.search_for('organization_id = 1').first }
+        assert_nothing_raised { ForemanTasks::Task.search_for('location_id ^ (1)').first }
+        assert_nothing_raised { ForemanTasks::Task.search_for('organization_id ^ (1)').first }
+        assert_nothing_raised { ForemanTasks::Task.search_for('location_id ^ (1,2)').first }
+        assert_nothing_raised { ForemanTasks::Task.search_for('organization_id ^ (1,2)').first }
+        assert_nothing_raised { ForemanTasks::Task.search_for('organization_id = 1').first }
       end
     end
   end
@@ -296,43 +296,56 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   describe 'search for resource_ids' do
-    it 'finds tasks' do
-      label = 'label1'
-      resource_ids = [1, 2]
-      resource_type = 'restype1'
+    label = 'label1'
+    resource_ids = [1, 2]
+    resource_type = 'restype1'
 
-      task1_old = FactoryBot.create(
-        :task_with_locks,
+    let(:task1_old) do
+      FactoryBot.create(
+        :task_with_links,
         started_at: '2019-10-01 11:15:55',
         ended_at: '2019-10-01 11:15:57',
         resource_id: 1,
         label: label,
         resource_type: resource_type
       )
-      task1_new = FactoryBot.create(
-        :task_with_locks,
+    end
+    let(:task1_new) do
+      FactoryBot.create(
+        :task_with_links,
         started_at: '2019-10-02 11:15:55',
         ended_at: '2019-10-02 11:15:57',
         resource_id: 1,
         label: label,
         resource_type: resource_type
       )
-      task2 = FactoryBot.create(
-        :task_with_locks,
+    end
+    let(:task2) do
+      FactoryBot.create(
+        :task_with_links,
         started_at: '2019-10-03 11:15:55',
         ended_at: '2019-10-03 11:15:57',
         resource_id: 2,
         label: label,
         resource_type: resource_type
       )
-      task3 = FactoryBot.create(
-        :task_with_locks,
+    end
+    let(:task3) do
+      FactoryBot.create(
+        :task_with_links,
         started_at: '2019-10-03 11:15:55',
         ended_at: '2019-10-03 11:15:57',
         resource_id: 3,
         label: label,
         resource_type: 'another_type'
       )
+    end
+
+    it 'finds tasks' do
+      task1_old
+      task1_new
+      task2
+      task3
 
       result = ForemanTasks::Task.search_for(
         "resource_id ^ (#{resource_ids.join(',')}) and resource_type = #{resource_type}"
@@ -343,5 +356,23 @@ class TasksTest < ActiveSupport::TestCase
       assert_includes result, task2
       assert_not_includes result, task3
     end
+
+    it 'finds latest task for each resource_id' do
+      task1_old
+      task1_new
+      task2
+      task3
+
+      result = ForemanTasks::Task.latest_tasks_by_resource_ids(
+        label,
+        resource_type,
+        resource_ids
+      )
+      assert_equal 2, result.length
+      assert_equal resource_ids, result.keys.sort
+      assert_equal task1_new, result[1]
+      assert_equal task2, result[2]
+      assert_not_includes result.values, task3
+    end
   end
 end

data/test/unit/triggering_test.rb

@@ -24,7 +24,7 @@ class TriggeringTest < ActiveSupport::TestCase
   it 'cannot have mode set to arbitrary value' do
     triggering = FactoryBot.build(:triggering)
     _(triggering).must_be :valid?
-    _ { proc { triggering.mode = 'bogus' } }.must_raise ArgumentError
-    _ { proc { triggering.mode = 27 } }.must_raise ArgumentError
+    _(proc { triggering.mode = 'bogus' }).must_raise ArgumentError
+    _(proc { triggering.mode = 27 }).must_raise ArgumentError
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
-- !ruby/object:Gem::Dependency
-  name: foreman-tasks-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +124,7 @@ files:
 - app/assets/javascripts/foreman_tasks/trigger_form.js
 - app/assets/stylesheets/foreman_tasks/foreman_tasks.css
 - app/assets/stylesheets/foreman_tasks/trigger_form.css
+- app/controllers/concerns/foreman_tasks/find_tasks_common.rb
 - app/controllers/foreman_tasks/api/recurring_logics_controller.rb
 - app/controllers/foreman_tasks/api/tasks_controller.rb
 - app/controllers/foreman_tasks/concerns/hosts_controller_extension.rb
@@ -146,6 +133,9 @@ files:
 - app/controllers/foreman_tasks/react_controller.rb
 - app/controllers/foreman_tasks/recurring_logics_controller.rb
 - app/controllers/foreman_tasks/tasks_controller.rb
+- app/graphql/types/recurring_logic.rb
+- app/graphql/types/task.rb
+- app/graphql/types/triggering.rb
 - app/helpers/foreman_tasks/foreman_tasks_helper.rb
 - app/helpers/foreman_tasks/tasks_helper.rb
 - app/lib/actions/action_with_sub_plans.rb
@@ -166,6 +156,7 @@ files:
 - app/lib/actions/middleware/keep_current_taxonomies.rb
 - app/lib/actions/middleware/keep_current_timezone.rb
 - app/lib/actions/middleware/keep_current_user.rb
+- app/lib/actions/middleware/load_setting_values.rb
 - app/lib/actions/middleware/proxy_batch_triggering.rb
 - app/lib/actions/middleware/rails_executor_wrap.rb
 - app/lib/actions/middleware/recurring_logic.rb
@@ -272,6 +263,7 @@ files:
 - lib/foreman_tasks.rb
 - lib/foreman_tasks/authorizer_ext.rb
 - lib/foreman_tasks/cleaner.rb
+- lib/foreman_tasks/continuous_output.rb
 - lib/foreman_tasks/dynflow.rb
 - lib/foreman_tasks/dynflow/configuration.rb
 - lib/foreman_tasks/dynflow/console_authorizer.rb
@@ -305,14 +297,14 @@ files:
 - test/controllers/api/tasks_controller_test.rb
 - test/controllers/recurring_logics_controller_test.rb
 - test/controllers/tasks_controller_test.rb
-- test/core/unit/dispatcher_test.rb
-- test/core/unit/runner_test.rb
-- test/core/unit/task_launcher_test.rb
 - test/factories/recurring_logic_factory.rb
 - test/factories/task_factory.rb
 - test/factories/triggering_factory.rb
-- test/foreman_tasks_core_test_helper.rb
 - test/foreman_tasks_test_helper.rb
+- test/graphql/queries/recurring_logic_test.rb
+- test/graphql/queries/recurring_logics_query_test.rb
+- test/graphql/queries/task_query_test.rb
+- test/graphql/queries/tasks_query_test.rb
 - test/helpers/foreman_tasks/foreman_tasks_helper_test.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
 - test/lib/actions/middleware/keep_current_request_id_test.rb
@@ -336,7 +328,6 @@ files:
 - test/unit/dashboard_table_filter_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
 - test/unit/locking_test.rb
-- test/unit/otp_manager_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb
 - test/unit/remote_task_test.rb
@@ -620,14 +611,14 @@ test_files:
 - test/controllers/api/tasks_controller_test.rb
 - test/controllers/recurring_logics_controller_test.rb
 - test/controllers/tasks_controller_test.rb
-- test/core/unit/dispatcher_test.rb
-- test/core/unit/runner_test.rb
-- test/core/unit/task_launcher_test.rb
 - test/factories/recurring_logic_factory.rb
 - test/factories/task_factory.rb
 - test/factories/triggering_factory.rb
-- test/foreman_tasks_core_test_helper.rb
 - test/foreman_tasks_test_helper.rb
+- test/graphql/queries/recurring_logic_test.rb
+- test/graphql/queries/recurring_logics_query_test.rb
+- test/graphql/queries/task_query_test.rb
+- test/graphql/queries/tasks_query_test.rb
 - test/helpers/foreman_tasks/foreman_tasks_helper_test.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
 - test/lib/actions/middleware/keep_current_request_id_test.rb
@@ -651,7 +642,6 @@ test_files:
 - test/unit/dashboard_table_filter_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
 - test/unit/locking_test.rb
-- test/unit/otp_manager_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb
 - test/unit/remote_task_test.rb

data/test/core/unit/dispatcher_test.rb

@@ -1,43 +0,0 @@
-require 'foreman_tasks_core_test_helper'
-require 'foreman_tasks/test_helpers'
-require 'foreman_tasks_core/runner'
-
-module ForemanTasksCore
-  module Runner
-    describe Dispatcher::RunnerActor do
-      include ForemanTasks::TestHelpers::WithInThreadExecutor
-
-      let(:dispatcher) { Dispatcher.instance }
-      let(:suspended_action) { mock }
-      let(:runner) { mock.tap { |r| r.stubs(:id) } }
-      let(:clock) { ForemanTasks.dynflow.world.clock }
-      let(:logger) { mock.tap { |l| l.stubs(:debug) } }
-      let(:actor) do
-        Dispatcher::RunnerActor.new dispatcher, suspended_action, runner, clock, logger
-      end
-
-      it 'delivers all updates to actions' do
-        targets = (0..2).map { mock }.each_with_index { |mock, index| mock.expects(:<<).with(index) }
-        updates = targets.each_with_index.reduce({}) { |acc, (cur, index)| acc.merge(cur => index) }
-        runner.expects(:run_refresh).returns(updates)
-        actor.expects(:plan_next_refresh)
-        actor.refresh_runner
-      end
-
-      it 'plans next refresh' do
-        runner.expects(:run_refresh).returns({})
-        actor.expects(:plan_next_refresh)
-        actor.refresh_runner
-      end
-
-      it 'does not plan next resfresh if done' do
-        update = Update.new(nil, 0)
-        suspended_action.expects(:<<).with(update)
-        runner.expects(:run_refresh).returns(suspended_action => update)
-        dispatcher.expects(:finish)
-        dispatcher.ticker.expects(:tell).never
-        actor.refresh_runner
-      end
-    end
-  end
-end

data/test/core/unit/runner_test.rb

@@ -1,129 +0,0 @@
-require 'foreman_tasks_core_test_helper'
-require 'foreman_tasks/test_helpers'
-require 'foreman_tasks_core/runner'
-require 'ostruct'
-
-module ForemanTasksCore
-  module Runner
-    class RunnerTest < ActiveSupport::TestCase
-      include ForemanTasks::TestHelpers::WithInThreadExecutor
-
-      describe Base do
-        let(:suspended_action) { Class.new }
-        let(:runner) { Base.new suspended_action: suspended_action }
-
-        describe '#generate_updates' do
-          it 'returns empty hash when there are no outputs' do
-            _(runner.generate_updates).must_be :empty?
-          end
-
-          it 'returns a hash with outputs' do
-            message = 'a message'
-            type = 'stdout'
-            runner.publish_data(message, type)
-            updates = runner.generate_updates
-            _(updates.keys).must_equal [suspended_action]
-            update = updates.values.first
-            _(update.exit_status).must_be :nil?
-            _(update.continuous_output.raw_outputs.count).must_equal 1
-          end
-
-          it 'works in compatibility mode' do
-            runner = Base.new
-            message = 'a message'
-            type = 'stdout'
-            runner.publish_data(message, type)
-            updates = runner.generate_updates
-            _(updates.keys).must_equal [nil]
-            update = updates.values.first
-            _(update.exit_status).must_be :nil?
-            _(update.continuous_output.raw_outputs.count).must_equal 1
-          end
-        end
-      end
-
-      describe Parent do
-        let(:suspended_action) { ::Dynflow::Action::Suspended.allocate }
-        let(:runner) { Parent.new targets, suspended_action: suspended_action }
-        let(:targets) do
-          { 'foo' => { 'execution_plan_id' => '123', 'run_step_id' => 2 },
-            'bar' => { 'execution_plan_id' => '456', 'run_step_id' => 2 } }
-        end
-
-        describe '#initialize_continuous_outputs' do
-          it 'initializes outputs for targets and parent' do
-            outputs = runner.initialize_continuous_outputs
-            _(outputs.keys.count).must_equal 3
-            outputs.values.each { |output| _(output).must_be_instance_of ContinuousOutput }
-          end
-        end
-
-        describe '#generate_updates' do
-          it 'returns only updates for hosts with pending outputs' do
-            _(runner.generate_updates).must_equal({})
-            runner.publish_data_for('foo', 'something', 'something')
-            updates = runner.generate_updates
-            _(updates.keys.count).must_equal 1
-          end
-
-          it 'works in compatibility mode' do
-            runner = Parent.new targets
-            _(runner.generate_updates).must_equal({})
-            runner.broadcast_data('something', 'stdout')
-            updates = runner.generate_updates
-            _(updates.keys.count).must_equal 3
-            # One of the keys is nil in compatibility mode
-            _(updates.keys.compact.count).must_equal 2
-            updates.keys.compact.each do |key|
-              _(key).must_be_instance_of ::Dynflow::Action::Suspended
-            end
-          end
-
-          it 'works without compatibility mode' do
-            runner.broadcast_data('something', 'stdout')
-            updates = runner.generate_updates
-            _(updates.keys.count).must_equal 3
-            updates.keys.each do |key|
-              _(key).must_be_instance_of ::Dynflow::Action::Suspended
-            end
-          end
-        end
-
-        describe '#publish_data_for' do
-          it 'publishes data for a single host' do
-            runner.publish_data_for('foo', 'message', 'stdout')
-            _(runner.generate_updates.keys.count).must_equal 1
-          end
-        end
-
-        describe '#broadcast_data' do
-          it 'publishes data for all hosts' do
-            runner.broadcast_data('message', 'stdout')
-            _(runner.generate_updates.keys.count).must_equal 3
-          end
-        end
-
-        describe '#publish_exception' do
-          let(:exception) do
-            exception = RuntimeError.new
-            exception.stubs(:backtrace).returns([])
-            exception
-          end
-
-          before { runner.logger.stubs(:error) }
-
-          it 'broadcasts the exception to all targets' do
-            runner.expects(:publish_exit_status).never
-            runner.publish_exception('general failure', exception, false)
-            _(runner.generate_updates.keys.count).must_equal 3
-          end
-
-          it 'publishes exit status if fatal' do
-            runner.expects(:publish_exit_status)
-            runner.publish_exception('general failure', exception, true)
-          end
-        end
-      end
-    end
-  end
-end