foreman_remote_execution 1.6.3 → 1.6.4

data/locale/zh_TW/foreman_remote_execution.po

@@ -40,9 +40,6 @@ msgstr "從外部範本納入的輸入名稱清單，以逗號隔開。"
 msgid "A job '%{subject}' has finished successfully"
 msgstr ""
 
-msgid "A list of options the user can select from. If not provided, the user will be given a free-form field"
-msgstr "使用者可以選擇的選項清單。如果沒有提供的話，使用者會被給予開放清單的欄位"
-
 msgid "A plugin bringing remote execution to the Foreman, completing the config management functionality with remote management functionality."
 msgstr "將遠端執行帶入 Foreman 的外掛程式，搭配遠端管理功能來完成配置管理。"
 
@@ -61,9 +58,6 @@ msgstr "動作"
 msgid "Add Foreign Input Set"
 msgstr "新增外部輸入集"
 
-msgid "Add Input"
-msgstr "新增輸入"
-
 msgid "Amount of workers in the pool to handle the execution of the remote execution jobs. Restart of the dynflowd/foreman-tasks service is required."
 msgstr ""
 
@@ -127,6 +121,9 @@ msgstr ""
 msgid "Could not render the preview because no host matches the search query."
 msgstr ""
 
+msgid "Could not rerun job %{id} because its template could not be found"
+msgstr ""
+
 msgid "Could not use any proxy. Consider configuring %{global_proxy}, %{fallback_proxy} or %{no_proxy} in settings"
 msgstr ""
 
@@ -145,9 +142,6 @@ msgstr "建立工作範本"
 msgid "Create a recurring job"
 msgstr "建立週期性工作"
 
-msgid "Create a template input"
-msgstr "建立範本輸入"
-
 msgid "Default SSH key passphrase"
 msgstr ""
 
@@ -172,9 +166,6 @@ msgstr "刪除外部輸入集"
 msgid "Delete a job template"
 msgstr "刪除工作範本"
 
-msgid "Delete a template input"
-msgstr "刪除範本輸入"
-
 msgid "Description"
 msgstr "說明"
 
@@ -238,12 +229,6 @@ msgstr "退出狀態：%s"
 msgid "Export a job template to ERB"
 msgstr ""
 
-msgid "Fact name, used when input type is fact"
-msgstr "事實名稱，當輸入類型是 fact 時使用"
-
-msgid "Fact value"
-msgstr "詳情值"
-
 msgid "Failed"
 msgstr "已失敗"
 
@@ -310,24 +295,9 @@ msgstr "這表示如果不能在這時間之前開始，就應該取消動作。
 msgid "Input"
 msgstr "輸入"
 
-msgid "Input description"
-msgstr "輸入的描述"
-
-msgid "Input is advanced"
-msgstr "輸入是進階的"
-
-msgid "Input is required"
-msgstr "需要輸入"
-
-msgid "Input name"
-msgstr "輸入的名稱"
-
 msgid "Input set description"
 msgstr "輸入集的描述"
 
-msgid "Input type"
-msgstr "輸入類型"
-
 msgid "Inputs to use"
 msgstr "要使用的輸入"
 
@@ -427,9 +397,6 @@ msgstr "列出各個組織的工作範本"
 msgid "List remote execution features"
 msgstr "列出遠端執行功能"
 
-msgid "List template inputs"
-msgstr "列出範本輸入"
-
 msgid "List template invocations belonging to job invocation"
 msgstr ""
 
@@ -511,15 +478,6 @@ msgstr "供應者與範本"
 msgid "Proxies"
 msgstr "代理伺服器"
 
-msgid "Puppet class name, used when input type is puppet_parameter"
-msgstr "puppet class 名稱，當輸入類型是 puppet_parameter 時使用"
-
-msgid "Puppet parameter"
-msgstr "Puppet 參數"
-
-msgid "Puppet parameter name, used when input type is puppet_parameter"
-msgstr "puppet 參數名稱，當輸入類型是 puppet_parameter 時使用"
-
 msgid "Recurring logic"
 msgstr "週期邏輯"
 
@@ -637,9 +595,6 @@ msgstr ""
 msgid "Select as many remote execution proxies as applicable for this subnet.  When multiple proxies with the same provider are added, actions will be load balanced among them."
 msgstr "為此子網路儘可能選擇遠端執行代理。加入有著同樣供應者的多重代理之後，動作就會在這些代理上進行負載平衡。"
 
-msgid "Selectable values for user inputs"
-msgstr "使用者輸入可選擇的值"
-
 msgid "Set to distribute over"
 msgstr ""
 
@@ -658,9 +613,6 @@ msgstr "顯示工作範本的詳情"
 msgid "Show remote execution feature"
 msgstr "顯示遠端執行功能"
 
-msgid "Show template input details"
-msgstr "顯示範本輸入的詳細資料"
-
 msgid "Snippet"
 msgstr "程式碼片段"
 
@@ -709,9 +661,6 @@ msgstr ""
 msgid "Template Invocation for %s"
 msgstr ""
 
-msgid "Template input"
-msgstr "範本輸入"
-
 msgid "Template name"
 msgstr "範本名稱"
 
@@ -846,9 +795,6 @@ msgstr "更新外部輸入集"
 msgid "Update a job template"
 msgstr "更新工作範本"
 
-msgid "Update a template input"
-msgstr "更新範本輸入"
-
 msgid "Use default description template"
 msgstr "使用預設的描述範本"
 
@@ -870,15 +816,6 @@ msgstr "使用者輸入"
 msgid "Value"
 msgstr "值"
 
-msgid "Value for required input '%s' was not specified"
-msgstr "所需輸入的值 '%s' 並未指定"
-
-msgid "Variable"
-msgstr "變數"
-
-msgid "Variable name, used when input type is variable"
-msgstr "變數名稱，當輸入類型是 variable 時使用"
-
 msgid "What command should be used to switch to the effective user. One of %s"
 msgstr "該用哪個指令來切換至有效的使用者。%s 之一"
 
@@ -917,9 +854,6 @@ msgstr ""
 msgid "You are not allowed to see the currently assigned template. Saving the form now would unassign the template."
 msgstr "您不能看到目前指定的範本。現在儲存表單會取消指定範本。"
 
-msgid "add a input for this template"
-msgstr "新增輸入至此範本"
-
 msgid "add an input set for this template to reference a different template inputs"
 msgstr "為此範本新增輸入集，以參照至不同的範本輸入"
 
@@ -962,9 +896,6 @@ msgstr "已排程"
 msgid "queued to start executing in %{time}"
 msgstr ""
 
-msgid "remove template input"
-msgstr "移除範本輸入"
-
 msgid "remove template input set"
 msgstr "移除範本輸入集"
 

data/test/factories/foreman_remote_execution_factories.rb

@@ -22,11 +22,6 @@ FactoryBot.define do
     end
   end
 
-  factory :template_input do |f|
-    f.sequence(:name) { |n| "Template input #{n}" }
-    f.input_type 'user'
-  end
-
   factory :foreign_input_set
 
   factory :targeting do |f|
@@ -58,6 +53,12 @@ FactoryBot.define do
         invocation.task = FactoryBot.build(:some_task)
       end
     end
+
+    trait :with_unplanned_host do
+      after(:build) do |invocation, _evaluator|
+        invocation.targeting.hosts << FactoryBot.build(:host)
+      end
+    end
   end
 
   factory :remote_execution_provider do |f|

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

@@ -122,6 +122,15 @@ module Api
         assert_response :success
       end
 
+      test 'should fail with 404 for non-existing job invocation' do
+        invocation_id = @invocation.id + 1
+        assert_empty JobInvocation.where(:id => invocation_id)
+        get :output, params: { :job_invocation_id => invocation_id, :host_id => 1234 }
+        result = ActiveSupport::JSON.decode(@response.body)
+        assert_equal result['message'], "Job invocation not found by id '#{invocation_id}'"
+        assert_response :missing
+      end
+
       test 'should cancel a job' do
         @invocation.task.expects(:cancellable?).returns(true)
         @invocation.task.expects(:cancel).returns(true)
@@ -184,6 +193,7 @@ module Api
       test 'should rerun failed only' do
         @invocation = FactoryBot.create(:job_invocation, :with_template, :with_failed_task)
         @invocation.job_category = @invocation.pattern_template_invocations.first.template.job_category
+        @invocation.targeting.hosts = @invocation.template_invocations.map(&:host)
         @invocation.save!
         JobInvocation.any_instance.expects(:generate_description)
         JobInvocationComposer.any_instance

data/test/unit/input_template_renderer_test.rb

@@ -1,6 +1,8 @@
 require 'test_plugin_helper'
 
 class InputTemplateRendererTest < ActiveSupport::TestCase
+  let(:host) { FactoryBot.build(:host) }
+
   context 'renderer for simple template without inputs' do
     let(:renderer) { InputTemplateRenderer.new(FactoryBot.build(:job_template, :template => 'id <%= preview? %>')) }
 
@@ -11,6 +13,12 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
     it 'should render preview' do
       renderer.preview.must_equal 'id true'
     end
+
+    it 'should allow accessing current_user' do
+      setup_user(:view_job_templates)
+      renderer = InputTemplateRenderer.new(FactoryBot.build(:job_template, :template => "They call me '<%= current_user %>'"))
+      renderer.preview.must_equal "They call me '#{User.current.login}'"
+    end
   end
 
   context 'renderer for template with user input used' do
@@ -53,12 +61,6 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
       end
 
       describe 'rendering' do
-        it 'cannot render the content without job invocation' do
-          refute result
-          renderer.error_message.wont_be_nil
-          renderer.error_message.wont_be_empty
-        end
-
         it 'can preview' do
           renderer.preview.must_equal 'service restart $USER_INPUT[service_name]'
         end
@@ -66,6 +68,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
         context 'with invocation specified and a required input' do
           before do
             template.template_inputs.first.update_attributes(:required => true)
+            template_invocation.reload
             renderer.invocation = template_invocation
           end
 
@@ -82,8 +85,8 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
                               :template_invocation => template_invocation,
                               :template_input => template.template_inputs.first,
                               :value => 'foreman')
+            template_invocation.reload # need to get input_values findable
             renderer.invocation = template_invocation
-            renderer.invocation.reload
           end
 
           it 'can render with job invocation with corresponding value' do
@@ -246,8 +249,8 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
         end
 
         before do
+          template_invocation.reload
           renderer.invocation = template_invocation
-          renderer.invocation.reload
         end
 
         it 'can render with job invocation with corresponding value' do
@@ -266,29 +269,57 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
     end
 
     context 'with options specified' do
-
       let(:job_invocation) { FactoryBot.create(:job_invocation) }
       let(:template_invocation) { FactoryBot.build(:template_invocation, :template => template) }
       let(:result) { renderer.render }
+      let(:required) { false }
+      let(:input) do
+        FactoryBot.create(:template_invocation_input_value,
+                          :template_invocation => template_invocation,
+                          :template_input => template.template_inputs.first,
+                          :value => 'foreman')
+      end
 
       before do
-        template.template_inputs << FactoryBot.build(:template_input, :name => 'service_name', :input_type => 'user', :options => "httpd\nforeman")
+        template.template_inputs << FactoryBot.build(:template_input, :name => 'service_name', :input_type => 'user', :options => "httpd\nforeman", :required => required)
+        job_invocation.template_invocations << template_invocation
+        input
+        template_invocation.reload
+        renderer.invocation = template_invocation
       end
 
       context 'with a valid input defined' do
-        before do
-          job_invocation.template_invocations << template_invocation
-          renderer.invocation = template_invocation
+        context 'with an optional input' do
+          it 'can render with job invocation with corresponding value' do
+            result.must_equal 'service restart foreman'
+          end
+        end
 
-          FactoryBot.create(:template_invocation_input_value,
-                            :template_invocation => template_invocation,
-                            :template_input => template.template_inputs.first,
-                            :value => 'foreman')
-          renderer.invocation.reload
+        context 'with required input' do
+          let(:required) { true }
+
+          it 'renders the template when the input is provided' do
+            result.must_equal 'service restart foreman'
+          end
         end
+      end
 
-        it 'can render with job invocation with corresponding value' do
-          renderer.render.must_equal 'service restart foreman'
+      context 'without provided input' do
+        let(:input) { nil }
+
+        context 'with optional input' do
+          it 'renders the template' do
+            result.must_equal 'service restart '
+          end
+        end
+
+        context 'with required input' do
+          let(:required) { true }
+
+          it 'renders the template' do
+            result
+            assert_match(/Value for required input '.*' was not specified/, renderer.error_message)
+          end
         end
       end
     end
@@ -299,7 +330,7 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
     let(:renderer) { InputTemplateRenderer.new(template) }
 
     context 'with matching input defined' do
-      before { renderer.template.template_inputs<< FactoryBot.build(:template_input, :name => 'issue', :input_type => 'fact', :fact_name => 'issue') }
+      before { renderer.template.template_inputs<< FactoryBot.build(:template_input, :name => 'issue', :input_type => 'fact', :fact_name => 'issue', :required => true) }
       let(:result) { renderer.render }
 
       describe 'rendering' do

data/test/unit/job_invocation_composer_test.rb

@@ -379,8 +379,8 @@ class JobInvocationComposerTest < ActiveSupport::TestCase
         end
       end
 
-      describe '#template_invocation_input_value_for(input)' do
-        let(:value1) { composer.template_invocation_input_value_for(trying_job_template_1, input1) }
+      describe '#input_value_for(input)' do
+        let(:value1) { composer.input_value_for(input1) }
         it 'returns new empty input value if there is no invocation' do
           assert value1.new_record?
           value1.value.must_be_empty

data/test/unit/job_invocation_test.rb

@@ -188,4 +188,40 @@ class JobInvocationTest < ActiveSupport::TestCase
     end
   end
 
+  describe '#failed_hosts' do
+    let(:invocation) do
+      invocation = FactoryBot.build(:job_invocation, :with_template, :with_task, :with_failed_task, :with_unplanned_host)
+      invocation.template_invocations.each { |ti| invocation.targeting.hosts << ti.host }
+      invocation.save!
+      invocation
+    end
+
+    it 'returns only failed hosts when not #finished?' do
+      invocation.stubs(:finished?).returns(false)
+      invocation.failed_hosts.count.must_equal 1
+    end
+
+    it 'returns failed hosts and hosts without task when #finished?' do
+      invocation.stubs(:finished?).returns(true)
+      invocation.failed_hosts.count.must_equal 2
+    end
+
+    describe '#failed_template_invocations' do
+      it 'finds only failed template invocations' do
+        template_invocations = invocation.send(:failed_template_invocations)
+        template_invocations.count.must_equal 1
+        template_invocation = template_invocations.first
+        template_invocation.run_host_job_task.result.must_equal 'error'
+      end
+    end
+
+    describe '#not_failed_template_invocations' do
+      it 'finds only non-failed template invocations' do
+        template_invocations = invocation.send(:not_failed_template_invocations)
+        template_invocations.count.must_equal 1
+        template_invocation = template_invocations.first
+        template_invocation.run_host_job_task.result.must_equal 'success'
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -148,13 +148,11 @@ files:
 - app/controllers/api/v2/job_invocations_controller.rb
 - app/controllers/api/v2/job_templates_controller.rb
 - app/controllers/api/v2/remote_execution_features_controller.rb
-- app/controllers/api/v2/template_inputs_controller.rb
 - app/controllers/api/v2/template_invocations_controller.rb
 - app/controllers/concerns/foreman/controller/parameters/foreign_input_set.rb
 - app/controllers/concerns/foreman/controller/parameters/job_template.rb
 - app/controllers/concerns/foreman/controller/parameters/remote_execution_feature.rb
 - app/controllers/concerns/foreman/controller/parameters/targeting.rb
-- app/controllers/concerns/foreman/controller/parameters/template_input.rb
 - app/controllers/job_invocations_controller.rb
 - app/controllers/job_templates_controller.rb
 - app/controllers/remote_execution_features_controller.rb
@@ -182,6 +180,8 @@ files:
 - app/models/concerns/foreman_remote_execution/subnet_extensions.rb
 - app/models/concerns/foreman_remote_execution/taxonomy_extensions.rb
 - app/models/concerns/foreman_remote_execution/template_extensions.rb
+- app/models/concerns/foreman_remote_execution/template_input_extensions.rb
+- app/models/concerns/foreman_remote_execution/template_overrides.rb
 - app/models/concerns/foreman_remote_execution/user_extensions.rb
 - app/models/foreign_input_set.rb
 - app/models/host_status/execution_status.rb
@@ -198,7 +198,6 @@ files:
 - app/models/target_remote_execution_proxy.rb
 - app/models/targeting.rb
 - app/models/targeting_host.rb
-- app/models/template_input.rb
 - app/models/template_invocation.rb
 - app/models/template_invocation_input_value.rb
 - app/overrides/execution_interface.rb
@@ -225,11 +224,7 @@ files:
 - app/views/api/v2/remote_execution_features/index.json.rabl
 - app/views/api/v2/remote_execution_features/main.json.rabl
 - app/views/api/v2/remote_execution_features/show.json.rabl
-- app/views/api/v2/template_inputs/base.json.rabl
-- app/views/api/v2/template_inputs/create.json.rabl
-- app/views/api/v2/template_inputs/index.json.rabl
-- app/views/api/v2/template_inputs/main.json.rabl
-- app/views/api/v2/template_inputs/show.json.rabl
+- app/views/api/v2/smart_proxies/pubkey.json.rabl
 - app/views/api/v2/template_invocations/base.json.rabl
 - app/views/api/v2/template_invocations/template_invocations.json.rabl
 - app/views/dashboard/.gitkeep
@@ -268,13 +263,12 @@ files:
 - app/views/remote_execution_features/index.html.erb
 - app/views/remote_execution_features/show.html.erb
 - app/views/template_inputs/_foreign_input_set_form.html.erb
-- app/views/template_inputs/_form.html.erb
-- app/views/template_inputs/_invocation_form.html.erb
 - app/views/template_invocations/_output_line_set.html.erb
 - app/views/template_invocations/_refresh.js.erb
 - app/views/template_invocations/show.html.erb
 - app/views/template_invocations/show.js.erb
 - app/views/templates/README.md
+- app/views/templates/ssh/module_action.erb
 - app/views/templates/ssh/package_action.erb
 - app/views/templates/ssh/power_action.erb
 - app/views/templates/ssh/puppet_run_once.erb
@@ -282,7 +276,6 @@ files:
 - app/views/templates/ssh/service_action.erb
 - config/routes.rb
 - db/migrate/20150612121541_add_job_template_to_template.rb
-- db/migrate/20150616080015_create_template_input.rb
 - db/migrate/20150708133241_add_targeting.rb
 - db/migrate/20150708133242_add_invocation.rb
 - db/migrate/20150708133305_add_template_invocation.rb
@@ -290,7 +283,6 @@ files:
 - db/migrate/20150812145900_add_last_task_id_to_job_invocation.rb
 - db/migrate/20150826191632_create_target_remote_execution_proxies.rb
 - db/migrate/20150827144500_change_targeting_search_query_type.rb
-- db/migrate/20150827152730_add_options_to_template_input.rb
 - db/migrate/20150903192731_add_execution_to_interface.rb
 - db/migrate/20150923125825_add_job_invocation_task_group.rb
 - db/migrate/20151013135415_add_pub_key_to_smart_proxy.rb
@@ -310,7 +302,6 @@ files:
 - db/migrate/20160114125628_rename_job_name_to_job_category.rb
 - db/migrate/20160118124600_create_remote_execution_features.rb
 - db/migrate/20160125155108_make_job_template_name_unique.rb
-- db/migrate/20160127134031_add_advanced_to_template_input.rb
 - db/migrate/20160127162711_reword_puppet_template_description.rb
 - db/migrate/20160203104056_add_concurrency_options_to_job_invocation.rb
 - db/migrate/20160926225841_update_template_input_value.rb
@@ -366,7 +357,6 @@ files:
 - test/functional/api/v2/job_invocations_controller_test.rb
 - test/functional/api/v2/job_templates_controller_test.rb
 - test/functional/api/v2/remote_execution_features_controller_test.rb
-- test/functional/api/v2/template_inputs_controller_test.rb
 - test/functional/api/v2/template_invocations_controller_test.rb
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
@@ -386,7 +376,6 @@ files:
 - test/unit/remote_execution_provider_test.rb
 - test/unit/renderer_scope_input.rb
 - test/unit/targeting_test.rb
-- test/unit/template_input_test.rb
 - test/unit/template_invocation_input_value_test.rb
 - webpack/index.js
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.js
@@ -432,7 +421,6 @@ test_files:
 - test/functional/api/v2/job_invocations_controller_test.rb
 - test/functional/api/v2/job_templates_controller_test.rb
 - test/functional/api/v2/remote_execution_features_controller_test.rb
-- test/functional/api/v2/template_inputs_controller_test.rb
 - test/functional/api/v2/template_invocations_controller_test.rb
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
@@ -452,5 +440,4 @@ test_files:
 - test/unit/remote_execution_provider_test.rb
 - test/unit/renderer_scope_input.rb
 - test/unit/targeting_test.rb
-- test/unit/template_input_test.rb
 - test/unit/template_invocation_input_value_test.rb