foreman-tasks 11.0.1 → 11.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79bd6594ab916273ed9721d27414688ac717fd041ba33fdc67a1531e0ff0e30c
-  data.tar.gz: 91de29666d6b045b9179f662bda4f645e4532683ec1ff5e397b6f90948e6f32a
+  metadata.gz: 14937b8abb913127b2f1ab4028a967e25ed56ae35a476dc99dfd4bce07d9ec2a
+  data.tar.gz: 124922626f20e21268d8fd2c341be934af3d17a1e1fe9df34a61d8a90718508f
 SHA512:
-  metadata.gz: 81a6e7b9989f9becb04bf6486ded109c937e9395325ac060d9ce9b027343f44b2be70d44a1b997cb19c15520dabf7bdd654ddf7b017482b09e812fa980a7f103
-  data.tar.gz: ed7f40efaae46bbaec076deb15d0c7ff076fe661f5ad28bff67694070954eeac0229d3304a81375982cf96e9f11b60f7fb94402285310598837e52b0ffcec499
+  metadata.gz: ed4850116bdc86ba5118a2c1a08e4d475285f3236dee047f8b3c98c24c5eb4030b31a409b0293e5016153e92522f90ef31fccca48e901c7ca30f56b95f55d06b
+  data.tar.gz: c93ab2b4c78fac530e6bef4efca4c0baee0d03931522b15726526406881f8e538cec47dbba5ad863f86faca1a3ec025585453b3b47560435cd56fb1cd6fffb20

data/app/lib/actions/bulk_action.rb

@@ -23,11 +23,7 @@ module Actions
     end
 
     def humanized_name
-      if task.sub_tasks.first
-        task.sub_tasks.first.humanized[:action]
-      else
-        _('Bulk action')
-      end
+      with_sub_task { |t| t.humanized[:action] } || _('Bulk action')
     end
 
     def rescue_strategy
@@ -35,8 +31,7 @@ module Actions
     end
 
     def humanized_input
-      a_sub_task = task.sub_tasks.first
-      if a_sub_task
+      with_sub_task do |a_sub_task|
         [a_sub_task.humanized[:action].to_s.downcase] +
           Array(a_sub_task.humanized[:input]) + ['...']
       end
@@ -79,5 +74,17 @@ module Actions
     def extract_concurrency_limit(args = [], limit = nil)
       args.find { |arg| arg.is_a?(Hash) && arg.key?(:concurrency_limit) }&.fetch(:concurrency_limit) || limit
     end
+
+    def with_sub_task
+      sub_task = begin
+        task.sub_tasks.first
+      rescue ActiveRecord::RecordNotFound
+        # #task raises if the action has no task linked to it
+        # While it shouldn't happen, there's not much of a difference
+        # between a action not having a task and an action having a
+        # task but no sub tasks
+      end
+      yield sub_task if sub_task
+    end
   end
 end

data/app/models/foreman_tasks/triggering.rb

@@ -8,11 +8,9 @@ module ForemanTasks
     graphql_type '::Types::Triggering'
 
     before_save do
-      if future?
+      unless immediate?
         parse_start_at!
         parse_start_before!
-      else
-        self.start_at ||= Time.zone.now
       end
     end
 
@@ -31,21 +29,20 @@ module ForemanTasks
                            :inclusion => { :in => ALLOWED_INPUT_TYPES,
                                            :message => _('%{value} is not allowed input type') }
     validates :start_at_raw, format: { :with => TIME_REGEXP, :if => ->(triggering) { triggering.future? || (triggering.recurring? && triggering.start_at_raw) },
-                                       :message => _('%{value} is wrong format') }
+                                       :message => _('%{value} is wrong format'), :allow_blank => true }
     validates :start_before_raw, format: { :with => TIME_REGEXP, :if => :future?,
                                            :message => _('%{value} is wrong format'), :allow_blank => true }
     validates :days, format: { :with => DAYS_REGEXP,
                                :if => proc { |t| t.recurring? && t.input_type == :monthly } }
     validate :can_start_recurring, :if => :recurring?
     validate :can_start_future, :if => :future?
-    validate :start_at_is_not_past
+    validate :start_at_is_not_past, :if => ->(triggering) { triggering.start_at_relevant? && triggering.start_at_changed? }
 
     def self.new_from_params(params = {})
       new(params.except(:mode, :start_at, :start_before)).tap do |triggering|
         triggering.mode = params.fetch(:mode, :immediate).to_sym
         triggering.input_type = params.fetch(:input_type, :daily).to_sym
         triggering.end_time_limited = params[:end_time_limited] == 'true'
-        triggering.start_at_raw ||= Time.zone.now.strftime(TIME_FORMAT)
         triggering.recurring_logic = ::ForemanTasks::RecurringLogic.new_from_triggering(triggering) if triggering.recurring?
       end
     end
@@ -77,7 +74,7 @@ module ForemanTasks
 
     def delay_options
       {
-        :start_at => start_at.utc,
+        :start_at => start_at.try(:utc),
         :start_before => start_before.try(:utc),
       }
     end
@@ -108,6 +105,11 @@ module ForemanTasks
       self.start_before ||= Time.zone.parse(start_before_raw) if start_before_raw.present?
     end
 
+    # start_at is required for future execution and optional for recurring execution
+    def start_at_relevant?
+      future? || (recurring? && (start_at || start_at_raw))
+    end
+
     private
 
     def can_start_recurring

data/lib/foreman_tasks/version.rb

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

data/test/unit/triggering_test.rb

@@ -48,6 +48,22 @@ class TriggeringTest < ActiveSupport::TestCase
       triggering = FactoryBot.build(:triggering, :recurring_logic => logic, :mode => :recurring, :input_type => :cronline, :cronline => '* * * * *')
       assert_predicate(triggering, :valid?)
     end
+
+    it 'is valid by default' do
+      triggering = ForemanTasks::Triggering.new_from_params
+      assert triggering.save
+      assert_predicate triggering.start_at, :blank?
+      assert_predicate triggering, :valid?
+    end
+
+    it 'stays valid once created' do
+      triggering = ForemanTasks::Triggering.new_from_params({ :mode => "future" })
+      triggering.start_at = Time.zone.now + 1.second
+      triggering.save!
+      assert_predicate(triggering, :valid?)
+      Time.zone.expects(:now).never # No time comparisons should be done as nothing changed
+      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.1
+  version: 11.0.2
 platform: ruby
 authors:
 - Ivan Nečas
@@ -640,7 +640,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users
 test_files: