dynflow 1.8.1 → 1.8.3

data/lib/dynflow/middleware/world.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Dynflow
   class Middleware::World
-
     include Algebrick::TypeCheck
 
     def initialize
@@ -54,6 +54,5 @@ module Dynflow
       end
       return @middleware_classes_cache[action_class]
     end
-
   end
 end

data/lib/dynflow/middleware.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   class Middleware
     require 'dynflow/middleware/register'

data/lib/dynflow/persistence.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
+
 require 'dynflow/persistence_adapters'
 
 module Dynflow
-
   class Persistence
-
     include Algebrick::TypeCheck
 
     attr_reader :adapter
@@ -18,9 +17,9 @@ module Dynflow
     end
 
     def load_action(step)
-      attributes = adapter.
-          load_action(step.execution_plan_id, step.action_id).
-          update(step: step, phase: step.phase)
+      attributes = adapter
+                   .load_action(step.execution_plan_id, step.action_id)
+                   .update(step: step, phase: step.phase)
       return Action.from_hash(attributes, step.world)
     end
 

data/lib/dynflow/persistence_adapters/abstract.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module PersistenceAdapters
     class Abstract
-
       # The logger is set by the world when used inside it
       attr_accessor :logger
 

data/lib/dynflow/persistence_adapters/sequel.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'sequel'
 require 'msgpack'
 require 'fileutils'
@@ -7,7 +8,6 @@ require 'csv'
 # rubocop:disable Metrics/ClassLength
 module Dynflow
   module PersistenceAdapters
-
     Sequel.extension :migration
     Sequel.database_timezone = :utc
 
@@ -67,10 +67,10 @@ module Dynflow
         table_name = :execution_plan
         options[:order_by] ||= :started_at
         data_set = filter(table_name,
-                          order(table_name,
-                                paginate(table(table_name), options),
-                                options),
-                          options[:filters])
+          order(table_name,
+            paginate(table(table_name), options),
+            options),
+          options[:filters])
         data_set.all.map { |record| execution_plan_column_map(load_data(record, table_name)) }
       end
 
@@ -80,7 +80,7 @@ module Dynflow
 
       def find_execution_plan_statuses(options)
         plans = filter(:execution_plan, table(:execution_plan), options[:filters])
-                  .select(:uuid, :state, :result)
+                .select(:uuid, :state, :result)
 
         plans.each_with_object({}) do |current, acc|
           uuid = current.delete(:uuid)
@@ -99,7 +99,7 @@ module Dynflow
             backup_to_csv(:step, steps, backup_dir, 'steps.csv') if backup_dir
             steps.delete
 
-            output_chunks = table(:output_chunk).where(execution_plan_uuid: uuids).delete
+            table(:output_chunk).where(execution_plan_uuid: uuids).delete
 
             actions = table(:action).where(execution_plan_uuid: uuids)
             backup_to_csv(:action, actions, backup_dir, 'actions.csv') if backup_dir
@@ -169,7 +169,7 @@ module Dynflow
 
       def save_step(execution_plan_id, step_id, value, update_conditions = {})
         save :step, { execution_plan_uuid: execution_plan_id, id: step_id }, value,
-             with_data: false, update_conditions: update_conditions
+          with_data: false, update_conditions: update_conditions
       end
 
       def load_action(execution_plan_id, action_id)
@@ -254,7 +254,7 @@ module Dynflow
 
       def update_coordinator_record(class_name, record_id, value)
         coordinator_feature!
-        save :coordinator_record, {class: class_name, :id => record_id}, value
+        save :coordinator_record, { class: class_name, :id => record_id }, value
       end
 
       def delete_coordinator_record(class_name, record_id)
@@ -365,7 +365,7 @@ module Dynflow
 
       def load_record(what, condition)
         table = table(what)
-        if (record = with_retry { table.first(Utils.symbolize_keys(condition)) } )
+        if (record = with_retry { table.first(Utils.symbolize_keys(condition)) })
           load_data(record, what)
         else
           raise KeyError, "searching: #{what} by: #{condition.inspect}"
@@ -491,13 +491,13 @@ module Dynflow
           end
 
           if filters.key?('caller_execution_plan_id')
-            data_set = data_set.join_table(:inner, TABLES[:action], :execution_plan_uuid => :uuid).
-                select_all(TABLES[:execution_plan]).distinct
+            data_set = data_set.join_table(:inner, TABLES[:action], :execution_plan_uuid => :uuid)
+                               .select_all(TABLES[:execution_plan]).distinct
           end
           if filters.key?('delayed')
             filters.delete('delayed')
-            data_set = data_set.join_table(:inner, TABLES[:delayed], :execution_plan_uuid => :uuid).
-              select_all(TABLES[:execution_plan]).distinct
+            data_set = data_set.join_table(:inner, TABLES[:delayed], :execution_plan_uuid => :uuid)
+                               .select_all(TABLES[:execution_plan]).distinct
           end
         end
 

data/lib/dynflow/persistence_adapters/sequel_migrations/001_initial.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   up do
     create_table(:dynflow_execution_plans) do
@@ -33,7 +34,7 @@ Sequel.migration do
       index [:execution_plan_uuid, :id], :unique => true
       column :action_id, Integer
       foreign_key [:execution_plan_uuid, :action_id], :dynflow_actions,
-                  name: :dynflow_steps_execution_plan_uuid_fkey1
+        name: :dynflow_steps_execution_plan_uuid_fkey1
       index [:execution_plan_uuid, :action_id]
 
       column :data, String, text: true

data/lib/dynflow/persistence_adapters/sequel_migrations/002_incremental_progress.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table(:dynflow_steps) do

data/lib/dynflow/persistence_adapters/sequel_migrations/003_parent_action.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table(:dynflow_actions) do

data/lib/dynflow/persistence_adapters/sequel_migrations/004_coordinator_records.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table(:dynflow_coordinator_records) do
@@ -12,4 +13,3 @@ Sequel.migration do
     end
   end
 end
-

data/lib/dynflow/persistence_adapters/sequel_migrations/005_envelopes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table(:dynflow_envelopes) do

data/lib/dynflow/persistence_adapters/sequel_migrations/006_fix_data_length.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   up do
     alter_table(:dynflow_steps) do

data/lib/dynflow/persistence_adapters/sequel_migrations/007_future_execution.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table(:dynflow_scheduled_plans) do

data/lib/dynflow/persistence_adapters/sequel_migrations/008_rename_scheduled_plans_to_delayed_plans.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     rename_table(:dynflow_scheduled_plans, :dynflow_delayed_plans)

data/lib/dynflow/persistence_adapters/sequel_migrations/009_fix_mysql_data_length.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   affected_tables = [:dynflow_actions, :dynflow_coordinator_records, :dynflow_delayed_plans,
                      :dynflow_envelopes, :dynflow_execution_plans]
@@ -22,4 +23,3 @@ Sequel.migration do
     end
   end
 end
-

data/lib/dynflow/persistence_adapters/sequel_migrations/010_add_execution_plans_label.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table(:dynflow_execution_plans) do

data/lib/dynflow/persistence_adapters/sequel_migrations/011_placeholder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   # Placeholder for 011_add_uuid_column.rb - it was readded in
   # 018_add_uuid_column.rb with fixed check for postgresql

data/lib/dynflow/persistence_adapters/sequel_migrations/012_add_delayed_plans_serialized_args.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table(:dynflow_delayed_plans) do

data/lib/dynflow/persistence_adapters/sequel_migrations/013_add_action_columns.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table(:dynflow_actions) do

data/lib/dynflow/persistence_adapters/sequel_migrations/014_add_step_columns.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table(:dynflow_steps) do

data/lib/dynflow/persistence_adapters/sequel_migrations/015_add_execution_plan_columns.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table(:dynflow_execution_plans) do

data/lib/dynflow/persistence_adapters/sequel_migrations/016_add_step_queue.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table(:dynflow_steps) do

data/lib/dynflow/persistence_adapters/sequel_migrations/017_add_delayed_plan_frozen.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table(:dynflow_delayed_plans) do

data/lib/dynflow/persistence_adapters/sequel_migrations/018_add_uuid_column.rb

@@ -1,45 +1,50 @@
 # frozen_string_literal: true
-def to_uuid(table_name, column_name)
-  set_column_type(table_name, column_name, :uuid, :using => "#{column_name}::uuid")
-end
-
-def from_uuid(table_name, column_name)
-  set_column_type table_name, column_name, String, primary_key: true, size: 36, fixed: true
-end
 
-def with_foreign_key_recreation(&block)
-  # Drop the foreign key constraints so we can change the column type
-  alter_table :dynflow_actions do
-    drop_foreign_key [:execution_plan_uuid]
-  end
-  alter_table :dynflow_steps do
-    drop_foreign_key [:execution_plan_uuid]
-    drop_foreign_key [:execution_plan_uuid, :action_id], :name => :dynflow_steps_execution_plan_uuid_fkey1
+helper = Module.new do
+  def to_uuid(table_name, column_name)
+    set_column_type(table_name, column_name, :uuid, :using => "#{column_name}::uuid")
   end
-  alter_table :dynflow_delayed_plans do
-    drop_foreign_key [:execution_plan_uuid]
+
+  def from_uuid(table_name, column_name)
+    set_column_type table_name, column_name, String, primary_key: true, size: 36, fixed: true
   end
 
-  block.call
+  def with_foreign_key_recreation(&block)
+    # Drop the foreign key constraints so we can change the column type
+    alter_table :dynflow_actions do
+      drop_foreign_key [:execution_plan_uuid]
+    end
+    alter_table :dynflow_steps do
+      drop_foreign_key [:execution_plan_uuid]
+      drop_foreign_key [:execution_plan_uuid, :action_id], :name => :dynflow_steps_execution_plan_uuid_fkey1
+    end
+    alter_table :dynflow_delayed_plans do
+      drop_foreign_key [:execution_plan_uuid]
+    end
+
+    block.call
 
-  # Recreat the foreign key constraints as they were before
-  alter_table :dynflow_actions do
-    add_foreign_key [:execution_plan_uuid], :dynflow_execution_plans
-  end
-  alter_table :dynflow_steps do
-    add_foreign_key [:execution_plan_uuid], :dynflow_execution_plans
-    add_foreign_key [:execution_plan_uuid, :action_id], :dynflow_actions,
-                    :name => :dynflow_steps_execution_plan_uuid_fkey1
-  end
-  alter_table :dynflow_delayed_plans do
-    add_foreign_key [:execution_plan_uuid], :dynflow_execution_plans,
-                    :name => :dynflow_scheduled_plans_execution_plan_uuid_fkey
+    # Recreat the foreign key constraints as they were before
+    alter_table :dynflow_actions do
+      add_foreign_key [:execution_plan_uuid], :dynflow_execution_plans
+    end
+    alter_table :dynflow_steps do
+      add_foreign_key [:execution_plan_uuid], :dynflow_execution_plans
+      add_foreign_key [:execution_plan_uuid, :action_id], :dynflow_actions,
+        :name => :dynflow_steps_execution_plan_uuid_fkey1
+    end
+    alter_table :dynflow_delayed_plans do
+      add_foreign_key [:execution_plan_uuid], :dynflow_execution_plans,
+        :name => :dynflow_scheduled_plans_execution_plan_uuid_fkey
+    end
   end
 end
 
 Sequel.migration do
   up do
     if database_type.to_s.include?('postgres')
+      Sequel::Postgres::Database.include helper
+
       with_foreign_key_recreation do
         to_uuid :dynflow_execution_plans, :uuid
         to_uuid :dynflow_actions,         :execution_plan_uuid
@@ -51,6 +56,8 @@ Sequel.migration do
 
   down do
     if database_type.to_s.include?('postgres')
+      Sequel::Postgres::Database.include helper
+
       with_foreign_key_recreation do
         from_uuid :dynflow_execution_plans, :uuid
         from_uuid :dynflow_actions,         :execution_plan_uuid

data/lib/dynflow/persistence_adapters/sequel_migrations/019_update_mysql_time_precision.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   up do
     alter_table(:dynflow_execution_plans) do

data/lib/dynflow/persistence_adapters/sequel_migrations/020_drop_duplicate_indices.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   up do
     alter_table(:dynflow_actions) do

data/lib/dynflow/persistence_adapters/sequel_migrations/021_create_output_chunks.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   up do
     type = database_type
@@ -6,16 +7,16 @@ Sequel.migration do
       primary_key :id
 
       column_properties = if type.to_s.include?('postgres')
-                            {type: :uuid}
+                            { type: :uuid }
                           else
-                            {type: String, size: 36, fixed: true, null: false}
+                            { type: String, size: 36, fixed: true, null: false }
                           end
       foreign_key :execution_plan_uuid, :dynflow_execution_plans, **column_properties
       index :execution_plan_uuid
 
       column :action_id, Integer, null: false
       foreign_key [:execution_plan_uuid, :action_id], :dynflow_actions,
-                  name: :dynflow_output_chunks_execution_plan_uuid_fkey1
+        name: :dynflow_output_chunks_execution_plan_uuid_fkey1
       index [:execution_plan_uuid, :action_id]
 
       column :chunk, String, text: true

data/lib/dynflow/persistence_adapters/sequel_migrations/023_sqlite_workarounds.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 tables = [:dynflow_actions, :dynflow_delayed_plans, :dynflow_steps, :dynflow_output_chunks]
 Sequel.migration do
   up do

data/lib/dynflow/persistence_adapters.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module PersistenceAdapters
     require 'dynflow/persistence_adapters/abstract'

data/lib/dynflow/rails/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rails'
 require 'active_record'
 
@@ -100,7 +101,7 @@ module Dynflow
       end
 
       def sidekiq_worker?
-        defined?(::Sidekiq) && ::Sidekiq.options[:queues].any?
+        defined?(::Sidekiq) && ::Sidekiq.configure_server { |c| c[:queues].any? }
       end
 
       def calculate_db_pool_size(world)
@@ -108,7 +109,7 @@ module Dynflow
 
         base_value = 5
         if defined?(::Sidekiq)
-          Sidekiq.options[:concurrency] + base_value
+          Sidekiq.configure_server { |c| c[:concurrency] } + base_value
         else
           world.config.queues.values.inject(base_value) do |pool_size, pool_options|
             pool_size += pool_options[:pool_size]
@@ -152,7 +153,7 @@ module Dynflow
           # we can't do any operation until the Rails.application.dynflow.world is set
           config.auto_execute        = false
           config.auto_validity_check = false
-          if sidekiq_worker? && !Sidekiq.options[:queues].include?("dynflow_orchestrator")
+          if sidekiq_worker? && !Sidekiq.configure_server { |c| c[:queues].include?("dynflow_orchestrator") }
             config.delayed_executor = nil
           end
         end
@@ -192,7 +193,7 @@ module Dynflow
         if remote?
           false
         else
-          if defined?(::Sidekiq) && Sidekiq.options[:dynflow_executor]
+          if defined?(::Sidekiq) && Sidekiq.configure_server { |c| c[:dynflow_executor] }
             ::Dynflow::Executors::Sidekiq::Core
           else
             ::Dynflow::Executors::Parallel::Core

data/lib/dynflow/rails/daemon.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'fileutils'
 require 'get_process_mem'
 require 'dynflow/watchers/memory_consumption_watcher'
@@ -175,7 +176,6 @@ module Dynflow
         else raise "Unknown unit: #{unit.inspect}!"
         end
       end
-
     end
   end
 end

data/lib/dynflow/rails.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
+
 module Dynflow
   # Class for configuring and preparing the Dynflow runtime environment.
   class Rails
@@ -32,8 +33,8 @@ module Dynflow
       return @world if @world
 
       if config.lazy_initialization && defined?(::PhusionPassenger)
-        config.dynflow_logger.
-          warn('Dynflow: lazy loading with PhusionPassenger might lead to unexpected results')
+        config.dynflow_logger
+              .warn('Dynflow: lazy loading with PhusionPassenger might lead to unexpected results')
       end
       init_world.tap do |world|
         @world = world

data/lib/dynflow/round_robin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   # A simple round-robin scheduling implementation used at various
   # places in Dynflow
@@ -19,7 +20,7 @@ module Dynflow
     end
 
     def next
-      @cursor = 0 if @cursor > @data.size-1
+      @cursor = 0 if @cursor > @data.size - 1
       @data[@cursor]
     ensure
       @cursor += 1
@@ -35,4 +36,3 @@ module Dynflow
     attr_writer :data
   end
 end
-

data/lib/dynflow/semaphores/abstract.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Semaphores
     class Abstract
-
       # Tries to get ticket from the semaphore
       # Returns true if thing got a ticket
       # Rturns false otherwise and puts the thing into the semaphore's queue

data/lib/dynflow/semaphores/aggregating.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Semaphores
     class Aggregating < Abstract
-
       attr_reader :children, :waiting
 
       def initialize(children)
@@ -58,7 +58,6 @@ module Dynflow
           @children[key].release n
         end
       end
-
     end
   end
 end

data/lib/dynflow/semaphores/dummy.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Semaphores
     class Dummy < Abstract
-
       def wait(thing)
         true
       end

data/lib/dynflow/semaphores/stateful.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Semaphores
     class Stateful < Abstract
-
       attr_reader :free, :tickets, :waiting, :meta
 
       def initialize(tickets, free = tickets, meta = {})

data/lib/dynflow/semaphores.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Semaphores
     require 'dynflow/semaphores/abstract'

data/lib/dynflow/serializable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'date'
 module Dynflow
   class Serializable

data/lib/dynflow/serializer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'algebrick/serializer'
 
 module Dynflow
@@ -7,7 +8,6 @@ module Dynflow
   end
 
   class Serializer < Algebrick::Serializer
-
     ARBITRARY_TYPE_KEY = :class
     MARSHAL_KEY        = :marshaled
 
@@ -38,7 +38,7 @@ module Dynflow
         end
 
         if (type_name = other[ARBITRARY_TYPE_KEY] || other[ARBITRARY_TYPE_KEY.to_s])
-          if type_name == 'Time' && ( time_str = other['value'] )
+          if type_name == 'Time' && (time_str = other['value'])
             return Serializable.send(:string_to_time, time_str)
           end
           type = Utils.constantize(type_name) rescue nil

data/lib/dynflow/serializers/abstract.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Serializers
     # @abstract
@@ -6,7 +7,6 @@ module Dynflow
     # Used by {DelayedPlan} to store arguments which should be passed into
     # the {Dynflow::Action}'s #plan method when the plan is executed.
     class Abstract
-
       attr_reader :args, :serialized_args
 
       # @param args [Array] arguments to be serialized
@@ -65,7 +65,6 @@ module Dynflow
       def deserialize(arg)
         raise NotImplementedError
       end
-
     end
   end
 end

data/lib/dynflow/serializers/noop.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Serializers
     class Noop < Abstract
-
       def serialize(arg)
         arg
       end
@@ -10,7 +10,6 @@ module Dynflow
       def deserialize(arg)
         arg
       end
-
     end
   end
 end