foreman-tasks 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb66102c3571249534dc929d2f1515666d393d4d9f7987c098e529849bfeca7
-  data.tar.gz: 01c53850b401aaf7c50f4807a5947956bdfe0fa99582c778bd615fba922286f9
+  metadata.gz: 99321b6a250c3166881128f05a88feb20cf24cc14e6ccbf813e5cc1853f4447a
+  data.tar.gz: 99ce5e8f81c1dbbdf41a6980b0ff4cb98529928dfd0769676821e6c71f8e2302
 SHA512:
-  metadata.gz: bc272bf14fd55504672179272d3b26123b0d3c68cc6ddd97a8181bf9cfc1dd257e809501b9cb4d94cfe5730e8098c2fa0232fe26b35d227921520a66d976ae39
-  data.tar.gz: 4b264080240f04e2544af9d026026df2c70f126f4168cef1f74a21fd0d810c21b7696f8fc7520c107d4402ea5bfad0762c75c93d6679c841e406e4d0898c23bd
+  metadata.gz: 7284f7dd3ff25480f57f697ebe57cbff5f6b865afd1e6792c710ea880bc23f0a6f261333c727a7917be9a30c9d1de54d7e4bfeebc9bc43635244fdd1ca8f5d79
+  data.tar.gz: 6580dd94504e0d9c5cf8f2d070bb42da3782feadbdba59ee9f1275e526b5b53b1cb34106163807f99eac09b59ba8991ea2f51bb224184007f7aee4bf30808553

data/.github/workflows/ruby_tests.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 2.7
       - name: Setup
         run: |
           gem install bundler
@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         foreman-core-branch: [develop]
-        ruby-version: [2.5, 2.6]
+        ruby-version: [2.5, 2.6, 2.7]
         node-version: [12]
     steps:
       - run: sudo apt-get update
@@ -60,6 +60,7 @@ jobs:
       - name: Setup Bundler
         run: |
           echo "gem 'foreman-tasks', path: './foreman-tasks'" > bundler.d/foreman-tasks.local.rb
+          echo "gem 'sqlite3'" >> bundler.d/foreman-tasks.local.rb
           gem install bundler
           bundle config set without journald development console libvirt
           bundle config set path vendor/bundle
@@ -70,5 +71,6 @@ jobs:
           bundle exec rake db:migrate
       - name: Run plugin tests
         run: |
-          bundle exec rake test:foreman-tasks
+          bundle exec rake test:foreman_tasks
+          bundle exec rake test:foreman_tasks_core
           bundle exec rake test TEST="test/unit/foreman/access_permissions_test.rb"

data/app/lib/actions/proxy_action.rb

@@ -218,10 +218,8 @@ module Actions
     end
 
     def get_proxy_data(response)
-      proxy_data = response['actions'].detect do |action|
-        action['class'] == proxy_action_name || action.fetch('input', {})['proxy_operation_name'] == proxy_operation_name
-      end
-      proxy_data.fetch('output', {})
+      response['actions'].detect { |action| action.fetch('input', {})['task_id'] == task.id }
+                         .try(:fetch, 'output', {})
     end
 
     def proxy_version(proxy)

data/app/models/foreman_tasks/task.rb

@@ -89,7 +89,7 @@ module ForemanTasks
       property :ended_at, ActiveSupport::TimeWithZone, desc: 'Returns date with time the task ended at'
     end
     class Jail < Safemode::Jail
-      allow :started_at, :ended_at, :result, :state, :label, :main_action, :action_output
+      allow :started_at, :ended_at, :result, :state, :label, :main_action, :action_continuous_output
     end
 
     def input
@@ -249,7 +249,7 @@ module ForemanTasks
       parts.join(' ').strip
     end
 
-    def action_output
+    def action_continuous_output
       return unless main_action.is_a?(Actions::Helpers::WithContinuousOutput)
       main_action.continuous_output.sort!
       main_action.continuous_output.raw_outputs

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '4.0.1'.freeze
+  VERSION = '4.1.0'.freeze
 end

data/test/core/unit/runner_test.rb

@@ -53,7 +53,7 @@ module ForemanTasksCore
         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.keys.count).must_equal 2
             outputs.values.each { |output| _(output).must_be_instance_of ContinuousOutput }
           end
         end
@@ -66,23 +66,10 @@ module ForemanTasksCore
             _(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.count).must_equal 2
             updates.keys.each do |key|
               _(key).must_be_instance_of ::Dynflow::Action::Suspended
             end
@@ -99,7 +86,7 @@ module ForemanTasksCore
         describe '#broadcast_data' do
           it 'publishes data for all hosts' do
             runner.broadcast_data('message', 'stdout')
-            _(runner.generate_updates.keys.count).must_equal 3
+            _(runner.generate_updates.keys.count).must_equal 2
           end
         end
 
@@ -115,7 +102,7 @@ module ForemanTasksCore
           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
+            _(runner.generate_updates.keys.count).must_equal 2
           end
 
           it 'publishes exit status if fatal' do

data/test/factories/task_factory.rb

@@ -42,11 +42,34 @@ FactoryBot.define do
         end
       end
 
+      factory :task_with_links do
+        # posts_count is declared as a transient attribute and available in
+        # attributes on the factory, as well as the callback via the evaluator
+        transient do
+          locks_count { 1 }
+          resource_id { 1 }
+          resource_type { 'type1' }
+        end
+
+        # the after(:create) yields two values; the user instance itself and the
+        # evaluator, which stores all values from the factory, including transient
+        # attributes; `create_list`'s second argument is the number of records
+        # to create and we make sure the user is associated properly to the post
+        after(:create) do |task, evaluator|
+          create_list(
+            :link,
+            1,
+            task: task,
+            resource_type: evaluator.resource_type,
+            resource_id: evaluator.resource_id
+          )
+        end
+      end
+
       factory :task_with_locks do
         # posts_count is declared as a transient attribute and available in
         # attributes on the factory, as well as the callback via the evaluator
         transient do
-          locks_count { 3 }
           resource_id { 1 }
           resource_type { 'type1' }
         end
@@ -58,7 +81,7 @@ FactoryBot.define do
         after(:create) do |task, evaluator|
           create_list(
             :lock,
-            evaluator.locks_count,
+            1,
             task: task,
             resource_type: evaluator.resource_type,
             resource_id: evaluator.resource_id
@@ -68,11 +91,15 @@ FactoryBot.define do
     end
   end
 
+  factory :link, :class => ForemanTasks::Link do
+    resource_type { 'Katello::Repository' }
+    resource_id { 1 }
+    association :task, factory: :task_with_links
+  end
+
   factory :lock, :class => ForemanTasks::Lock do
-    name { 'read' }
     resource_type { 'Katello::Repository' }
     resource_id { 1 }
-    exclusive { true }
     association :task, factory: :task_with_locks
   end
 end

data/test/unit/actions/proxy_action_test.rb

@@ -107,7 +107,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
@@ -302,7 +302,7 @@ class TasksTest < ActiveSupport::TestCase
       resource_type = 'restype1'
 
       task1_old = FactoryBot.create(
-        :task_with_locks,
+        :task_with_links,
         started_at: '2019-10-01 11:15:55',
         ended_at: '2019-10-01 11:15:57',
         resource_id: 1,
@@ -310,7 +310,7 @@ class TasksTest < ActiveSupport::TestCase
         resource_type: resource_type
       )
       task1_new = FactoryBot.create(
-        :task_with_locks,
+        :task_with_links,
         started_at: '2019-10-02 11:15:55',
         ended_at: '2019-10-02 11:15:57',
         resource_id: 1,
@@ -318,7 +318,7 @@ class TasksTest < ActiveSupport::TestCase
         resource_type: resource_type
       )
       task2 = FactoryBot.create(
-        :task_with_locks,
+        :task_with_links,
         started_at: '2019-10-03 11:15:55',
         ended_at: '2019-10-03 11:15:57',
         resource_id: 2,
@@ -326,7 +326,7 @@ class TasksTest < ActiveSupport::TestCase
         resource_type: resource_type
       )
       task3 = FactoryBot.create(
-        :task_with_locks,
+        :task_with_links,
         started_at: '2019-10-03 11:15:55',
         ended_at: '2019-10-03 11:15:57',
         resource_id: 3,

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.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow