foreman_remote_execution 1.4.1 → 1.4.2

data/db/migrate/20180112125015_fix_taxable_taxonomies_job_template.rb

@@ -0,0 +1,14 @@
+class FixTaxableTaxonomiesJobTemplate < ActiveRecord::Migration[4.2]
+  def up
+    # we need to count on the fact that the user might already has assigned the templates
+    # to taxonomies after the previous update
+    already_present = TaxableTaxonomy.where(:taxable_type => 'JobTemplate').pluck(:taxable_id)
+    missing = JobTemplate.unscoped.pluck(:id) - already_present
+    TaxableTaxonomy.unscoped.where(:taxable_type => 'Template', :taxable_id => missing).update_all(:taxable_type => 'JobTemplate')
+    TaxableTaxonomy.unscoped.where(:taxable_type => 'Template', :taxable_id => already_present).delete_all
+  end
+
+  def down
+    TaxableTaxonomy.unscoped.where(:taxable_type => 'JobTemplate').update_all(:taxable_type => 'Template')
+  end
+end

data/db/seeds.d/90-bookmarks.rb

@@ -9,7 +9,7 @@ Bookmark.without_auditing do
   ].each do |input|
     next if Bookmark.where(:controller => 'job_invocations').find_by(name: input[:name])
     # TODO audit should be fixed once core #13109 gets merged
-    next if audit_modified? Bookmark, input[:name]
+    next if SeedHelper.audit_modified? Bookmark, input[:name]
     attributes = { :public => true }.merge(input)
     b = Bookmark.where(:name => input[:name], :controller => input[:controller]).first || Bookmark.new
     b.attributes = attributes

data/foreman_remote_execution.gemspec

@@ -21,13 +21,14 @@ Gem::Specification.new do |s|
   end
 
   s.test_files =       `git ls-files test`.split("\n")
-  s.extra_rdoc_files = `git ls-files doc`.split("\n") + Dir['README*', 'LICENSE']
+  s.extra_rdoc_files = Dir['README*', 'LICENSE']
 
   s.add_dependency 'deface'
   s.add_dependency 'dynflow', '~> 0.8.26'
   s.add_dependency 'foreman_remote_execution_core'
   s.add_dependency 'foreman-tasks', '>= 0.9.5'
 
+  s.add_development_dependency 'factory_bot_rails', '~> 4.8.0'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rdoc'
 end

data/lib/foreman_remote_execution/engine.rb

@@ -31,7 +31,7 @@ module ForemanRemoteExecution
 
     initializer 'foreman_remote_execution.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_remote_execution do
-        requires_foreman '>= 1.15'
+        requires_foreman '>= 1.17'
 
         apipie_documented_controllers ["#{ForemanRemoteExecution::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -56,7 +56,7 @@ module ForemanRemoteExecution
                                                 'api/v2/job_invocations' => [:create] }, :resource_type => 'JobInvocation'
           permission :view_job_invocations, { :job_invocations => [:index, :show, :auto_complete_search], :template_invocations => [:show],
                                               'api/v2/job_invocations' => [:index, :show, :output] }, :resource_type => 'JobInvocation'
-          permission :execute_template_invocation, {}, :resource_type => 'TemplateInvocation'
+          permission :create_template_invocations, {}, :resource_type => 'TemplateInvocation'
           # this permissions grants user to get auto completion hints when setting up filters
           permission :filter_autocompletion_for_template_invocation, { :template_invocations => [ :auto_complete_search, :index ] },
                      :resource_type => 'TemplateInvocation'
@@ -66,7 +66,7 @@ module ForemanRemoteExecution
           :view_job_templates,
           :view_job_invocations,
           :create_job_invocations,
-          :execute_template_invocation,
+          :create_template_invocations,
           :view_hosts,
           :view_smart_proxies
         ].freeze

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.4.2'.freeze
 end

data/test/benchmark/run_hosts_job_benchmark.rb

@@ -1,10 +1,10 @@
 require 'benchmark/benchmark_helper'
 require 'dynflow/testing'
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.expand_path('../../factories', __FILE__)
-FactoryGirl.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
-FactoryGirl.reload
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.expand_path('../../factories', __FILE__)
+FactoryBot.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
+FactoryBot.reload
 
 module Actions
   module RemoteExecution
@@ -23,7 +23,7 @@ module Support
 end
 
 def generate_hosts(total)
-  FactoryGirl.create_list(:host, total, :comment => "benchmark-#{Foreman.uuid}")
+  FactoryBot.create_list(:host, total, :comment => "benchmark-#{Foreman.uuid}")
 end
 
 Rails.logger.level = Logger::ERROR
@@ -43,17 +43,17 @@ class ActionTester
 end
 
 puts 'generating admin user'
-admin = FactoryGirl.build(:user, :admin)
+admin = FactoryBot.build(:user, :admin)
 admin.save(:validate => false)
 User.current = admin
-targeting = FactoryGirl.create(:targeting, :search_query => "comment = benchmark-#{Foreman.uuid}", :user => User.current)
-template_invocation = FactoryGirl.build(:template_invocation, :job_invocation => nil)
-job_invocation = FactoryGirl.build(:job_invocation, :targeting => targeting, :pattern_template_invocations => [template_invocation]).tap do |invocation|
+targeting = FactoryBot.create(:targeting, :search_query => "comment = benchmark-#{Foreman.uuid}", :user => User.current)
+template_invocation = FactoryBot.build(:template_invocation, :job_invocation => nil)
+job_invocation = FactoryBot.build(:job_invocation, :targeting => targeting, :pattern_template_invocations => [template_invocation]).tap do |invocation|
   invocation.targeting = targeting
   invocation.save
 end
 
-task = FactoryGirl.create(:dynflow_task, :external_id => '1')
+task = FactoryBot.create(:dynflow_task, :external_id => '1')
 tester = ActionTester.new(task)
 
 puts 'generating hosts'

data/test/benchmark/targeting_benchmark.rb

@@ -1,12 +1,12 @@
 require 'benchmark/benchmark_helper'
 require 'dynflow/testing'
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.expand_path('../../factories', __FILE__)
-FactoryGirl.reload
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.expand_path('../../factories', __FILE__)
+FactoryBot.reload
 
 def generate_hosts(total)
-  FactoryGirl.create_list(:host, total, :comment => "benchmark-#{Foreman.uuid}")
+  FactoryBot.create_list(:host, total, :comment => "benchmark-#{Foreman.uuid}")
 end
 
 Rails.logger.level = Logger::ERROR
@@ -14,7 +14,7 @@ Rails.logger.level = Logger::ERROR
 puts 'generating hosts'
 generate_hosts(1000)
 puts 'generating admin user'
-admin = FactoryGirl.build(:user, :admin)
+admin = FactoryBot.build(:user, :admin)
 admin.save(:validate => false)
 User.current = admin
 
@@ -24,7 +24,7 @@ foreman_benchmark do
     x.config(:time => 10, :warmup => 0)
 
     x.report('rex-targeting-resolve-hosts') do
-      targeting = FactoryGirl.create(:targeting, :search_query => "comment = benchmark-#{Foreman.uuid}", :user => User.current)
+      targeting = FactoryBot.create(:targeting, :search_query => "comment = benchmark-#{Foreman.uuid}", :user => User.current)
       targeting.resolve_hosts!
     end
   end

data/test/factories/foreman_remote_execution_factories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :job_template do |f|
     f.sequence(:name) { |n| "Job template #{n}" }
@@ -11,7 +11,7 @@ FactoryGirl.define do
 
     trait :with_input do
       after(:build) do |template, evaluator|
-        template.template_inputs << FactoryGirl.build(:template_input)
+        template.template_inputs << FactoryBot.build(:template_input)
       end
     end
 
@@ -43,15 +43,15 @@ FactoryGirl.define do
     f.description_format '%{job_category}'
     trait :with_template do
       after(:build) do |invocation, evaluator|
-        invocation.pattern_template_invocations << FactoryGirl.build(:template_invocation)
+        invocation.pattern_template_invocations << FactoryBot.build(:template_invocation)
       end
 
     end
 
     trait :with_task do
       after(:build) do |invocation, _evaluator|
-        invocation.template_invocations << FactoryGirl.build(:template_invocation, :with_task, :with_host)
-        invocation.task = FactoryGirl.build(:some_task)
+        invocation.template_invocations << FactoryBot.build(:template_invocation, :with_task, :with_host)
+        invocation.task = FactoryBot.build(:some_task)
       end
     end
   end
@@ -66,19 +66,19 @@ FactoryGirl.define do
 
     trait :with_task do
       after(:build) do |template, _evaluator|
-        template.run_host_job_task = FactoryGirl.build(:some_task)
+        template.run_host_job_task = FactoryBot.build(:some_task)
       end
     end
 
     trait :with_failed_task do
       after(:build) do |template, _evaluator|
-        template.run_host_job_task = FactoryGirl.build(:some_task, :result => 'error')
+        template.run_host_job_task = FactoryBot.build(:some_task, :result => 'error')
       end
     end
 
     trait :with_host do
       after(:build) do |template, _evaluator|
-        template.host = FactoryGirl.build(:host)
+        template.host = FactoryBot.build(:host)
       end
     end
   end
@@ -93,7 +93,7 @@ FactoryGirl.define do
   end
 end
 
-FactoryGirl.modify do
+FactoryBot.modify do
   factory :feature do
     trait :ssh do
       name 'SSH'
@@ -102,14 +102,14 @@ FactoryGirl.modify do
 
   factory :smart_proxy do
     trait :ssh do
-      features { [FactoryGirl.build(:feature, :ssh)] }
+      features { [FactoryBot.create(:feature, :ssh)] }
       pubkey 'ssh-rsa AAAAB3N...'
     end
   end
 
   factory :subnet do
     trait :execution do
-      remote_execution_proxies { [FactoryGirl.build(:smart_proxy, :ssh)] }
+      remote_execution_proxies { [FactoryBot.build(:smart_proxy, :ssh)] }
     end
   end
 
@@ -119,19 +119,19 @@ FactoryGirl.modify do
       domain
       subnet do
         overrides = {
-          :remote_execution_proxies => [FactoryGirl.create(:smart_proxy, :ssh)]
+          :remote_execution_proxies => [FactoryBot.create(:smart_proxy, :ssh)]
         }
 
         overrides[:locations] = [location] unless location.nil?
         overrides[:organizations] = [organization] unless organization.nil?
 
-        FactoryGirl.create(
+        FactoryBot.create(
           :subnet_ipv4,
           overrides
         )
       end
       interfaces do
-        [FactoryGirl.build(:nic_primary_and_provision, :ip => subnet.network.sub(/0\Z/, '1'), :execution => true)]
+        [FactoryBot.build(:nic_primary_and_provision, :ip => subnet.network.sub(/0\Z/, '1'), :execution => true)]
       end
     end
   end

data/test/functional/api/v2/foreign_input_sets_controller_test.rb

@@ -4,21 +4,21 @@ module Api
   module V2
     class ForeignInputSetsControllerTest < ActionController::TestCase
       setup do
-        @template = FactoryGirl.create(:job_template)
-        @foreign_template = FactoryGirl.create(:job_template, :with_input)
-        @new_foreign_template = FactoryGirl.create(:job_template, :with_input)
+        @template = FactoryBot.create(:job_template)
+        @foreign_template = FactoryBot.create(:job_template, :with_input)
+        @new_foreign_template = FactoryBot.create(:job_template, :with_input)
         @input_set = @template.foreign_input_sets.create(:target_template_id => @foreign_template.id)
       end
 
       test 'should get index' do
-        get :index, :template_id => @template.id
+        get :index, params: { :template_id => @template.id }
         input_sets = ActiveSupport::JSON.decode(@response.body)
         assert !input_sets.empty?, 'Should respond with input sets'
         assert_response :success
       end
 
       test 'should get input set detail' do
-        get :show, :template_id => @template.to_param, :id => @input_set.to_param
+        get :show, params: { :template_id => @template.to_param, :id => @input_set.to_param }
         assert_response :success
         input_set = ActiveSupport::JSON.decode(@response.body)
         assert !input_set.empty?
@@ -27,34 +27,29 @@ module Api
 
       test 'should create valid' do
         valid_attrs = { :target_template_id => @new_foreign_template.id }
-        post :create, :foreign_input_set => valid_attrs, :template_id => @template.to_param
+        post :create, params: { :foreign_input_set => valid_attrs, :template_id => @template.to_param }
         input_set = ActiveSupport::JSON.decode(@response.body)
         assert_equal input_set['target_template_name'], @new_foreign_template.name
         assert_response :success
       end
 
       test 'should not create invalid' do
-        post :create, :template_id => @template.to_param
+        post :create, params: { :template_id => @template.to_param }
         assert_response :unprocessable_entity
       end
 
       test 'should update valid' do
-        put :update,  :template_id => @template.to_param,
-                      :id => @input_set.to_param,
-                      :foreign_input_set => { :include_all => false }
+        put :update, params: { :template_id => @template.to_param, :id => @input_set.to_param, :foreign_input_set => { :include_all => false } }
         assert_response :ok
       end
 
       test 'should not update invalid' do
-        put :update,  :template_id => @template.to_param,
-                      :id => @input_set.to_param,
-                      :foreign_input_set => { :target_template_id => '' }
+        put :update, params: { :template_id => @template.to_param, :id => @input_set.to_param, :foreign_input_set => { :target_template_id => '' } }
         assert_response :unprocessable_entity
       end
 
       test 'should destroy' do
-        delete :destroy,  :template_id => @template.to_param,
-                          :id => @input_set.to_param
+        delete :destroy, params: { :template_id => @template.to_param, :id => @input_set.to_param }
         assert_response :ok
         refute ForeignInputSet.exists?(@input_set.id)
       end

data/test/functional/api/v2/job_invocations_controller_test.rb

@@ -4,8 +4,8 @@ module Api
   module V2
     class JobInvocationsControllerTest < ActionController::TestCase
       setup do
-        @invocation = FactoryGirl.create(:job_invocation, :with_template)
-        @template = FactoryGirl.create(:job_template, :with_input)
+        @invocation = FactoryBot.create(:job_invocation, :with_template, :with_task)
+        @template = FactoryBot.create(:job_template, :with_input)
       end
 
       test 'should get index' do
@@ -16,7 +16,7 @@ module Api
       end
 
       test 'should get invocation detail' do
-        get :show, :id => @invocation.id
+        get :show, params: { :id => @invocation.id }
         assert_response :success
         template = ActiveSupport::JSON.decode(@response.body)
         refute_empty template
@@ -26,7 +26,7 @@ module Api
       test 'should create valid with job_template_id' do
         attrs = { :job_category => @template.job_category, :name => 'RandomName', :job_template_id => @template.id,
                   :targeting_type => 'static_query', :search_query => 'foobar'}
-        post :create, :job_invocation => attrs
+        post :create, params: { :job_invocation => attrs }
 
         invocation = ActiveSupport::JSON.decode(@response.body)
         assert_equal attrs[:job_category], invocation['job_category']
@@ -36,7 +36,7 @@ module Api
       test 'should create with description format overridden' do
         attrs = { :job_category => @template.job_category, :name => 'RandomName', :job_template_id => @template.id,
                   :targeting_type => 'static_query', :search_query => 'foobar', :description_format => 'format' }
-        post :create, :job_invocation => attrs
+        post :create, params: { :job_invocation => attrs }
 
         invocation = ActiveSupport::JSON.decode(@response.body)
         assert_equal attrs[:description_format], invocation['description']
@@ -47,7 +47,7 @@ module Api
                   :job_template_id => @template.id,:targeting_type => 'static_query',
                   :search_query => 'foobar', :recurrence => {:cron_line => '5 * * * *'}}
 
-        post :create, :job_invocation => attrs
+        post :create, params: { :job_invocation => attrs }
         invocation = ActiveSupport::JSON.decode(@response.body)
         assert_equal invocation['mode'], 'recurring'
         assert_response :success
@@ -56,13 +56,24 @@ module Api
       test 'should create with schedule' do
         attrs = { :job_category => @template.job_category, :name => 'RandomName',
                   :job_template_id => @template.id,:targeting_type => 'static_query',
-                  :search_query => 'foobar', :scheduling => {:start_at => DateTime.now.to_s}}
+                  :search_query => 'foobar', :scheduling => {:start_at => Time.now.to_s}}
 
-        post :create, :job_invocation => attrs
+        post :create, params: { :job_invocation => attrs }
         invocation = ActiveSupport::JSON.decode(@response.body)
         assert_equal invocation['mode'], 'future'
         assert_response :success
       end
+
+      test 'should provide output for delayed task' do
+        host = @invocation.template_invocations_hosts.first
+        ForemanTasks::Task.any_instance.expects(:delayed?).returns(true)
+        get :output, params: { :job_invocation_id => @invocation.id, :host_id => host.id }
+        result = ActiveSupport::JSON.decode(@response.body)
+        assert_equal result['delayed'], true
+        assert_equal result['refresh'], true
+        assert_equal result['output'], []
+        assert_response :success
+      end
     end
   end
 end

data/test/functional/api/v2/job_templates_controller_test.rb

@@ -4,7 +4,7 @@ module Api
   module V2
     class JobTemplatesControllerTest < ActionController::TestCase
       setup do
-        @template = FactoryGirl.create :job_template
+        @template = FactoryBot.create :job_template
       end
 
       test 'should get index' do
@@ -15,17 +15,17 @@ module Api
       end
 
       test 'should get templates of give organization' do
-        @organization = FactoryGirl.create(:organization)
+        @organization = FactoryBot.create(:organization)
         @template.organizations << @organization
         @template.save!
-        get :index, :organization_id => @organization.id
+        get :index, params: { :organization_id => @organization.id }
         templates = ActiveSupport::JSON.decode(@response.body)
         assert !templates.empty?, 'Should respond with template'
         assert_response :success
       end
 
       test 'should get template detail' do
-        get :show, :id => @template.to_param
+        get :show, params: { :id => @template.to_param }
         assert_response :success
         template = ActiveSupport::JSON.decode(@response.body)
         assert !template.empty?
@@ -35,7 +35,7 @@ module Api
       test 'should create valid' do
         JobTemplate.any_instance.stubs(:valid?).returns(true)
         valid_attrs = { :template => 'This is a test template', :name => 'RandomName', :provider_type => 'ssh' }
-        post :create, :job_template => valid_attrs
+        post :create, params: { :job_template => valid_attrs }
         template = ActiveSupport::JSON.decode(@response.body)
         assert template['name'] == 'RandomName'
         assert_response :success
@@ -48,26 +48,23 @@ module Api
 
       test 'should update valid' do
         JobTemplate.any_instance.stubs(:valid?).returns(true)
-        put :update, :id => @template.to_param,
-                     :job_template => { :template => 'blah' }
+        put :update, params: { :id => @template.to_param, :job_template => { :template => 'blah' } }
         assert_response :ok
       end
 
       test 'should not update invalid' do
-        put :update, :id => @template.to_param,
-                     :job_template => { :name => '' }
+        put :update, params: { :id => @template.to_param, :job_template => { :name => '' } }
         assert_response :unprocessable_entity
       end
 
       test 'should destroy' do
-        delete :destroy, :id => @template.to_param
+        delete :destroy, params: { :id => @template.to_param }
         assert_response :ok
         refute JobTemplate.exists?(@template.id)
       end
 
       test 'should clone template' do
-        post :clone, :id => @template.to_param,
-                     :job_template => {:name => 'MyClone'}
+        post :clone, params: { :id => @template.to_param, :job_template => {:name => 'MyClone'} }
         assert_response :success
         template = ActiveSupport::JSON.decode(@response.body)
         assert_equal(template['name'], 'MyClone')
@@ -75,13 +72,12 @@ module Api
       end
 
       test 'clone name should not be blank' do
-        post :clone, :id => @template.to_param,
-                     :job_template => {:name => ''}
+        post :clone, params: { :id => @template.to_param, :job_template => {:name => ''} }
         assert_response :unprocessable_entity
       end
 
       test 'should export template' do
-        get :export, :id => @template.to_param
+        get :export, params: { :id => @template.to_param }
         assert_equal @response.body, @template.to_erb
         assert_response :success
       end
@@ -89,7 +85,7 @@ module Api
       test 'should import template' do
         new_name = @template.name = "#{@template.name}_renamed"
         erb_data = @template.to_erb
-        post :import, :template => erb_data
+        post :import, params: { :template => erb_data }
         assert_response :success
         assert JobTemplate.unscoped.find_by(name: new_name)
       end