foreman-tasks 5.2.2 → 6.0.1

data/locale/fr/foreman_tasks.po

@@ -57,6 +57,9 @@ msgstr "Le paramètre :after dans la section de nettoyage des tâches est obsol
 msgid "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved."
 msgstr "Une tâche en pause représente un processus qui ne s'est pas terminé correctement. Toute tâche en état de pause peut entraîner une incohérence potentielle et doit être résolue."
 
+msgid "A special label for tracking a recurring job. There can be only one active job with a given purpose at a time."
+msgstr ""
+
 msgid "Action"
 msgstr "Action"
 
@@ -69,6 +72,9 @@ msgstr "Actif"
 msgid "Active Filters:"
 msgstr "Filtres actifs :"
 
+msgid "Active or disabled recurring logic with purpose %s already exists"
+msgstr ""
+
 msgid "All %s tasks are selected. "
 msgstr "Toutes les tâches %s sont sélectionnées. "
 
@@ -277,6 +283,9 @@ msgstr "Tâches Foreman"
 msgid "Fri"
 msgstr "Ven."
 
+msgid "I understand that this may cause harm and have working database backups of all backend services."
+msgstr ""
+
 msgid "ID"
 msgstr "ID"
 
@@ -428,9 +437,6 @@ msgstr "Multiplicateur des intervalles de sondage"
 msgid "Polling multiplier which is used to multiply the default polling intervals. This can be used to prevent polling too frequently for long running tasks."
 msgstr "Multiplicateur de sondage qui est utilisé pour multiplier les intervalles de sondage par défaut. Il peut être utilisé pour éviter que les sondages ne soient trop fréquents pour des tâches de longue durée."
 
-msgid "Preupgrade job"
-msgstr ""
-
 msgid "Proxy action retry count"
 msgstr ""
 
@@ -443,6 +449,9 @@ msgstr "Tâches de proxy manquantes du smart proxy"
 msgid "Proxy tasks batch size"
 msgstr ""
 
+msgid "Purpose"
+msgstr ""
+
 msgid "Raw"
 msgstr "Brut"
 
@@ -488,6 +497,9 @@ msgstr "Le verrouillage requis est déjà utilisé par d'autres tâches en cours
 msgid "Resource search_params requires resource_type and resource_id to be specified"
 msgstr "Ressource search_params a besoin que resource_type et resource_id soient spécifiés"
 
+msgid "Resources for %s task(s) will be unlocked and will not prevent other tasks from being run. As the task(s) might be still running, it should be avoided to use this unless you are really sure the task(s) got stuck."
+msgstr ""
+
 msgid "Result"
 msgstr "Résultat"
 
@@ -664,6 +676,12 @@ msgstr[1] "Il y a %{compte} de tâches en pause dans le système qui nécessiten
 msgid "This action will delete all cancelled recurring logics. Please note that this action can't be reversed."
 msgstr "Cette action supprimera toutes les logiques récurrentes annulées. Veuillez noter que cette action ne peut pas être annulée."
 
+msgid "This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?"
+msgstr ""
+
+msgid "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
+msgstr ""
+
 msgid "Thu"
 msgstr "Jeu."
 
@@ -718,6 +736,9 @@ msgstr "En se concentrant sur la dernière"
 msgid "Yes"
 msgstr "Oui"
 
+msgid "You can find resource locks on this page. Exclusive lock marked with locked icon means that no other task can use locked resource while this task is running. Non-exclusive lock marked with unlocked icon means other tasks can access the resource freely, it is only used to indicate the relation of this task with the resource"
+msgstr ""
+
 msgid "You do not have permission"
 msgstr ""
 
@@ -759,6 +780,9 @@ msgstr "est minute (plage: 0-59)"
 msgid "is month (range: 1-12)"
 msgstr "est mois (Plage: 1-12)"
 
+msgid "is not a valid format"
+msgstr ""
+
 msgid "last"
 msgstr "dernier"
 

data/locale/ja/foreman_tasks.po

@@ -57,6 +57,9 @@ msgstr "タスク消去のセクションの :after の設定は非推奨にな
 msgid "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved."
 msgstr "一時停止タスクは、適切に終了していないプロセスを表します。一時停止状態のタスクは、一貫性に欠ける可能性があり、解決する必要があります。"
 
+msgid "A special label for tracking a recurring job. There can be only one active job with a given purpose at a time."
+msgstr ""
+
 msgid "Action"
 msgstr "アクション"
 
@@ -69,6 +72,9 @@ msgstr "アクティブ"
 msgid "Active Filters:"
 msgstr "アクティブなフィルター:"
 
+msgid "Active or disabled recurring logic with purpose %s already exists"
+msgstr ""
+
 msgid "All %s tasks are selected. "
 msgstr "%s の全タスクを選択します。"
 
@@ -277,6 +283,9 @@ msgstr "Foreman タスク"
 msgid "Fri"
 msgstr "金"
 
+msgid "I understand that this may cause harm and have working database backups of all backend services."
+msgstr ""
+
 msgid "ID"
 msgstr "ID"
 
@@ -428,9 +437,6 @@ msgstr "ポーリングの間隔乗数"
 msgid "Polling multiplier which is used to multiply the default polling intervals. This can be used to prevent polling too frequently for long running tasks."
 msgstr "デフォルトのポーリングの間隔を乗算するときに使用するポーリング乗数。この乗数を使用して、長期間にわたり実行中のタスクが頻繁にポーリングされるのを回避します。"
 
-msgid "Preupgrade job"
-msgstr ""
-
 msgid "Proxy action retry count"
 msgstr ""
 
@@ -443,6 +449,9 @@ msgstr "Smart Proxy のプロキシータスクが見つかりません"
 msgid "Proxy tasks batch size"
 msgstr ""
 
+msgid "Purpose"
+msgstr ""
+
 msgid "Raw"
 msgstr "ロー"
 
@@ -488,6 +497,9 @@ msgstr "必要なロックは、実行中の他のタスクにより取得済み
 msgid "Resource search_params requires resource_type and resource_id to be specified"
 msgstr "リソース search_params では resource_type と resource_id を指定する必要があります"
 
+msgid "Resources for %s task(s) will be unlocked and will not prevent other tasks from being run. As the task(s) might be still running, it should be avoided to use this unless you are really sure the task(s) got stuck."
+msgstr ""
+
 msgid "Result"
 msgstr "結果"
 
@@ -664,6 +676,12 @@ msgstr[1] ""
 msgid "This action will delete all cancelled recurring logics. Please note that this action can't be reversed."
 msgstr "このアクションは、キャンセル済みの再帰論理をすべて削除します。この操作は元に戻すことはできません。注意してください。"
 
+msgid "This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?"
+msgstr ""
+
+msgid "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
+msgstr ""
+
 msgid "Thu"
 msgstr "木"
 
@@ -718,6 +736,9 @@ msgstr "フォーカスする時間: 過去 "
 msgid "Yes"
 msgstr "はい"
 
+msgid "You can find resource locks on this page. Exclusive lock marked with locked icon means that no other task can use locked resource while this task is running. Non-exclusive lock marked with unlocked icon means other tasks can access the resource freely, it is only used to indicate the relation of this task with the resource"
+msgstr ""
+
 msgid "You do not have permission"
 msgstr ""
 
@@ -759,6 +780,9 @@ msgstr "分 (範囲: 0〜59)"
 msgid "is month (range: 1-12)"
 msgstr "月 (範囲: 1〜12)"
 
+msgid "is not a valid format"
+msgstr ""
+
 msgid "last"
 msgstr "過去"
 

data/locale/zh_CN/foreman_tasks.po

@@ -56,6 +56,9 @@ msgstr "：在任务清理部分中的设置弃用之后，使用 :after in :
 msgid "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved."
 msgstr "暂停的任务代表未正确完成的进程。任何处于暂停状态的任务都可能导致潜在的不一致，需要被解决。"
 
+msgid "A special label for tracking a recurring job. There can be only one active job with a given purpose at a time."
+msgstr ""
+
 msgid "Action"
 msgstr "行动"
 
@@ -68,6 +71,9 @@ msgstr "活性"
 msgid "Active Filters:"
 msgstr "活跃的过滤器："
 
+msgid "Active or disabled recurring logic with purpose %s already exists"
+msgstr ""
+
 msgid "All %s tasks are selected. "
 msgstr "已选择所有％s任务。 "
 
@@ -276,6 +282,9 @@ msgstr "Foreman 任务"
 msgid "Fri"
 msgstr "周五"
 
+msgid "I understand that this may cause harm and have working database backups of all backend services."
+msgstr ""
+
 msgid "ID"
 msgstr "ID"
 
@@ -427,9 +436,6 @@ msgstr "轮询间隔乘数"
 msgid "Polling multiplier which is used to multiply the default polling intervals. This can be used to prevent polling too frequently for long running tasks."
 msgstr "轮询乘数，用于乘以默认轮询间隔。这可用于防止对长时间运行的任务进行过于频繁的轮询。"
 
-msgid "Preupgrade job"
-msgstr ""
-
 msgid "Proxy action retry count"
 msgstr ""
 
@@ -442,6 +448,9 @@ msgstr "代理任务在智能代理中丢失"
 msgid "Proxy tasks batch size"
 msgstr ""
 
+msgid "Purpose"
+msgstr ""
+
 msgid "Raw"
 msgstr "Raw"
 
@@ -487,6 +496,9 @@ msgstr "所需的锁定已由其他正在运行的任务获取。"
 msgid "Resource search_params requires resource_type and resource_id to be specified"
 msgstr "資源 search_params 需要指定 resource_type 與 resource_id"
 
+msgid "Resources for %s task(s) will be unlocked and will not prevent other tasks from being run. As the task(s) might be still running, it should be avoided to use this unless you are really sure the task(s) got stuck."
+msgstr ""
+
 msgid "Result"
 msgstr "结果"
 
@@ -663,6 +675,12 @@ msgstr[1] ""
 msgid "This action will delete all cancelled recurring logics. Please note that this action can't be reversed."
 msgstr "此操作将删除所有取消的重复逻辑。请注意，此操作无法撤消。"
 
+msgid "This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?"
+msgstr ""
+
+msgid "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
+msgstr ""
+
 msgid "Thu"
 msgstr "周四"
 
@@ -717,6 +735,9 @@ msgstr "专注于最后"
 msgid "Yes"
 msgstr "是"
 
+msgid "You can find resource locks on this page. Exclusive lock marked with locked icon means that no other task can use locked resource while this task is running. Non-exclusive lock marked with unlocked icon means other tasks can access the resource freely, it is only used to indicate the relation of this task with the resource"
+msgstr ""
+
 msgid "You do not have permission"
 msgstr ""
 
@@ -758,6 +779,9 @@ msgstr "是分鐘（範圍：0-59）"
 msgid "is month (range: 1-12)"
 msgstr "是月份（範圍：1-12）"
 
+msgid "is not a valid format"
+msgstr ""
+
 msgid "last"
 msgstr "最近"
 

data/test/controllers/api/tasks_controller_test.rb

@@ -192,14 +192,13 @@ module ForemanTasks
           _(task.state).must_equal 'running'
           _(task.result).must_equal 'pending'
 
-          callback = Support::DummyProxyAction.proxy.log[:trigger_task].first[1][:action_input][:callback]
+          callback = Support::DummyProxyAction.proxy.log[:trigger_task].first[1].first[1][:action_input][:callback]
           post :callback, params: { 'callback' => callback, 'data' => { 'result' => 'success' } }
           triggered.finished.wait(5)
 
           task.reload
           _(task.state).must_equal 'stopped'
           _(task.result).must_equal 'success'
-          _(task.main_action.output['proxy_task_id']).must_equal Support::DummyProxyAction.proxy.uuid
           _(task.main_action.output['proxy_output']).must_equal('result' => 'success')
         end
       end

data/test/factories/task_factory.rb

@@ -24,7 +24,7 @@ FactoryBot.define do
         ForemanTasks::Task.where(:external_id => execution_plan.id).delete_all
         task.update!(:external_id => execution_plan.id)
         if evaluator.sync_with_dynflow
-          task.update_from_dynflow(execution_plan.to_hash)
+          task.update_from_dynflow(execution_plan)
         end
       end
 

data/test/lib/actions/middleware/keep_current_taxonomies_test.rb

@@ -15,7 +15,7 @@ module Actions
         middleware.use KeepCurrentTaxonomies
         execution_plan_hooks.use :null_hook, :on => :planning
 
-        def null_hook; end
+        def null_hook(plan); end
       end
 
       before do
@@ -78,6 +78,14 @@ module Actions
           Organization.stubs(:current=)
           Location.stubs(:current=)
 
+          org_finder = mock('organization finder')
+          org_finder.stubs(:find).with(@org.id).returns(@org)
+          Organization.stubs(:unscoped).returns(org_finder)
+
+          loc_finder = mock('location finder')
+          loc_finder.stubs(:find).with(@loc.id).returns(@loc)
+          Location.stubs(:unscoped).returns(loc_finder)
+
           triggered = ForemanTasks.trigger(TestHookAction)
           task = ForemanTasks::Task.where(:external_id => triggered.id).first
           wait_for { task.reload.state == 'stopped' }

data/test/support/dummy_dynflow_action.rb

@@ -1,5 +1,5 @@
 module Support
-  class DummyDynflowAction < Dynflow::Action
+  class DummyDynflowAction < Actions::EntryAction
   end
 
   class DummyPauseAction < Actions::EntryAction

data/test/support/dummy_proxy_action.rb

@@ -40,7 +40,7 @@ module Support
       def launch_tasks(operation, args = {})
         @log[:trigger_task] << [operation, args]
         @task_triggered.fulfill(true)
-        { 'task_id' => @uuid, 'result' => 'success' }
+        { 'task_id' => @uuid, 'result' => 'success', 'parent' => { 'task_id' => @uuid } }
       end
     end
 

data/test/unit/actions/proxy_action_test.rb

@@ -1,4 +1,5 @@
 require 'foreman_tasks_test_helper'
+require 'ostruct'
 
 module ForemanTasks
   class ProxyActionTest <  ActiveSupport::TestCase
@@ -22,24 +23,29 @@ module ForemanTasks
                                          'foo' => 'bar',
                                          'secrets' => secrets,
                                          'use_batch_triggering' => batch_triggering)
+        RemoteTask.any_instance.stubs(:action).returns(@action)
+        RemoteTask.any_instance.stubs(:task).returns(OpenStruct.new(:id => Support::DummyProxyAction.proxy.uuid))
+        @run_step_id = @action.run_step_id
+
         @action = run_action(@action)
       end
 
       describe 'first run' do
         it 'triggers the corresponding action on the proxy' do
           proxy_call = Support::DummyProxyAction.proxy.log[:trigger_task].first
-          expected_call = ['single',
-                           { :action_class => 'Proxy::DummyAction',
-                             :action_input =>
-                             { 'foo' => 'bar',
-                               'secrets' => secrets,
-                               'connection_options' =>
-                               { 'retry_interval' => 15, 'retry_count' => 4,
-                                 'proxy_batch_triggering' => batch_triggering },
-                               'use_batch_triggering' => batch_triggering,
-                               'proxy_url' => 'proxy.example.com',
-                               'proxy_action_name' => 'Proxy::DummyAction',
-                               'callback' => { 'task_id' => Support::DummyProxyAction.proxy.uuid, 'step_id' => @action.run_step_id } } }]
+          action_input =
+            { :action_class => 'Proxy::DummyAction',
+              :action_input =>
+                { 'foo' => 'bar',
+                  'secrets' => secrets,
+                  'connection_options' =>
+                    { 'retry_interval' => 15, 'retry_count' => 4,
+                      'proxy_batch_triggering' => batch_triggering },
+                  'use_batch_triggering' => batch_triggering,
+                  'proxy_url' => 'proxy.example.com',
+                  'proxy_action_name' => 'Proxy::DummyAction',
+                  'callback' => { 'task_id' => Support::DummyProxyAction.proxy.uuid, 'step_id' => @run_step_id } } }
+          expected_call = ['support', { @action.execution_plan_id => action_input }]
           _(proxy_call).must_equal(expected_call)
         end
 
@@ -73,7 +79,7 @@ module ForemanTasks
       describe 'cancel' do
         it 'sends the cancel event to the proxy when the cancel event is sent for the first time' do
           action = run_action(@action, ::Dynflow::Action::Cancellable::Cancel)
-          _(Support::DummyProxyAction.proxy.log[:cancel_task].first).must_equal [Support::DummyProxyAction.proxy.uuid]
+          _(Support::DummyProxyAction.proxy.log[:cancel_task].first).must_equal [action.execution_plan_id]
           _(action.state).must_equal :suspended
         end
 

data/test/unit/actions/trigger_proxy_batch_test.rb

@@ -46,7 +46,6 @@ module ForemanTasks
 
         it 'fetches batch_size of tasks and triggers them' do
           remote_tasks.expects(:first).with(batch_size).returns(remote_tasks)
-          remote_tasks.expects(:size).returns(batch_size)
           triggered.expects(:remote_tasks).returns(remote_tasks)
           ForemanTasks::RemoteTask.expects(:batch_trigger).with(proxy_operation_name, grouped_remote_batch)
 

data/test/unit/troubleshooting_help_generator_test.rb

@@ -21,7 +21,6 @@ module ForemanTasks
     end
 
     before do
-      Setting::ForemanTasks.load_defaults
       ::ForemanTasks::Task.delete_all
       @task = trigger_task
       Setting[:foreman_tasks_troubleshooting_url] = sample_troubleshooting_url

data/test/unit/ui_notifications_test.rb

@@ -12,7 +12,6 @@ module ForemanTasks
     end
 
     before do
-      Setting::ForemanTasks.load_defaults
       ::ForemanTasks::Task.delete_all
       load File.join(ForemanTasks::Engine.root, 'db', 'seeds.d', '30-notification_blueprints.rb')
       @admin_user = FactoryBot.create(:user, :admin)

data/webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.js

@@ -1,5 +1,5 @@
 import { translate as __, sprintf } from 'foremanReact/common/I18n';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { TASKS_DASHBOARD_JS_QUERY_MODES } from '../TasksDashboard/TasksDashboardConstants';
 import { timeToHoursNumber } from '../TasksDashboard/TasksDashboardHelper';
 import {

data/webpack/ForemanTasks/Components/TaskActions/index.js

@@ -1,6 +1,6 @@
 import { sprintf } from 'foremanReact/common/I18n';
 import { API } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import {
   TASKS_RESUME_REQUEST,
   TASKS_RESUME_SUCCESS,

data/webpack/ForemanTasks/Components/TaskDetails/Components/Locks.js

@@ -3,6 +3,18 @@ import PropTypes from 'prop-types';
 import { Alert, Card, Row, Col } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 
+const ConditionalLink = ({ children, link }) =>
+  link ? <a href={link}>{children}</a> : children;
+
+ConditionalLink.propTypes = {
+  children: PropTypes.node.isRequired,
+  link: PropTypes.string,
+};
+
+ConditionalLink.defaultProps = {
+  link: null,
+};
+
 const Locks = ({ locks }) => (
   <div>
     <Alert type="info">
@@ -14,20 +26,22 @@ const Locks = ({ locks }) => (
       <Row>
         {locks.map((lock, key) => (
           <Col xs={6} sm={4} md={4} key={key}>
-            <Card className="card-pf-aggregate-status" accented>
-              <Card.Title>
-                <span
-                  className={`fa ${
-                    lock.exclusive ? 'fa-lock' : 'fa-unlock-alt'
-                  }`}
-                />
-                {lock.resource_type}
-              </Card.Title>
-              <Card.Body>
-                {`id:${lock.resource_id}`}
-                <br />
-              </Card.Body>
-            </Card>
+            <ConditionalLink link={lock.link}>
+              <Card className="card-pf-aggregate-status" accented>
+                <Card.Title>
+                  <span
+                    className={`fa ${
+                      lock.exclusive ? 'fa-lock' : 'fa-unlock-alt'
+                    }`}
+                  />
+                  {lock.resource_type}
+                </Card.Title>
+                <Card.Body>
+                  {`id:${lock.resource_id}`}
+                  <br />
+                </Card.Body>
+              </Card>
+            </ConditionalLink>
           </Col>
         ))}
       </Row>

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Locks.test.js.snap

@@ -25,29 +25,33 @@ exports[`Locks rendering render with Props 1`] = `
         sm={4}
         xs={6}
       >
-        <Card
-          accented={true}
-          aggregated={false}
-          aggregatedMini={false}
-          cardRef={null}
-          className="card-pf-aggregate-status"
-          matchHeight={false}
+        <ConditionalLink
+          link={null}
         >
-          <CardTitle
-            className=""
+          <Card
+            accented={true}
+            aggregated={false}
+            aggregatedMini={false}
+            cardRef={null}
+            className="card-pf-aggregate-status"
+            matchHeight={false}
           >
-            <span
-              className="fa fa-unlock-alt"
-            />
-            User
-          </CardTitle>
-          <CardBody
-            className=""
-          >
-            id:4
-            <br />
-          </CardBody>
-        </Card>
+            <CardTitle
+              className=""
+            >
+              <span
+                className="fa fa-unlock-alt"
+              />
+              User
+            </CardTitle>
+            <CardBody
+              className=""
+            >
+              id:4
+              <br />
+            </CardBody>
+          </Card>
+        </ConditionalLink>
       </Col>
       <Col
         bsClass="col"
@@ -57,29 +61,33 @@ exports[`Locks rendering render with Props 1`] = `
         sm={4}
         xs={6}
       >
-        <Card
-          accented={true}
-          aggregated={false}
-          aggregatedMini={false}
-          cardRef={null}
-          className="card-pf-aggregate-status"
-          matchHeight={false}
+        <ConditionalLink
+          link={null}
         >
-          <CardTitle
-            className=""
-          >
-            <span
-              className="fa fa-unlock-alt"
-            />
-            User
-          </CardTitle>
-          <CardBody
-            className=""
+          <Card
+            accented={true}
+            aggregated={false}
+            aggregatedMini={false}
+            cardRef={null}
+            className="card-pf-aggregate-status"
+            matchHeight={false}
           >
-            id:2
-            <br />
-          </CardBody>
-        </Card>
+            <CardTitle
+              className=""
+            >
+              <span
+                className="fa fa-unlock-alt"
+              />
+              User
+            </CardTitle>
+            <CardBody
+              className=""
+            >
+              id:2
+              <br />
+            </CardBody>
+          </Card>
+        </ConditionalLink>
       </Col>
     </Row>
   </CardGrid>

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsActions.js

@@ -1,5 +1,5 @@
 import { post, get } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { translate as __ } from 'foremanReact/common/I18n';
 import {
   withInterval,

data/webpack/ForemanTasks/Components/TasksTable/TasksBulkActions.js

@@ -1,5 +1,5 @@
 import { API } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import {
   BULK_CANCEL_PATH,