foreman-tasks 9.0.4 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e88541d169e078a42071bfc0d756e358d466ae258226ed6cee8dd983fc76584
-  data.tar.gz: d9f01f14d1c38e962d165109d9b9a9f90d65cc86c768efe7f759d8ce7ea573f1
+  metadata.gz: 959e8a5bbb07d3d1b6b0d1f0b57f502b4397d5797ccc3037b1e9f77a8229b06a
+  data.tar.gz: f0bef4b1aca4d471a2616e6b41751f1da2165eb23d9da65be87bf055bc4fab05
 SHA512:
-  metadata.gz: c27603a712c4b81186e512cb187df730a523dda3eea70c4efc48d46c9758f6e71d500dcbe94d52e96e99a7cb47b4d698aec9c435d84fa679e86675fa0c5dd2c0
-  data.tar.gz: 53e273339622e47f59b4074ff3f044dc2c79e673d6c113b47611be0c9ab5d77ae829d2349bcf8abf3e7058c883865fd3bc56a8bdf797c838309782c47b87f538
+  metadata.gz: 2740338c22e5f0371358d037212a2964d4a46119dd2d2275dc290b91742be20bdd2b74ef8b9b036f60e975b4e798424b20776eabfeaa9f49049f24a2389d48c7
+  data.tar.gz: 43ae242cf9b8d2e7e873ab9fa99b5be157d1f9467e931d163ccf0e831d1e1969cd81ceb0391d1397f1d6606ee159b62e88e97202ddeac112579a34cc74f3d698

data/.rubocop.yml

@@ -10,7 +10,7 @@ AllCops:
     - 'node_modules/**/*'
     - 'locale/*'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 
 Lint/ShadowingOuterLocalVariable:
   Enabled: false

data/app/lib/actions/bulk_action.rb

@@ -9,7 +9,8 @@ module Actions
     #   Arguments that all the targets share
     def plan(action_class, targets, *args, concurrency_limit: nil, **kwargs)
       check_targets!(targets)
-      limit_concurrency_level!(concurrency_limit) if concurrency_limit
+      extracted_concurrency_limit = extract_concurrency_limit(args, concurrency_limit)
+      limit_concurrency_level!(extracted_concurrency_limit) if extracted_concurrency_limit
       plan_self(:action_class => action_class.to_s,
                 :target_ids => targets.map(&:id),
                 :target_class => targets.first.class.to_s,
@@ -72,5 +73,11 @@ module Actions
     def total_count
       input[:target_ids].count
     end
+
+    private
+
+    def extract_concurrency_limit(args = [], limit = nil)
+      args.find { |arg| arg.is_a?(Hash) && arg.key?(:concurrency_limit) }&.fetch(:concurrency_limit) || limit
+    end
   end
 end

data/app/models/foreman_tasks/concerns/action_triggering.rb

@@ -23,12 +23,12 @@ module ForemanTasks
       # @override
       def destroy_action; end
 
-      def save(*args)
-        dynflow_task_wrap(:save) { super(*args) }
+      def save(...)
+        dynflow_task_wrap(:save) { super(...) }
       end
 
-      def save!(*args)
-        dynflow_task_wrap(:save) { super(*args) }
+      def save!(...)
+        dynflow_task_wrap(:save) { super(...) }
       end
 
       def destroy
@@ -37,14 +37,14 @@ module ForemanTasks
 
       # In order to use host.<attribute>_changed?, we must assign_attributes to
       # the host record for these update and update! methods.
-      def update(*args)
-        assign_attributes(*args)
+      def update(...)
+        assign_attributes(...)
         dynflow_task_wrap(:save) { save }
       end
       alias update_attributes update
 
-      def update!(*args)
-        assign_attributes(*args)
+      def update!(...)
+        assign_attributes(...)
         dynflow_task_wrap(:save) { save! }
       end
       alias update_attributes! update!

data/app/models/foreman_tasks/remote_task.rb

@@ -42,9 +42,6 @@ module ForemanTasks
     end
 
     def update_from_batch_trigger(data, parent = {})
-      # The ID might get overwritten later, but it is a sane default in case of async
-      # triggering where we only get an id of a remote parent
-      self.remote_task_id = execution_plan_id
       if data['result'] == 'success'
         self.remote_task_id = data['task_id']
         self.state = 'triggered'

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '9.0.4'.freeze
+  VERSION = '9.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 9.0.4
+  version: 9.1.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow