foreman_remote_execution 1.5.2 → 1.5.3

data/locale/zh_TW/foreman_remote_execution.po

@@ -37,6 +37,9 @@ msgstr "從外部範本排除的輸入名稱清單，以逗號隔開。"
 msgid "A comma separated list of input names to be included from the foreign template."
 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 "使用者可以選擇的選項清單。如果沒有提供的話，使用者會被給予開放清單的欄位"
 
@@ -46,6 +49,9 @@ msgstr "將遠端執行帶入 Foreman 的外掛程式，搭配遠端管理功能
 msgid "A user to be used for executing the script. If it differs from the SSH user, su or sudo is used to switch the accounts."
 msgstr "要使用執行這 script 的使用者。如果使用者與 SSH 使用者不同，會用 su 或 sudo 來切換使用者。"
 
+msgid "Abort Job"
+msgstr ""
+
 msgid "Action with sub plans"
 msgstr "有子計畫的動作"
 
@@ -58,6 +64,9 @@ 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 ""
+
 msgid "Another interface is already set as execution. Are you sure you want to use this one instead?"
 msgstr "另一個介面已設為執行。行您是否確定要使用此介面？"
 
@@ -70,6 +79,9 @@ msgstr "書籤"
 msgid "Cancel Job"
 msgstr "取消工作"
 
+msgid "Cancel job invocation"
+msgstr ""
+
 msgid "Cancelled"
 msgstr "已取消"
 
@@ -88,6 +100,9 @@ msgstr "無法指定 recurrence 和 scheduling"
 msgid "Circular dependency detected in foreign input set '%{template}' -> '%{target_template}'. Templates stack: %{templates_stack}"
 msgstr "在外部輸入集偵測到環狀相依性： '%{template}' -> '%{target_template}'。範本堆疊：%{templates_stack}"
 
+msgid "Cleanup working directories"
+msgstr ""
+
 msgid "Clone a provision template"
 msgstr "複製佈建範本"
 
@@ -100,6 +115,9 @@ msgstr "同步等級"
 msgid "Concurrency level limited to"
 msgstr ""
 
+msgid "Connect by IP"
+msgstr ""
+
 msgid "Control concurrency level and distribution over time"
 msgstr "隨時間控制週期等級並散佈"
 
@@ -130,6 +148,18 @@ msgstr "建立週期性工作"
 msgid "Create a template input"
 msgstr "建立範本輸入"
 
+msgid "Default SSH key passphrase"
+msgstr ""
+
+msgid "Default SSH password"
+msgstr ""
+
+msgid "Default key passphrase to use for SSH. You may override per host by setting a parameter called remote_execution_ssh_key_passphrase"
+msgstr ""
+
+msgid "Default password to use for SSH. You may override per host by setting a parameter called remote_execution_ssh_password"
+msgstr ""
+
 msgid "Default user to use for SSH.  You may override per host by setting a parameter called remote_execution_ssh_user."
 msgstr "使用 SSH 的預設使用者。您可以透過設定參數呼叫 remote_execution_ssh_user 來覆寫每台主機的設定。"
 
@@ -151,9 +181,6 @@ msgstr "說明"
 msgid "Description template"
 msgstr "描述範本"
 
-msgid "Detail of %s run"
-msgstr "%s 執行的詳細資料"
-
 msgid "Display advanced fields"
 msgstr "顯示進階欄位"
 
@@ -169,12 +196,21 @@ msgstr "偵測到重複的輸入：%{duplicated_inputs}"
 msgid "Dynamic Query"
 msgstr "動態查詢"
 
+msgid "Edit %s"
+msgstr ""
+
 msgid "Edit Job Template"
 msgstr "編輯工作範本"
 
 msgid "Edit Remote Execution Feature"
 msgstr "編輯遠端執行功能"
 
+msgid "Effective User"
+msgstr ""
+
+msgid "Effective User Method"
+msgstr ""
+
 msgid "Effective user"
 msgstr "有效的使用者"
 
@@ -184,6 +220,9 @@ msgstr "有效使用者方法 \"%{current_value}\" 並非 %{valid_methods} 之
 msgid "Effective user options"
 msgstr "有效的使用者選項"
 
+msgid "Enable Global Proxy"
+msgstr ""
+
 msgid "Error loading data from proxy"
 msgstr "從代理載入資料時發生錯誤"
 
@@ -211,6 +250,12 @@ msgstr "已失敗"
 msgid "Failed rendering template: %s"
 msgstr "無法生成範本：%s"
 
+msgid "Fallback Without Proxy"
+msgstr ""
+
+msgid "Fallback to Any Proxy"
+msgstr ""
+
 msgid "Feature input %{input_name} not defined in template %{template_name}"
 msgstr "未知的輸入 %{input_name} 未定義於範本 %{template_name}"
 
@@ -220,6 +265,9 @@ msgstr "篩選器"
 msgid "Foreign input set"
 msgstr "外部輸入集"
 
+msgid "Foreman can run arbitrary commands on remote hosts using different providers, such as SSH or Ansible. Communication goes through the Smart Proxy so Foreman does not have to have direct access to the target hosts and can scale to control many hosts."
+msgstr ""
+
 msgid "Get output for a host"
 msgstr "取得主機輸出"
 
@@ -232,12 +280,12 @@ msgstr "主機"
 msgid "Host detail"
 msgstr "主機詳細資料"
 
+msgid "Host task"
+msgstr ""
+
 msgid "Host with id '%{id}' was not found"
 msgstr "找不到 ID 為 '%{id}' 的主機"
 
-msgid "Hosts"
-msgstr "主機"
-
 msgid "How often the job should occur, in the cron format"
 msgstr "工作多常發生，格式同 cron"
 
@@ -289,15 +337,24 @@ msgstr "祈願類型，%s 之一"
 msgid "Job"
 msgstr "工作"
 
+msgid "Job Details"
+msgstr ""
+
 msgid "Job Invocation"
 msgstr "工作祈願"
 
+msgid "Job Invocations"
+msgstr ""
+
 msgid "Job Task"
 msgstr "工作任務"
 
 msgid "Job Templates"
 msgstr "工作範本"
 
+msgid "Job cancelled by user"
+msgstr ""
+
 msgid "Job category"
 msgstr "工作類別"
 
@@ -337,6 +394,9 @@ msgstr "JobTemplate|Snippet"
 msgid "Jobs"
 msgstr "工作"
 
+msgid "Key passhprase is only applicable for SSH provider. Other providers ignore this field. <br> Passphrase is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution."
+msgstr ""
+
 msgid "Label"
 msgstr "標籤"
 
@@ -346,6 +406,9 @@ msgstr "最後的執行失敗"
 msgid "Last execution succeeded"
 msgstr "最後的執行成功"
 
+msgid "Learn more about this in the documentation."
+msgstr ""
+
 msgid "List foreign input sets"
 msgstr "列出外部輸入集"
 
@@ -367,6 +430,9 @@ msgstr "列出遠端執行功能"
 msgid "List template inputs"
 msgstr "列出範本輸入"
 
+msgid "List template invocations belonging to job invocation"
+msgstr ""
+
 msgid "Manual selection"
 msgstr "手動選擇"
 
@@ -409,23 +475,29 @@ msgstr ""
 msgid "Overwrite template if it already exists"
 msgstr ""
 
+msgid "Password"
+msgstr ""
+
+msgid "Password is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution."
+msgstr ""
+
 msgid "Pending"
 msgstr "等待處理中"
 
 msgid "Perform no more executions after this time"
 msgstr "此時間之後不再進行任何執行"
 
-msgid "Play Ansible roles"
-msgstr ""
-
 msgid "Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port."
 msgstr ""
 
 msgid "Preview"
 msgstr "預覽"
 
-msgid "Preview for target %s"
-msgstr "預覽目標 %s"
+msgid "Preview templates"
+msgstr ""
+
+msgid "Private key passphrase"
+msgstr ""
 
 msgid "Problem with previewing the template: %{error}. Note that you must save template input changes before you try to preview it."
 msgstr "預覽範本時發生問題：%{error}。請注意，您必須在預覽範本前，先儲存範本輸入的變更。"
@@ -457,9 +529,6 @@ msgstr "偵測到遞迴處理範本"
 msgid "Refresh"
 msgstr "重新整理"
 
-msgid "Refresh this page"
-msgstr "更新此網頁"
-
 msgid "Remote Execution"
 msgstr "遠端執行"
 
@@ -472,6 +541,9 @@ msgstr "遠端動作："
 msgid "Remote execution"
 msgstr "遠端執行"
 
+msgid "Remote execution feature label that should be triggered, job template assigned to this feature will be used"
+msgstr ""
+
 msgid "Repeat a maximum of N times"
 msgstr "重複最多 N 次"
 
@@ -481,6 +553,9 @@ msgstr "重新執行"
 msgid "Rerun failed"
 msgstr "重新執行失敗"
 
+msgid "Rerun job on failed hosts"
+msgstr ""
+
 msgid "Rerun on %s"
 msgstr "傳回於 %s"
 
@@ -493,6 +568,9 @@ msgstr "重新執行工作"
 msgid "Resolves to"
 msgstr "解析至"
 
+msgid "Results"
+msgstr ""
+
 msgid "Run"
 msgstr "執行"
 
@@ -505,9 +583,18 @@ msgstr "一次最多執行 N 個任務"
 msgid "SSH"
 msgstr "SSH"
 
+msgid "SSH Port"
+msgstr ""
+
+msgid "SSH User"
+msgstr ""
+
 msgid "SSH provider specific options"
 msgstr "SSH 供應者特定選項"
 
+msgid "Schedule"
+msgstr ""
+
 msgid "Schedule Remote Job"
 msgstr ""
 
@@ -520,6 +607,9 @@ msgstr "排程工作至晚一點的時間"
 msgid "Scheduled to start at"
 msgstr ""
 
+msgid "Scheduled to start before"
+msgstr ""
+
 msgid "Scroll to bottom"
 msgstr "捲動至底端"
 
@@ -589,6 +679,15 @@ msgstr "已成功"
 msgid "Success"
 msgstr "成功"
 
+msgid "Sudo password"
+msgstr ""
+
+msgid "Sudo password is only applicable for SSH provider. Other providers ignore this field. <br> Password is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution."
+msgstr ""
+
+msgid "Sync Job Templates"
+msgstr ""
+
 msgid "Target hosts"
 msgstr "目標主機"
 
@@ -601,9 +700,15 @@ msgstr "目標："
 msgid "Task Details"
 msgstr "工作詳細資料"
 
+msgid "Task cancelled"
+msgstr ""
+
 msgid "Template ERB"
 msgstr ""
 
+msgid "Template Invocation for %s"
+msgstr ""
+
 msgid "Template input"
 msgstr "範本輸入"
 
@@ -616,6 +721,9 @@ msgstr "範本版本"
 msgid "Template with id '%{id}' was not found"
 msgstr "找不到 ID 為 '%{id}' 的範本"
 
+msgid "The dynamic query '#{job_invocation.targeting.search_query}' was not resolved yet. The list of hosts to which it would resolve now can be seen"
+msgstr ""
+
 msgid "The dynamic query '%{query}' was not resolved yet. The list of hosts to which it would resolve now can be seen %{here}."
 msgstr "動態查詢 '%{query}' 尚未被解析。該解析的主機清單可以在 %{here} 找到。"
 
@@ -625,8 +733,17 @@ msgstr "用來遠端執行的執行介面"
 msgid "The final host list may change because the selected query is dynamic.  It will be rerun during execution."
 msgstr "最終主機清單可能會改變，因為選擇查詢是動態的。這會在執行時重新執行。"
 
-msgid "The job template to use"
-msgstr "要使用的工作範本"
+msgid "The job cannot be aborted at the moment."
+msgstr ""
+
+msgid "The job cannot be cancelled at the moment."
+msgstr ""
+
+msgid "The job could not be cancelled."
+msgstr ""
+
+msgid "The job template to use, parameter is required unless feature was specified"
+msgstr ""
 
 msgid "The only applicable proxy %{proxy_names} is down"
 msgid_plural "All %{count} applicable proxies are down. Tried %{proxy_names}"
@@ -657,9 +774,6 @@ msgstr ""
 msgid "Time span"
 msgstr "時間跨度"
 
-msgid "Timeout interval"
-msgstr ""
-
 msgid "Timeout to kill"
 msgstr ""
 
@@ -681,17 +795,29 @@ msgstr "切換指令"
 msgid "Total hosts"
 msgstr "主機總數"
 
+msgid "Try to abort the job on a host without waiting for its result"
+msgstr ""
+
+msgid "Try to abort the job without waiting for the results from the remote hosts"
+msgstr ""
+
 msgid "Try to cancel the job"
 msgstr "試著取消工作"
 
 msgid "Try to cancel the job on a host"
 msgstr "試著取消主機上的工作"
 
+msgid "Trying to abort the job"
+msgstr ""
+
+msgid "Trying to cancel the job"
+msgstr ""
+
 msgid "Type"
 msgstr "類型"
 
-msgid "Type has impact on when is the query evaulated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>"
-msgstr "「類型」對於何時查詢主機評量時有影響。<br><ul><li><b>Static</b> - 送出此表單時進行評量</li><li><b>Dynamic</b> - 在執行開始前評量，因此會計畫在未來執行，目標主機可能會在這之前改變</li></ul>"
+msgid "Type has impact on when is the query evaluated to hosts.<br><ul><li><b>Static</b> - evaluates just after you submit this form</li><li><b>Dynamic</b> - evaluates just before the execution is started, so if it's planed in future, targeted hosts set may change before it</li></ul>"
+msgstr ""
 
 msgid "Type of query"
 msgstr "查詢類型"
@@ -726,6 +852,9 @@ msgstr "更新範本輸入"
 msgid "Use default description template"
 msgstr "使用預設的描述範本"
 
+msgid "User Inputs"
+msgstr ""
+
 msgid "User can not execute job on host %s"
 msgstr "使用者無法在主機 %s 上執行工作"
 
@@ -738,6 +867,9 @@ msgstr "使用者無法在 %s 上執行此工作範本"
 msgid "User input"
 msgstr "使用者輸入"
 
+msgid "Value"
+msgstr ""
+
 msgid "Value for required input '%s' was not specified"
 msgstr "所需輸入的值 '%s' 並未指定"
 
@@ -761,6 +893,9 @@ msgid ""
 "                     proxy with remote execution feature is configured for the host."
 msgstr ""
 
+msgid "When enabled, working directories will be removed after task completion. You may override this per host by setting a parameter called remote_execution_cleanup_working_dirs."
+msgstr ""
+
 msgid "Whether it should be allowed to override the effective user from the invocation form."
 msgstr "是否允許從祈願清單覆寫有效使用者。"
 
@@ -776,6 +911,9 @@ msgstr ""
 msgid "Whether we should sync templates from disk when running db:seed."
 msgstr "執行 db:seed 時是否要從磁碟同步範本。"
 
+msgid "Workers pool size"
+msgstr ""
+
 msgid "You are not allowed to see the currently assigned template. Saving the form now would unassign the template."
 msgstr "您不能看到目前指定的範本。現在儲存表單會取消指定範本。"
 
@@ -788,15 +926,15 @@ msgstr "為此範本新增輸入集，以參照至不同的範本輸入"
 msgid "cancelled"
 msgstr "已取消"
 
+msgid "effective user"
+msgstr ""
+
 msgid "error during rendering: %s"
 msgstr "處理時發生錯誤：%s"
 
 msgid "failed"
 msgstr "已失敗"
 
-msgid "following user inputs were provided"
-msgstr "提供了以下使用者輸入"
-
 msgid "here"
 msgstr "這裏"
 
@@ -815,9 +953,6 @@ msgstr "找不到包含的範本 '%s'"
 msgid "input macro with name '%s' used, but no input with such name defined for this template"
 msgstr "使用了名為 '%s' 的輸入巨集，但此範本並未輸入這樣的名稱"
 
-msgid "minutes"
-msgstr ""
-
 msgid "planned"
 msgstr ""
 
@@ -856,3 +991,6 @@ msgstr "範本"
 
 msgid "unknown status"
 msgstr "未知的狀態"
+
+msgid "using "
+msgstr ""

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module Api
+  module V2
+    class TemplateInvocationsControllerTest < ActionController::TestCase
+      setup do
+        @job = FactoryBot.create(:job_invocation, :with_template, :with_task)
+        @template_invocation = @job.template_invocations.first
+      end
+
+      test 'should get template invocations belonging to job invocation' do
+        get :template_invocations, params: { :id => @job.id }
+        invocations = ActiveSupport::JSON.decode(@response.body)
+        invocations['results'].count.must_equal @job.template_invocations.count
+        invocations['total'].must_equal @job.template_invocations.count
+
+        expected_result = {
+          'id'                   => @template_invocation.id,
+          'host_id'              => @template_invocation.host_id,
+          'host_name'            => @template_invocation.host.name,
+          'template_id'          => @template_invocation.template_id,
+          'effective_user'       => @template_invocation.effective_user,
+          'job_invocation_id'    => @job.id,
+          'run_host_job_task_id' => @template_invocation.run_host_job_task_id
+        }
+        invocations['results'].must_equal [expected_result]
+        assert_response :success
+      end
+    end
+  end
+end

data/test/unit/remote_execution_provider_test.rb

@@ -86,7 +86,8 @@ class RemoteExecutionProviderTest < ActiveSupport::TestCase
     end
 
     describe 'sudo' do
-      it 'uses the remote_execution_ssh_user on the host param' do
+      it 'uses the remote_execution_effective_user_method on the host param' do
+        host.params['remote_execution_effective_user_method'] = 'sudo'
         method_param = FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_effective_user_method', :value => 'sudo')
         host.host_parameters << method_param
         proxy_options[:effective_user_method].must_equal 'sudo'
@@ -94,6 +95,10 @@ class RemoteExecutionProviderTest < ActiveSupport::TestCase
         host.clear_host_parameters_cache!
         proxy_options = SSHExecutionProvider.proxy_command_options(template_invocation, host)
         proxy_options[:effective_user_method].must_equal 'su'
+        method_param.update_attributes!(:value => 'dzdo')
+        host.clear_host_parameters_cache!
+        proxy_options = SSHExecutionProvider.proxy_command_options(template_invocation, host)
+        proxy_options[:effective_user_method].must_equal 'dzdo'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -149,6 +149,7 @@ files:
 - 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
@@ -228,6 +229,8 @@ files:
 - 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/template_invocations/base.json.rabl
+- app/views/api/v2/template_invocations/template_invocations.json.rabl
 - app/views/dashboard/.gitkeep
 - app/views/job_invocation_task_groups/_job_invocation_task_groups.html.erb
 - app/views/job_invocations/_card_results.html.erb
@@ -250,6 +253,7 @@ files:
 - app/views/job_invocations/refresh.js.erb
 - app/views/job_invocations/show.html.erb
 - app/views/job_invocations/show.js.erb
+- app/views/job_invocations/welcome.html.erb
 - app/views/job_templates/_custom_tab_headers.html.erb
 - app/views/job_templates/_custom_tabs.html.erb
 - app/views/job_templates/_import_job_template_modal.html.erb
@@ -362,6 +366,7 @@ files:
 - 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/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
@@ -392,7 +397,8 @@ files:
 - webpack/react_app/redux/reducers/jobInvocations/index.test.js
 - webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman_remote_execution
-licenses: []
+licenses:
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -410,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config
@@ -424,6 +430,7 @@ test_files:
 - 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/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb