dynflow 1.8.1 → 1.8.3

data/lib/dynflow/execution_plan/steps/plan_step.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module ExecutionPlan::Steps
     class PlanStep < Abstract
@@ -73,17 +74,17 @@ module Dynflow
       def self.new_from_hash(hash, execution_plan_id, world)
         check_class_matching hash
         new execution_plan_id,
-            hash[:id],
-            hash[:state],
-            Action.constantize(hash[:action_class]),
-            hash[:action_id],
-            hash_to_error(hash[:error]),
-            world,
-            string_to_time(hash[:started_at]),
-            string_to_time(hash[:ended_at]),
-            hash[:execution_time],
-            hash[:real_time],
-            hash[:children]
+          hash[:id],
+          hash[:state],
+          Action.constantize(hash[:action_class]),
+          hash[:action_id],
+          hash_to_error(hash[:error]),
+          world,
+          string_to_time(hash[:started_at]),
+          string_to_time(hash[:ended_at]),
+          hash[:execution_time],
+          hash[:real_time],
+          hash[:children]
       end
 
       def load_action

data/lib/dynflow/execution_plan/steps/run_step.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module ExecutionPlan::Steps
     class RunStep < AbstractFlowStep
-
       def self.state_transitions
         @state_transitions ||= {
             pending:   [:running, :skipped, :error], # :skipped when it cannot be run because it depends on skipping step

data/lib/dynflow/execution_plan/steps.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
+
 module Dynflow
   module ExecutionPlan::Steps
-
     require 'dynflow/execution_plan/steps/error'
     require 'dynflow/execution_plan/steps/abstract'
     require 'dynflow/execution_plan/steps/abstract_flow_step'
     require 'dynflow/execution_plan/steps/plan_step'
     require 'dynflow/execution_plan/steps/run_step'
     require 'dynflow/execution_plan/steps/finalize_step'
-
   end
 end

data/lib/dynflow/execution_plan.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
+
 require 'securerandom'
 
 module Dynflow
   # rubocop:disable Metrics/ClassLength
   # TODO extract planning logic to an extra class ExecutionPlanner
   class ExecutionPlan < Serializable
-
     # a fallback object representing a plan with some corrupted data,
     # preventing to load the whole plan properly, this can be used for presenting
     # at least some data and not running into internal server errors
     class InvalidPlan
       attr_reader :exception, :id, :label, :state,
-                  :started_at, :ended_at,
-                  :execution_time, :real_time, :execution_history
+        :started_at, :ended_at,
+        :execution_time, :real_time, :execution_history
 
       def initialize(exception, id, label, state,
                      started_at = nil, ended_at = nil,
@@ -45,8 +45,8 @@ module Dynflow
     require 'dynflow/execution_plan/dependency_graph'
 
     attr_reader :id, :world, :label,
-                :root_plan_step, :steps, :run_flow, :finalize_flow,
-                :started_at, :ended_at, :execution_time, :real_time, :execution_history
+      :root_plan_step, :steps, :run_flow, :finalize_flow,
+      :started_at, :ended_at, :execution_time, :real_time, :execution_history
 
     def self.states
       @states ||= [:pending, :scheduled, :planning, :planned, :running, :paused, :stopped]
@@ -83,9 +83,9 @@ module Dynflow
                    real_time         = 0.0,
                    execution_history = ExecutionHistory.new)
       id ||= SecureRandom.uuid
-      @id                = Type! id, String
-      @world             = Type! world, World
-      @label             = Type! label, String, NilClass
+      @id = Type! id, String
+      @world = Type! world, World
+      @label = Type! label, String, NilClass
       self.state         = state
       @run_flow          = Type! run_flow, Flows::Abstract
       @finalize_flow     = Type! finalize_flow, Flows::Abstract
@@ -130,7 +130,7 @@ module Dynflow
         key = failure? ? :failure : :success
         Dynflow::Telemetry.with_instance do |t|
           t.increment_counter(:dynflow_finished_execution_plans, 1,
-                              telemetry_common_options.merge(:result => key.to_s))
+            telemetry_common_options.merge(:result => key.to_s))
         end
         hooks_to_run << key
         unlock_all_singleton_locks!
@@ -140,11 +140,11 @@ module Dynflow
         # ignore
       end
       logger.debug format('%13s %s    %9s >> %9s',
-                          'ExecutionPlan', id, original, state)
+        'ExecutionPlan', id, original, state)
       add_history_notice(history_notice)
       self.save
       toggle_telemetry_state original == :pending ? nil : original.to_s,
-                             self.state == :stopped ? nil : self.state.to_s
+        self.state == :stopped ? nil : self.state.to_s
       hooks_to_run.each { |kind| run_hooks kind }
     end
 
@@ -238,7 +238,7 @@ module Dynflow
     end
 
     def steps_in_state(*states)
-      self.steps.values.find_all {|step| states.include?(step.state) }
+      self.steps.values.find_all { |step| states.include?(step.state) }
     end
 
     def generate_action_id
@@ -257,11 +257,11 @@ module Dynflow
       run_hooks(:pending)
       serializer = root_plan_step.delay(delay_options, args)
       delayed_plan = DelayedPlan.new(@world,
-                                     id,
-                                     delay_options[:start_at],
-                                     delay_options.fetch(:start_before, nil),
-                                     serializer,
-                                     delay_options[:frozen] || false)
+        id,
+        delay_options[:start_at],
+        delay_options.fetch(:start_before, nil),
+        serializer,
+        delay_options[:frozen] || false)
       persistence.save_delayed_plan(delayed_plan)
     ensure
       update_state(error? ? :stopped : :scheduled)
@@ -455,36 +455,36 @@ module Dynflow
       execution_plan_id = hash[:id]
       steps             = steps_from_hash(hash[:step_ids], execution_plan_id, world)
       self.new(world,
-               execution_plan_id,
-               hash[:label],
-               hash[:state],
-               steps[hash[:root_plan_step_id]],
-               load_flow(hash[:run_flow]),
-               load_flow(hash[:finalize_flow]),
-               steps,
-               string_to_time(hash[:started_at]),
-               string_to_time(hash[:ended_at]),
-               hash[:execution_time].to_f,
-               hash[:real_time].to_f,
-               ExecutionHistory.new_from_hash(hash[:execution_history]))
+        execution_plan_id,
+        hash[:label],
+        hash[:state],
+        steps[hash[:root_plan_step_id]],
+        load_flow(hash[:run_flow]),
+        load_flow(hash[:finalize_flow]),
+        steps,
+        string_to_time(hash[:started_at]),
+        string_to_time(hash[:ended_at]),
+        hash[:execution_time].to_f,
+        hash[:real_time].to_f,
+        ExecutionHistory.new_from_hash(hash[:execution_history]))
     rescue => plan_exception
       begin
         world.logger.error("Could not load execution plan #{execution_plan_id}")
         world.logger.error(plan_exception)
         InvalidPlan.new(plan_exception, execution_plan_id,
-                        hash[:label],
-                        hash[:state],
-                        string_to_time(hash[:started_at]),
-                        string_to_time(hash[:ended_at]),
-                        hash[:execution_time].to_f,
-                        hash[:real_time].to_f,
-                        ExecutionHistory.new_from_hash(hash[:execution_history]))
+          hash[:label],
+          hash[:state],
+          string_to_time(hash[:started_at]),
+          string_to_time(hash[:ended_at]),
+          hash[:execution_time].to_f,
+          hash[:real_time].to_f,
+          ExecutionHistory.new_from_hash(hash[:execution_history]))
       rescue => invalid_plan_exception
         world.logger.error("Could not even load a fallback execution plan for #{execution_plan_id}")
         world.logger.error(invalid_plan_exception)
         InvalidPlan.new(invalid_plan_exception, execution_plan_id,
-                        hash[:label],
-                        hash[:state])
+          hash[:label],
+          hash[:state])
       end
     end
 
@@ -530,12 +530,12 @@ module Dynflow
 
     def add_step(step_class, action_class, action_id, state = :pending)
       step_class.new(self.id,
-                     self.generate_step_id,
-                     state,
-                     action_class,
-                     action_id,
-                     nil,
-                     world).tap do |new_step|
+        self.generate_step_id,
+        state,
+        action_class,
+        action_id,
+        nil,
+        world).tap do |new_step|
         @steps[new_step.id] = new_step
       end
     end
@@ -571,9 +571,9 @@ module Dynflow
       @label = root_plan_step.action_class if @label.nil?
       Dynflow::Telemetry.with_instance do |t|
         t.set_gauge(:dynflow_active_execution_plans, '-1',
-                    telemetry_common_options.merge(:state => original)) unless original.nil?
+          telemetry_common_options.merge(:state => original)) unless original.nil?
         t.set_gauge(:dynflow_active_execution_plans, '+1',
-                    telemetry_common_options.merge(:state => new)) unless new.nil?
+          telemetry_common_options.merge(:state => new)) unless new.nil?
       end
     end
 

data/lib/dynflow/executors/abstract/core.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
     module Abstract
@@ -20,7 +21,7 @@ module Dynflow
         def handle_execution(execution_plan_id, finished)
           if terminating?
             raise Dynflow::Error,
-                  "cannot accept execution_plan_id:#{execution_plan_id} core is terminating"
+              "cannot accept execution_plan_id:#{execution_plan_id} core is terminating"
           end
 
           handle_work(@director.start_execution(execution_plan_id, finished))
@@ -30,7 +31,7 @@ module Dynflow
           Type! event, Director::Event
           if terminating?
             raise Dynflow::Error,
-                  "cannot accept event: #{event} core is terminating"
+              "cannot accept event: #{event} core is terminating"
           end
           handle_work(@director.handle_event(event))
         end
@@ -38,7 +39,7 @@ module Dynflow
         def handle_planning(execution_plan_id)
           if terminating?
             raise Dynflow::Error,
-                  "cannot accept event: #{event} core is terminating"
+              "cannot accept event: #{event} core is terminating"
           end
 
           handle_work(@director.handle_planning(execution_plan_id))

data/lib/dynflow/executors/parallel/core.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'dynflow/executors/parallel/pool'
 require 'dynflow/executors/parallel/worker'
 
@@ -19,8 +20,8 @@ module Dynflow
           @queues_options.each do |(queue_name, queue_options)|
             queue_pool_size = queue_options.fetch(:pool_size, default_pool_size)
             @pools[queue_name] = Pool.spawn("pool #{queue_name}", @world,
-                                            reference, queue_name, queue_pool_size,
-                                            @world.transaction_adapter)
+              reference, queue_name, queue_pool_size,
+              @world.transaction_adapter)
           end
         end
 

data/lib/dynflow/executors/parallel/pool.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
     class Parallel
@@ -16,10 +17,6 @@ module Dynflow
             @jobs.shift
           end
 
-          def queue_size
-            execution_status.values.reduce(0, :+)
-          end
-
           def empty?
             @jobs.empty?
           end

data/lib/dynflow/executors/parallel/worker.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
     class Parallel

data/lib/dynflow/executors/parallel.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
     class Parallel
@@ -12,7 +13,7 @@ module Dynflow
       def initialize(world,
                      executor_class:,
                      heartbeat_interval:,
-                     queues_options: { :default => { :pool_size => 5 }})
+                     queues_options: { :default => { :pool_size => 5 } })
         @world  = world
         @logger = world.logger
         @core = executor_class.spawn name:        'parallel-executor-core',
@@ -24,7 +25,7 @@ module Dynflow
         accepted = @core.ask([:handle_execution, execution_plan_id, finished])
         accepted.value! if wait_for_acceptance
         finished
-      rescue Concurrent::Actor::ActorTerminated => error
+      rescue Concurrent::Actor::ActorTerminated
         dynflow_error = Dynflow::Error.new('executor terminated')
         finished.reject dynflow_error unless finished.resolved?
         raise dynflow_error

data/lib/dynflow/executors/sidekiq/core.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'dynflow/executors/sidekiq/serialization'
 require 'dynflow/executors/sidekiq/internal_job_base'
 require 'dynflow/executors/sidekiq/orchestrator_jobs'
@@ -9,9 +10,10 @@ require 'sidekiq-reliable-fetch'
 Sidekiq.configure_server do |config|
   # Use semi-reliable fetch
   # for details see https://gitlab.com/gitlab-org/sidekiq-reliable-fetch/blob/master/README.md
-  config.options[:semi_reliable_fetch] = true
+  config[:semi_reliable_fetch] = true
   Sidekiq::ReliableFetch.setup_reliable_fetch!(config)
 end
+::Sidekiq.strict_args!(false)
 
 module Dynflow
   module Executors

data/lib/dynflow/executors/sidekiq/internal_job_base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
     module Sidekiq

data/lib/dynflow/executors/sidekiq/orchestrator_jobs.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
     module Sidekiq

data/lib/dynflow/executors/sidekiq/redis_locking.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
     module Sidekiq

data/lib/dynflow/executors/sidekiq/serialization.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
     module Sidekiq

data/lib/dynflow/executors/sidekiq/worker_jobs.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
     module Sidekiq

data/lib/dynflow/executors.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Executors
-
     require 'dynflow/executors/parallel'
 
     class << self

data/lib/dynflow/extensions/msgpack.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'msgpack'
 
 module Dynflow
@@ -25,13 +26,13 @@ module Dynflow
 
         ::DateTime.include ::Dynflow::Extensions::MsgPack::Time
         ::MessagePack::DefaultFactory.register_type(0x02, DateTime,
-                                                    packer: ->(datetime) { MessagePack::Time::Packer.(datetime.to_time) },
-                                                    unpacker: ->(payload) { unpacker.(payload).to_datetime })
+          packer: ->(datetime) { MessagePack::Time::Packer.(datetime.to_time) },
+          unpacker: ->(payload) { unpacker.(payload).to_datetime })
 
         ::Date.include ::Dynflow::Extensions::MsgPack::Time
         ::MessagePack::DefaultFactory.register_type(0x03, Date,
-                                                    packer: ->(date) { MessagePack::Time::Packer.(date.to_time) },
-                                                    unpacker: ->(payload) { unpacker.(payload).to_date })
+          packer: ->(date) { MessagePack::Time::Packer.(date.to_time) },
+          unpacker: ->(payload) { unpacker.(payload).to_date })
       rescue LoadError
         # This is fine
         nil

data/lib/dynflow/extensions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Extensions
     require 'dynflow/extensions/msgpack'

data/lib/dynflow/flows/abstract.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Flows
-
     class Abstract < Serializable
       include Algebrick::TypeCheck
 

data/lib/dynflow/flows/abstract_composed.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Flows
     class AbstractComposed < Abstract
-
       attr_reader :flows
 
       def initialize(flows)
@@ -94,7 +94,6 @@ module Dynflow
           index += 1
         end
       end
-
     end
   end
 end

data/lib/dynflow/flows/atom.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Flows
     class Atom < Abstract
-
       attr_reader :step_id
 
       def encode
@@ -31,7 +31,6 @@ module Dynflow
         check_class_matching hash
         new(hash[:step_id])
       end
-
     end
   end
 end

data/lib/dynflow/flows/concurrence.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Flows
     class Concurrence < AbstractComposed
-
       protected
 
       def add_to_sequence(satisfying_flows, dependent_flow)

data/lib/dynflow/flows/registry.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Flows
     class Registry

data/lib/dynflow/flows/sequence.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Flows
     class Sequence < AbstractComposed
-
       protected
 
       def add_to_sequence(satisfying_flows, dependent_flow)

data/lib/dynflow/flows.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
+
 require 'forwardable'
 
 module Dynflow
   module Flows
-
     require 'dynflow/flows/registry'
     require 'dynflow/flows/abstract'
     require 'dynflow/flows/atom'
     require 'dynflow/flows/abstract_composed'
     require 'dynflow/flows/concurrence'
     require 'dynflow/flows/sequence'
-
   end
 end

data/lib/dynflow/logger_adapters/abstract.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module LoggerAdapters
     class Abstract
-
       # @returns [#fatal, #error, #warn, #info, #debug] logger object for logging errors from action execution
       def action_logger
         raise NotImplementedError

data/lib/dynflow/logger_adapters/delegator.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module LoggerAdapters
     class Delegator < Abstract
-
       attr_reader :action_logger, :dynflow_logger
 
       def initialize(action_logger, dynflow_logger, formatters = [Formatters::Exception])

data/lib/dynflow/logger_adapters/formatters/abstract.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module LoggerAdapters
     module Formatters

data/lib/dynflow/logger_adapters/formatters/exception.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module LoggerAdapters
     module Formatters

data/lib/dynflow/logger_adapters/formatters.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module LoggerAdapters
     module Formatters

data/lib/dynflow/logger_adapters/simple.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'English'
 
 module Dynflow
@@ -28,11 +29,11 @@ module Dynflow
 
       def formatter(severity, datetime, prog_name, msg)
         format "[%s #%d] %5s -- %s%s\n",
-               datetime.strftime('%Y-%m-%d %H:%M:%S.%L'),
-               $PID,
-               severity,
-               (prog_name ? prog_name + ': ' : ''),
-               msg.to_s
+          datetime.strftime('%Y-%m-%d %H:%M:%S.%L'),
+          $PID,
+          severity,
+          (prog_name ? prog_name + ': ' : ''),
+          msg.to_s
       end
 
       class ProgNameWrapper

data/lib/dynflow/logger_adapters.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module LoggerAdapters
     require 'dynflow/logger_adapters/formatters'

data/lib/dynflow/middleware/common/singleton.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Middleware::Common
     class Singleton < Middleware

data/lib/dynflow/middleware/common/transaction.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Middleware::Common
     class Transaction < Middleware

data/lib/dynflow/middleware/register.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   class Middleware::Register
     include Algebrick::TypeCheck

data/lib/dynflow/middleware/resolver.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require 'tsort'
 
 module Dynflow
   class Middleware::Resolver
-
     include TSort
     include Algebrick::TypeCheck
 
@@ -49,7 +49,7 @@ module Dynflow
         middleware_deps.reject! { |dep| !deps.has_key?(dep) }
       end
 
-      return deps.delete_if {|klass, _| klass.nil? }
+      return deps.delete_if { |klass, _| klass.nil? }
     end
 
     def tsort_each_node(&block)
@@ -59,6 +59,5 @@ module Dynflow
     def tsort_each_child(node, &block)
       @deps.fetch(node).each(&block)
     end
-
   end
 end

data/lib/dynflow/middleware/stack.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   class Middleware::Stack
     include Algebrick::TypeCheck