foreman-tasks 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f1ef8e297d56025b9460e44ca7e96e753307d55
-  data.tar.gz: a26e87a7cd3abda09035c1b63747234a77c0562f
+  metadata.gz: 2e10fb3f1d62ca016568197df4df727b25c73b68
+  data.tar.gz: 506d7b4cc63c11fbd931667258122ee48f03a504
 SHA512:
-  metadata.gz: 0bf2da8785b5fb0504c110b4089b2a27fcb30173a6c060f0171295d77c4d3240192406822a38872edeb102beacfdd0f3fd462a03bcb5d2c9992de2a1b08b3fab
-  data.tar.gz: f95dcdf3437613f5c702df30248c6f962db176e88e2474edba21db0d97d362af4d554ccaecee5726fdef27686f2869eef2fb7853ce9fa26fb3458ade1f947a66
+  metadata.gz: 4fe503d8cbfce8eec1ea48f0add2442d1df0acb2729f53d391dfd5068ebf975722f69ffd0801780fae770c02958b3909c466668d368ad39ca345ca6acb9dd2d9
+  data.tar.gz: 910f71926669c46ef32a8c55a1b666c2a74ac810d176e27c0dfcf451e49b814af871ebf0639d70dc1378d01be48167c0d53c4bf3bd514e02d8302f6c3bb49355

data/app/controllers/foreman_tasks/api/tasks_controller.rb

@@ -156,7 +156,8 @@ module ForemanTasks
         task = ForemanTasks::Task::DynflowTask.find(params[:callback][:task_id])
         ForemanTasks.dynflow.world.event(task.external_id,
                                          params[:callback][:step_id].to_i,
-                                         ::Actions::ProxyAction::CallbackData.new(params[:data]))
+                                         # We need to call .to_unsafe_h to unwrap the hash from ActionController::Parameters
+                                         ::Actions::ProxyAction::CallbackData.new(params[:data].to_unsafe_h))
         render :json => { :message => 'processing' }.to_json
       end
 

data/app/models/foreman_tasks/task.rb

@@ -51,7 +51,7 @@ module ForemanTasks
                   :rename => 'owner.id',
                   :ext_method => :search_by_owner,
                   :validator => ->(value) { ScopedSearch::Validators::INTEGER.call(value) || value == 'current_user' }
-    scoped_search :relation => :owners,  :on => :login, :complete_value => true, :rename => 'owner.login', :ext_method => :search_by_owner
+    scoped_search :relation => :owners,  :on => :login, :complete_value => true, :rename => 'owner.login', :ext_method => :search_by_owner, :aliases => [:user]
     scoped_search :relation => :owners,  :on => :firstname, :complete_value => true, :rename => 'owner.firstname', :ext_method => :search_by_owner
     scoped_search :relation => :task_groups, :on => :id, :complete_value => true, :rename => 'task_group.id', :validator => ScopedSearch::Validators::INTEGER
 
@@ -133,6 +133,7 @@ module ForemanTasks
     def self.search_by_owner(key, operator, value)
       return { :conditions => '0 = 1' } if value == 'current_user' && User.current.nil?
 
+      key = 'owners.login' if key == 'user'
       key_name = connection.quote_column_name(key.sub(/^.*\./, ''))
       joins = <<-SQL
       INNER JOIN foreman_tasks_locks AS foreman_tasks_locks_owner
@@ -176,6 +177,7 @@ module ForemanTasks
     def add_missing_task_groups(groups)
       groups = [groups] unless groups.is_a? Array
       (groups - task_groups).each { |group| task_groups << group }
+      save!
     end
 
     def sub_tasks_counts

data/extra/dynflow-debug.sh

@@ -3,17 +3,38 @@
 # This file provides additional debug information for foreman-debug tool and is
 # symlinked as /usr/share/foreman/script/foreman-debug.d/60-dynflow_debug
 
+FOREMAN_PSQL_COMMAND=$(ruby -ryaml <<-END
+  db = YAML.load_file('/etc/foreman/database.yml')['production']
+  puts [
+    "PGPASSWORD='#{db['password']}'",
+    'psql',
+    '-U', "'#{db.fetch('username')}'",
+    '-h', "'#{db['host'] || 'localhost'}'",
+    '-p', "'#{(db['port'] || 5432).to_s}'",
+    '-d', "'#{db.fetch('database')}'"
+  ].join(' ')
+END
+)
+
+FOREMAN_DB_ADAPTER=$(ruby -ryaml <<-END
+  puts YAML.load_file('/etc/foreman/database.yml')['production']['adapter']
+END
+)
+
 export_csv() {
-  echo "COPY ($1) TO STDOUT WITH CSV;" | su - postgres -c '/usr/bin/psql -d foreman' > $2
+  echo "COPY ($1) TO STDOUT WITH CSV;" | eval $FOREMAN_PSQL_COMMAND > $2
 }
 
 add_files /var/log/foreman/dynflow_executor*.log*
 add_files /var/log/foreman/dynflow_executor*.output*
 
-# Foreman Tasks fast export (for HTML version use foreman-rake foreman_tasks:export_tasks)
-export_csv "select dynflow_execution_plans.* from foreman_tasks_tasks join dynflow_execution_plans on (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-6} months'::interval" "$DIR/dynflow_execution_plans.csv"
-export_csv "select dynflow_actions.* from foreman_tasks_tasks join dynflow_actions on (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-6} months'::interval" "$DIR/dynflow_actions.csv"
-export_csv "select dynflow_steps.* from foreman_tasks_tasks join dynflow_steps on (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-6} months'::interval" "$DIR/dynflow_steps.csv"
-export_csv "select * from dynflow_schema_info" "$DIR/dynflow_schema_info.csv"
-export_csv "select * from foreman_tasks_tasks" "$DIR/foreman_tasks_tasks.csv"
+# Foreman Tasks fast export (Postgresql only; for HTML version use foreman-rake foreman_tasks:export_tasks)
+
+if [ "$FOREMAN_DB_ADAPTER" == "postgresql" ]; then
+    export_csv "select dynflow_execution_plans.* from foreman_tasks_tasks join dynflow_execution_plans on (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-6} months'::interval" "$DIR/dynflow_execution_plans.csv"
+    export_csv "select dynflow_actions.* from foreman_tasks_tasks join dynflow_actions on (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-6} months'::interval" "$DIR/dynflow_actions.csv"
+    export_csv "select dynflow_steps.* from foreman_tasks_tasks join dynflow_steps on (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid) where foreman_tasks_tasks.started_at > 'now'::timestamp - '${DYNFLOW_EXPORT_MONTHS:-6} months'::interval" "$DIR/dynflow_steps.csv"
+    export_csv "select * from dynflow_schema_info" "$DIR/dynflow_schema_info.csv"
+    export_csv "select * from foreman_tasks_tasks" "$DIR/foreman_tasks_tasks.csv"
+fi
 

data/foreman-tasks.gemspec

@@ -29,7 +29,7 @@ same resource. It also optionally provides Dynflow infrastructure for using it f
   s.extra_rdoc_files = Dir['README*', 'LICENSE']
 
   s.add_dependency "foreman-tasks-core"
-  s.add_dependency "dynflow", '~> 0.8.26'
+  s.add_dependency "dynflow", '~> 0.8.29'
   s.add_dependency "sinatra" # for Dynflow web console
   s.add_dependency "parse-cron", '~> 0.1.4'
   s.add_dependency "get_process_mem" # for memory polling

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.10.1'.freeze
+  VERSION = '0.10.2'.freeze
 end

data/test/unit/recurring_logic_test.rb

@@ -91,7 +91,8 @@ class RecurringLogicsTest < ActiveSupport::TestCase
     it 'can be created from triggering' do
       triggering = FactoryGirl.build(:triggering, :recurring, :end_time_limited)
       logic = ForemanTasks::RecurringLogic.new_from_triggering(triggering)
-      logic.end_time.must_equal triggering.end_time
+      # Mysql coerces the times a bit
+      logic.end_time.must_be_close_to(triggering.end_time, 1.second)
     end
 
     describe 'validation' do

data/test/unit/task_test.rb

@@ -122,6 +122,7 @@ class TasksTest < ActiveSupport::TestCase
     it 'can indicate it is recurring' do
       refute task.recurring?
       task.add_missing_task_groups(logic.task_group)
+      task.reload
       assert task.recurring?
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.26
+        version: 0.8.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.26
+        version: 0.8.29
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement