foreman-tasks 12.1.0 → 12.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faba9c8433d1b6c6faa616d7f6d58bfade42692f3e0afa6de35d67a0f1740bf2
-  data.tar.gz: 912a3a297fde3eddbbef8fca0e3da6e2bec6e6ca5882eb69a37eafe00a443ec9
+  metadata.gz: 51404155da98c410758c31a9dcb5648d4fc6144823baf0f1e9917df7ecf72777
+  data.tar.gz: 37a731595c5e39dd3492fc51f8405bf96806f127f8c7606efe6c327c9e7a0321
 SHA512:
-  metadata.gz: bb4842d2685129d098bb05d37a423ce7817294cf523d2dd7f4e867618d80584135564d9df7c24a460bdad68372ac663dde160189d60cdd580bce9b825d3d89f8
-  data.tar.gz: e11dd77bbe8d94f347ed31d5b67dfec2924fba89207007fa370f7053ec5549c46a5d16e1fc34ea4e4f23ad1607abddb40db87aa74413d9b8d51f214aecab9485
+  metadata.gz: 2b5563312efffad6871f30a4adb94c5579d5208205e6733ed35fe52b409e1fdcb0b8d1526a71ffe3ac57d852742eabe015a21e5d4a5b1fe2f359b3f5a3915950
+  data.tar.gz: 60e82330e3f9eedac8729b2c5060c1597d142081287616f4ff3d284c71b5d5d39644de6072f2c825069b9d6d972d564723700dce10baa43cdaf20504208c3910

data/app/lib/actions/helpers/lock.rb

@@ -13,12 +13,6 @@ module Actions
         end
       end
 
-      # @see Lock.lock!
-      def lock!(resource, *_lock_names)
-        Foreman::Deprecation.deprecation_warning('2.4', 'locking in foreman-tasks was reworked, please use a combination of exclusive_lock! and link! instead.')
-        exclusive_lock!(resource)
-      end
-
       # @see Lock.link!
       def link!(resource)
         phase! Dynflow::Action::Plan

data/app/lib/actions/middleware/keep_current_user.rb

@@ -12,26 +12,20 @@ module Actions
       end
 
       def run(*args)
-        restore_curent_user { pass(*args) }
+        restore_current_user { pass(*args) }
       end
 
       def finalize
-        current_id = User.current.try(:id)
-        saved_id = action.input[:current_user_id]
-        if User.current && saved_id && current_id != saved_id
-          Foreman::Deprecation.deprecation_warning('2.5', 'relying on per-step setting of current user in finalize phase')
-        end
-
-        restore_curent_user { pass }
+        restore_current_user { pass }
       end
 
       def finalize_phase(execution_plan, *args)
-        restore_curent_user(execution_plan.entry_action) { pass(execution_plan, *args) }
+        restore_current_user(execution_plan.entry_action) { pass(execution_plan, *args) }
       end
 
       # Run all execution plan lifecycle hooks as the original user
       def hook(*args)
-        restore_curent_user { pass(*args) }
+        restore_current_user { pass(*args) }
       end
 
       private
@@ -40,7 +34,7 @@ module Actions
         if User.current || action.input[:current_user_id].nil?
           yield
         else
-          restore_curent_user { yield }
+          restore_current_user { yield }
         end
       end
 
@@ -48,7 +42,7 @@ module Actions
         action.input[:current_user_id] = User.current.try(:id)
       end
 
-      def restore_curent_user(action = self.action)
+      def restore_current_user(action = self.action)
         old_user = User.current
         User.current = User.unscoped.find(action.input[:current_user_id]) if action.input[:current_user_id].present?
         yield

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '12.1.0'.freeze
+  VERSION = '12.1.1'.freeze
 end

metadata

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