foreman_remote_execution 3.0.2 → 3.2.2

data/locale/zh_TW/foreman_remote_execution.po

@@ -26,11 +26,6 @@ msgstr "%s 之前"
 msgid "%{description} on %{host}"
 msgstr "%{description} 於 %{host} 之上"
 
-msgid "...and %{count} more"
-msgid_plural "...and %{count} more"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "A comma separated list of input names to be excluded from the foreign template."
 msgstr "從外部範本排除的輸入名稱清單，以逗號隔開。"
 
@@ -58,12 +53,21 @@ msgstr "動作"
 msgid "Add Foreign Input Set"
 msgstr "新增外部輸入集"
 
+msgid "Alphabetical"
+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 "另一個介面已設為執行。行您是否確定要使用此介面？"
 
+msgid "Any Location"
+msgstr ""
+
+msgid "Any Organization"
+msgstr ""
+
 msgid "Back to Job"
 msgstr "回到工作"
 
@@ -91,6 +95,9 @@ msgstr "無法指定 bookmark_id 和 search_query"
 msgid "Cannot specify both recurrence and scheduling"
 msgstr "無法指定 recurrence 和 scheduling"
 
+msgid "Choose a job template that is pre-selected in job invocation form"
+msgstr ""
+
 msgid "Circular dependency detected in foreign input set '%{template}' -> '%{target_template}'. Templates stack: %{templates_stack}"
 msgstr "在外部輸入集偵測到環狀相依性： '%{template}' -> '%{target_template}'。範本堆疊：%{templates_stack}"
 
@@ -145,6 +152,12 @@ msgstr "建立工作範本"
 msgid "Create a recurring job"
 msgstr "建立週期性工作"
 
+msgid "Current location %{loc_c} is different from job's location %{loc_j}."
+msgstr ""
+
+msgid "Current organization %{org_c} is different from job's organization %{org_j}."
+msgstr ""
+
 msgid "Default SSH key passphrase"
 msgstr ""
 
@@ -178,8 +191,8 @@ msgstr "描述範本"
 msgid "Display advanced fields"
 msgstr "顯示進階欄位"
 
-msgid "Distribute execution over N seconds"
-msgstr "在幾秒間散佈執行"
+msgid "Distribute execution over N seconds. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
+msgstr ""
 
 msgid "Distribute tasks over N seconds"
 msgstr "在幾秒間散佈工作"
@@ -223,9 +236,21 @@ msgstr "從代理載入資料時發生錯誤"
 msgid "Evaluated at:"
 msgstr "評量於："
 
+msgid "Execute the jobs on hosts in randomized order"
+msgstr ""
+
 msgid "Execution"
 msgstr "執行"
 
+msgid "Execution order"
+msgstr ""
+
+msgid "Execution ordering"
+msgstr ""
+
+msgid "Execution ordering determines whether the jobs should be executed on hosts in alphabetical order or in randomized order.<br><ul><li><b>Ordered</b> - executes the jobs on hosts in alphabetical order</li><li><b>Randomized</b> - randomizes the order in which jobs are executed on hosts</li></ul>"
+msgstr ""
+
 msgid "Exit status: %s"
 msgstr "退出狀態：%s"
 
@@ -256,6 +281,9 @@ 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 "Form Job Template"
+msgstr ""
+
 msgid "Get output for a host"
 msgstr "取得主機輸出"
 
@@ -376,6 +404,9 @@ msgstr ""
 msgid "Label"
 msgstr "標籤"
 
+msgid "Last execution cancelled"
+msgstr ""
+
 msgid "Last execution failed"
 msgstr "最後的執行失敗"
 
@@ -406,6 +437,9 @@ msgstr "列出遠端執行功能"
 msgid "List template invocations belonging to job invocation"
 msgstr ""
 
+msgid "Location"
+msgstr ""
+
 msgid "Manual selection"
 msgstr "手動選擇"
 
@@ -424,15 +458,15 @@ msgstr "新工作範本"
 msgid "No execution finished yet"
 msgstr "尚無執行完成"
 
-msgid "No hosts found."
-msgstr "找不到主機。"
-
 msgid "No template mapped to feature %{feature_name}"
 msgstr "沒有範本定義至功能 %{feature_name}"
 
 msgid "Not all required inputs have values. Missing inputs: %s"
 msgstr "並不是所需的輸入都有值。缺少的輸入：%s"
 
+msgid "Organization"
+msgstr ""
+
 msgid "Override the description format from the template for this invocation only"
 msgstr "僅為這祈願從範本覆寫描述格式"
 
@@ -457,6 +491,9 @@ msgstr ""
 msgid "Pending"
 msgstr "等待處理中"
 
+msgid "Perform a single Puppet run"
+msgstr ""
+
 msgid "Perform no more executions after this time"
 msgstr "此時間之後不再進行任何執行"
 
@@ -484,6 +521,9 @@ msgstr "供應者與範本"
 msgid "Proxies"
 msgstr "代理伺服器"
 
+msgid "Randomized"
+msgstr ""
+
 msgid "Recurring logic"
 msgstr "週期邏輯"
 
@@ -508,6 +548,9 @@ msgstr "遠端執行"
 msgid "Remote execution feature label that should be triggered, job template assigned to this feature will be used"
 msgstr ""
 
+msgid "Remove SSH known hosts for %s"
+msgstr ""
+
 msgid "Repeat a maximum of N times"
 msgstr "重複最多 N 次"
 
@@ -541,9 +584,15 @@ msgstr "執行"
 msgid "Run Job"
 msgstr "執行工作"
 
+msgid "Run Puppet Once"
+msgstr ""
+
 msgid "Run at most N tasks at a time"
 msgstr "一次最多執行 N 個任務"
 
+msgid "Run at most N tasks at a time. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
+msgstr ""
+
 msgid "SSH"
 msgstr "SSH"
 
@@ -586,8 +635,8 @@ msgstr "搜尋"
 msgid "Search Query"
 msgstr ""
 
-msgid "Search for remote execution proxy outside of the proxies assigned to the host. If locations or organizations are enabled, the search will be limited to the host's organization or location."
-msgstr "搜尋指定給主機的代理之外的遠端執行代理。如果位置或組織都已啟用，搜尋會被限制至主機的組織或地點。"
+msgid "Search for remote execution proxy outside of the proxies assigned to the host. The search will be limited to the host's organization and location."
+msgstr ""
 
 msgid "Search the host for any proxy with Remote Execution, useful when the host has no subnet or the subnet does not have an execution proxy"
 msgstr "使用遠端執行為代理搜尋主機，這在主機沒有子網路、或子網路沒有執行代理時很有用"
@@ -607,7 +656,7 @@ msgstr "為此子網路儘可能選擇遠端執行代理。加入有著同樣供
 msgid "Set to distribute over"
 msgstr ""
 
-msgid "Should the ip addresses on host interfaces be preferred over the fqdn? It is useful, when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip."
+msgid "Should the ip addresses on host interfaces be preferred over the fqdn? It is useful when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip. This setting only applies to IPv4. When the host has only an IPv6 address on the interface used for remote execution, hostname will be used even if this setting is set to true."
 msgstr ""
 
 msgid "Show foreign input set details"
@@ -679,9 +728,6 @@ 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} 找到。"
 
@@ -783,6 +829,9 @@ msgstr "查詢類型"
 msgid "Unable to fetch public key"
 msgstr "無法取得公開金鑰"
 
+msgid "Unable to remove host from known hosts"
+msgstr ""
+
 msgid "Unable to save template. Correct highlighted errors"
 msgstr ""
 

data/package.json

@@ -32,9 +32,8 @@
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/env": "^3.3.2",
     "@theforeman/builder": "^4.0.2",
-    "@theforeman/vendor-dev": "^3.3.2",
+    "@theforeman/vendor-dev": "^4.0.2",
     "babel-eslint": "^10.0.0",
     "babel-jest": "^24.9.0",
     "enzyme": "^3.2.0",
@@ -49,6 +48,6 @@
     "jest": "^24.9.0"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 3.3.2"
+    "@theforeman/vendor": ">= 4.0.2"
   }
 }

data/test/benchmark/run_hosts_job_benchmark.rb

@@ -37,7 +37,7 @@ class ActionTester
 
   def run_action(*args)
     action = create_action(Actions::RemoteExecution::RunHostsJob)
-    @task.update_attributes(:external_id => action.execution_plan_id)
+    @task.update(:external_id => action.execution_plan_id)
     plan_action(action, *args)
   end
 end

data/test/factories/foreman_remote_execution_factories.rb

@@ -128,7 +128,7 @@ FactoryBot.modify do
       domain
       subnet do
         overrides = {
-          :remote_execution_proxies => [FactoryBot.create(:smart_proxy, :ssh)]
+          :remote_execution_proxies => [FactoryBot.create(:smart_proxy, :ssh)],
         }
 
         overrides[:locations] = [location] unless location.nil?

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

@@ -4,7 +4,7 @@ module Api
   module V2
     class JobInvocationsControllerTest < ActionController::TestCase
       setup do
-        @invocation = FactoryBot.create(:job_invocation, :with_template, :with_task)
+        @invocation = FactoryBot.create(:job_invocation, :with_template, :with_task, :with_unplanned_host)
         @template = FactoryBot.create(:job_template, :with_input)
 
         # Without this the template in template_invocations and in pattern_template_invocations
@@ -20,18 +20,32 @@ module Api
         assert_response :success
       end
 
-      test 'should get invocation detail' do
-        get :show, params: { :id => @invocation.id }
-        assert_response :success
-        template = ActiveSupport::JSON.decode(@response.body)
-        assert_not_empty template
-        assert_equal template['job_category'], @invocation.job_category
-      end
+      describe 'show' do
+        test 'should get invocation detail' do
+          get :show, params: { :id => @invocation.id }
+          assert_response :success
+          template = ActiveSupport::JSON.decode(@response.body)
+          assert_not_empty template
+          assert_equal template['job_category'], @invocation.job_category
+          assert_not_empty template['targeting']['hosts']
+        end
 
-      test 'should get invocation detail when taxonomies are set' do
-        taxonomy_params = %w(organization location).reduce({}) { |acc, cur| acc.merge("#{cur}_id" => FactoryBot.create(cur)) }
-        get :show, params: taxonomy_params.merge(:id => @invocation.id)
-        assert_response :success
+        test 'should get invocation detail when taxonomies are set' do
+          taxonomy_params = %w(organization location).reduce({}) { |acc, cur| acc.merge("#{cur}_id" => FactoryBot.create(cur)) }
+          get :show, params: taxonomy_params.merge(:id => @invocation.id)
+          assert_response :success
+        end
+
+        test 'should see only permitted hosts' do
+          @user = FactoryBot.create(:user, admin: false)
+          setup_user('view', 'job_invocations', nil, @user)
+          setup_user('view', 'hosts', 'name ~ nope.example.com', @user)
+
+          get :show, params: { :id => @invocation.id }, session: set_session_user(@user)
+          assert_response :success
+          response = ActiveSupport::JSON.decode(@response.body)
+          assert_empty response['targeting']['hosts']
+        end
       end
 
       context 'creation' do
@@ -78,9 +92,9 @@ module Api
         context 'with_feature' do
           setup do
             @feature = FactoryBot.create(:remote_execution_feature,
-                                         :job_template => @template)
+              :job_template => @template)
             @attrs = {
-              feature: @feature.label
+              feature: @feature.label,
             }
           end
 
@@ -108,7 +122,7 @@ module Api
       end
 
       describe '#output' do
-        let(:host) { @invocation.template_invocations_hosts.first }
+        let(:host) { @invocation.targeting.hosts.first }
 
         test 'should provide output for delayed task' do
           ForemanTasks::Task.any_instance.expects(:scheduled?).returns(true)
@@ -137,6 +151,12 @@ module Api
           assert_equal result['message'], "Job invocation not found by id '#{invocation_id}'"
           assert_response :missing
         end
+
+        test 'should get output only for host in job invocation' do
+          get :output, params: { job_invocation_id: @invocation.id,
+                                 host_id: FactoryBot.create(:host).id }
+          assert_response :missing
+        end
       end
 
       describe 'raw output' do
@@ -148,7 +168,7 @@ module Api
         let(:fake_task) do
           OpenStruct.new :pending? => false, :main_action => OpenStruct.new(:live_output => fake_output)
         end
-        let(:host) { @invocation.template_invocations_hosts.first }
+        let(:host) { @invocation.targeting.hosts.first }
 
         test 'should provide raw output for a host' do
           JobInvocation.any_instance.expects(:task).returns(OpenStruct.new(:scheduled? => false))
@@ -171,7 +191,7 @@ module Api
           assert_equal result['complete'], false
           assert_equal result['delayed'], true
           assert_nil result['output']
-          Time.parse(result['start_at']).to_f.must_be_close_to start_time.to_f
+          _(Time.parse(result['start_at']).to_f).must_be_close_to start_time.to_f
           assert_response :success
         end
 
@@ -184,6 +204,12 @@ module Api
           assert_nil result['output']
           assert_response :success
         end
+
+        test 'should get raw output only for host in job invocation' do
+          get :raw_output, params: { job_invocation_id: @invocation.id,
+                                     host_id: FactoryBot.create(:host).id }
+          assert_response :missing
+        end
       end
 
       test 'should cancel a job' do
@@ -227,22 +253,24 @@ module Api
         assert_response :success
         result = ActiveSupport::JSON.decode(@response.body)
         targeting = Targeting.find(result['targeting_id'])
-        targeting.user_id.must_equal users(:admin).id
-        targeting.search_query.must_equal @invocation.targeting.search_query
+        _(targeting.user_id).must_equal users(:admin).id
+        _(targeting.search_query).must_equal @invocation.targeting.search_query
       end
 
       test 'should not raise an exception when reruning failed has no hosts' do
+        @invocation.targeting.hosts.first.destroy
         JobInvocation.any_instance.expects(:generate_description)
         JobInvocationComposer.any_instance
                              .expects(:validate_job_category)
                              .with(@invocation.job_category)
                              .returns(@invocation.job_category)
+
         post :rerun, params: { :id => @invocation.id, :failed_only => true }
         assert_response :success
         result = ActiveSupport::JSON.decode(@response.body)
         targeting = Targeting.find(result['targeting_id'])
-        targeting.user_id.must_equal users(:admin).id
-        targeting.search_query.must_equal 'name ^ ()'
+        _(targeting.user_id).must_equal users(:admin).id
+        _(targeting.search_query).must_equal 'name ^ ()'
       end
 
       test 'should rerun failed only' do
@@ -260,8 +288,8 @@ module Api
         result = ActiveSupport::JSON.decode(@response.body)
         targeting = Targeting.find(result['targeting_id'])
         hostnames = @invocation.template_invocations.map { |ti| ti.host.name }
-        targeting.user_id.must_equal users(:admin).id
-        targeting.search_query.must_equal "name ^ (#{hostnames.join(',')})"
+        _(targeting.user_id).must_equal users(:admin).id
+        _(targeting.search_query).must_equal "name ^ (#{hostnames.join(',')})"
       end
 
       test 'should return 404 if template is not found' do

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

@@ -39,7 +39,7 @@ module Api
         valid_attrs = { :template => 'This is a test template', :name => 'RandomName', :provider_type => 'ssh' }
         post :create, params: { :job_template => valid_attrs }
         template = ActiveSupport::JSON.decode(@response.body)
-        assert template['name'] == 'RandomName'
+        assert_equal template['name'], 'RandomName'
         assert_response :success
       end
 

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

@@ -5,8 +5,8 @@ module Api
     class RemoteExecutionFeaturesControllerTest < ActionController::TestCase
       setup do
         @remote_execution_feature = RemoteExecutionFeature.register(:my_awesome_feature, 'My awesome feature',
-                                                                    :description => 'You will not believe what it does',
-                                                                    :provided_inputs => ['awesomeness_level'])
+          :description => 'You will not believe what it does',
+          :provided_inputs => ['awesomeness_level'])
         @template = FactoryBot.create(:job_template, :with_input)
       end
 

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

@@ -13,8 +13,8 @@ module Api
       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
+        _(invocations['results'].count).must_equal @job.template_invocations.count
+        _(invocations['total']).must_equal @job.template_invocations.count
 
         expected_result = {
           'id'                   => @template_invocation.id,
@@ -23,9 +23,9 @@ module Api
           '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
+          'run_host_job_task_id' => @template_invocation.run_host_job_task_id,
         }
-        invocations['results'].must_equal [expected_result]
+        _(invocations['results']).must_equal [expected_result]
         assert_response :success
       end
     end