foreman_remote_execution 13.2.1 → 13.2.3

data/app/assets/javascripts/foreman_remote_execution/locale/pt_BR/foreman_remote_execution.js

@@ -78,6 +78,9 @@
       "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.": [
         "Usuário a ser usado para a execução de script. Se ele for diferente do usuário SSH, su ou sudo pode ser utilizado para a troca de contas. "
       ],
+      "Abort": [
+        ""
+      ],
       "Abort Job": [
         "Sobre o trabalho"
       ],
@@ -153,6 +156,9 @@
       "Cancel job invocation": [
         "Cancelar invocação de trabalho"
       ],
+      "Cancel recurring": [
+        ""
+      ],
       "Canceled:": [
         ""
       ],
@@ -210,9 +216,24 @@
       "Control concurrency level and distribution over time": [
         "Controlar nível de simultaneidade e distribuição ao longo do tempo"
       ],
+      "Could not abort the job %s: ${response}": [
+        ""
+      ],
+      "Could not cancel recurring logic %s: ${response}": [
+        ""
+      ],
+      "Could not cancel the job %s: ${response}": [
+        ""
+      ],
+      "Could not disable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not display data for job invocation.": [
         "Não foi possível exibir dados para a invocação de empregos."
       ],
+      "Could not enable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not find any suitable interface for execution": [
         "Não foi possível encontrar uma interface adequada para execução"
       ],
@@ -246,6 +267,9 @@
       "Create a recurring job": [
         "Criar um trabalho recorrente "
       ],
+      "Create report": [
+        ""
+      ],
       "Create report for this job": [
         "Criar relatório para este trabalho"
       ],
@@ -318,6 +342,9 @@
       "Designation of a special purpose": [
         "Designação de um propósito especial"
       ],
+      "Disable recurring": [
+        ""
+      ],
       "Display advanced fields": [
         "Exibir campos avançados"
       ],
@@ -375,6 +402,9 @@
       "Enable Global Proxy": [
         "Ativar o proxy global"
       ],
+      "Enable recurring": [
+        ""
+      ],
       "End time needs to be after start time": [
         "O tempo final precisa ser após a hora de início"
       ],
@@ -681,6 +711,9 @@
       "Learn more about this in the documentation.": [
         "Para saber mais sobre isto, acesse a documentação."
       ],
+      "Legacy UI": [
+        ""
+      ],
       "List available remote execution features for a host": [
         ""
       ],
@@ -912,6 +945,15 @@
       "Recurring logic": [
         "Lógica recorrente"
       ],
+      "Recurring logic %s cancelled successfully.": [
+        ""
+      ],
+      "Recurring logic %s disabled successfully.": [
+        ""
+      ],
+      "Recurring logic %s enabled successfully.": [
+        ""
+      ],
       "Recursive rendering of templates detected": [
         "Renderização recursiva de modelos detectada "
       ],
@@ -951,6 +993,9 @@
       "Rerun": [
         "Executar novamente"
       ],
+      "Rerun all": [
+        ""
+      ],
       "Rerun failed": [
         "Falha em nova execução "
       ],
@@ -963,6 +1008,9 @@
       "Rerun on failed hosts": [
         "Executar novamente em hosts com falha "
       ],
+      "Rerun successful": [
+        ""
+      ],
       "Rerun the job": [
         "Executar novamente o trabalho"
       ],
@@ -1358,9 +1406,15 @@
       "Trying to abort the job": [
         "Tentando anular o trabalho"
       ],
+      "Trying to abort the job %s.": [
+        ""
+      ],
       "Trying to cancel the job": [
         "Tentando cancelar o trabalho"
       ],
+      "Trying to cancel the job %s.": [
+        ""
+      ],
       "Type": [
         "Tipo"
       ],
@@ -1415,9 +1469,6 @@
       "Use new job wizard": [
         ""
       ],
-      "Use old form": [
-        ""
-      ],
       "User Inputs": [
         "Entradas de usuário"
       ],
@@ -1451,6 +1502,9 @@
       "View scheduled jobs": [
         "Ver empregos programados"
       ],
+      "View task": [
+        ""
+      ],
       "Web Console": [
         "Console web"
       ],

data/app/assets/javascripts/foreman_remote_execution/locale/ru/foreman_remote_execution.js

@@ -78,6 +78,9 @@
       "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.": [
         "Пользователь, от имени которого должен запускаться сценарий. Если отличается от пользователя SSH, для делегирования прав используется su или sudo."
       ],
+      "Abort": [
+        ""
+      ],
       "Abort Job": [
         ""
       ],
@@ -153,6 +156,9 @@
       "Cancel job invocation": [
         ""
       ],
+      "Cancel recurring": [
+        ""
+      ],
       "Canceled:": [
         ""
       ],
@@ -210,9 +216,24 @@
       "Control concurrency level and distribution over time": [
         "Контроль параллельного выполнения и распределения во времени"
       ],
+      "Could not abort the job %s: ${response}": [
+        ""
+      ],
+      "Could not cancel recurring logic %s: ${response}": [
+        ""
+      ],
+      "Could not cancel the job %s: ${response}": [
+        ""
+      ],
+      "Could not disable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not display data for job invocation.": [
         ""
       ],
+      "Could not enable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not find any suitable interface for execution": [
         ""
       ],
@@ -246,6 +267,9 @@
       "Create a recurring job": [
         "Периодическое выполнение"
       ],
+      "Create report": [
+        ""
+      ],
       "Create report for this job": [
         ""
       ],
@@ -318,6 +342,9 @@
       "Designation of a special purpose": [
         ""
       ],
+      "Disable recurring": [
+        ""
+      ],
       "Display advanced fields": [
         "Показать дополнительные параметры"
       ],
@@ -375,6 +402,9 @@
       "Enable Global Proxy": [
         ""
       ],
+      "Enable recurring": [
+        ""
+      ],
       "End time needs to be after start time": [
         ""
       ],
@@ -681,6 +711,9 @@
       "Learn more about this in the documentation.": [
         "Обратиться к документации"
       ],
+      "Legacy UI": [
+        ""
+      ],
       "List available remote execution features for a host": [
         ""
       ],
@@ -912,6 +945,15 @@
       "Recurring logic": [
         "Регулярное выполнение"
       ],
+      "Recurring logic %s cancelled successfully.": [
+        ""
+      ],
+      "Recurring logic %s disabled successfully.": [
+        ""
+      ],
+      "Recurring logic %s enabled successfully.": [
+        ""
+      ],
       "Recursive rendering of templates detected": [
         "Обнаружена рекурсия при обработке шаблонов"
       ],
@@ -951,6 +993,9 @@
       "Rerun": [
         "Повторить"
       ],
+      "Rerun all": [
+        ""
+      ],
       "Rerun failed": [
         "Повторить неудавшиеся"
       ],
@@ -963,6 +1008,9 @@
       "Rerun on failed hosts": [
         "Повторить на узлах с ошибками"
       ],
+      "Rerun successful": [
+        ""
+      ],
       "Rerun the job": [
         "Повторно выполнить задание"
       ],
@@ -1359,9 +1407,15 @@
       "Trying to abort the job": [
         ""
       ],
+      "Trying to abort the job %s.": [
+        ""
+      ],
       "Trying to cancel the job": [
         ""
       ],
+      "Trying to cancel the job %s.": [
+        ""
+      ],
       "Type": [
         "Тип"
       ],
@@ -1416,9 +1470,6 @@
       "Use new job wizard": [
         ""
       ],
-      "Use old form": [
-        ""
-      ],
       "User Inputs": [
         ""
       ],
@@ -1452,6 +1503,9 @@
       "View scheduled jobs": [
         ""
       ],
+      "View task": [
+        ""
+      ],
       "Web Console": [
         ""
       ],

data/app/assets/javascripts/foreman_remote_execution/locale/zh_CN/foreman_remote_execution.js

@@ -77,6 +77,9 @@
       "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.": [
         "要使用執行這 script 的使用者。如果使用者與 SSH 使用者不同，會用 su 或 sudo 來切換使用者。"
       ],
+      "Abort": [
+        ""
+      ],
       "Abort Job": [
         "终止作业"
       ],
@@ -152,6 +155,9 @@
       "Cancel job invocation": [
         "取消作业调用"
       ],
+      "Cancel recurring": [
+        ""
+      ],
       "Canceled:": [
         ""
       ],
@@ -209,9 +215,24 @@
       "Control concurrency level and distribution over time": [
         "控制并发级别和时间分布"
       ],
+      "Could not abort the job %s: ${response}": [
+        ""
+      ],
+      "Could not cancel recurring logic %s: ${response}": [
+        ""
+      ],
+      "Could not cancel the job %s: ${response}": [
+        ""
+      ],
+      "Could not disable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not display data for job invocation.": [
         "无法显示用于作业调用的数据。"
       ],
+      "Could not enable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not find any suitable interface for execution": [
         "无法找到适合执行的接口"
       ],
@@ -245,6 +266,9 @@
       "Create a recurring job": [
         "创建一个重复运行的作业"
       ],
+      "Create report": [
+        ""
+      ],
       "Create report for this job": [
         "为这个作业创建报告"
       ],
@@ -317,6 +341,9 @@
       "Designation of a special purpose": [
         "设计特殊目的"
       ],
+      "Disable recurring": [
+        ""
+      ],
       "Display advanced fields": [
         "显示高级字段"
       ],
@@ -374,6 +401,9 @@
       "Enable Global Proxy": [
         "启用全局代理服务器"
       ],
+      "Enable recurring": [
+        ""
+      ],
       "End time needs to be after start time": [
         "结束时间需要在开始时间后"
       ],
@@ -680,6 +710,9 @@
       "Learn more about this in the documentation.": [
         "如需了解更多信息，请参阅文档。"
       ],
+      "Legacy UI": [
+        ""
+      ],
       "List available remote execution features for a host": [
         ""
       ],
@@ -911,6 +944,15 @@
       "Recurring logic": [
         "重复逻辑"
       ],
+      "Recurring logic %s cancelled successfully.": [
+        ""
+      ],
+      "Recurring logic %s disabled successfully.": [
+        ""
+      ],
+      "Recurring logic %s enabled successfully.": [
+        ""
+      ],
       "Recursive rendering of templates detected": [
         "检测到递归的模板呈现"
       ],
@@ -950,6 +992,9 @@
       "Rerun": [
         "重新运行"
       ],
+      "Rerun all": [
+        ""
+      ],
       "Rerun failed": [
         "重新运行失败"
       ],
@@ -962,6 +1007,9 @@
       "Rerun on failed hosts": [
         "在失败的主机上重新运行"
       ],
+      "Rerun successful": [
+        ""
+      ],
       "Rerun the job": [
         "重新运行作业"
       ],
@@ -1355,9 +1403,15 @@
       "Trying to abort the job": [
         "尝试中止作业"
       ],
+      "Trying to abort the job %s.": [
+        ""
+      ],
       "Trying to cancel the job": [
         "尝试取消作业"
       ],
+      "Trying to cancel the job %s.": [
+        ""
+      ],
       "Type": [
         "类型"
       ],
@@ -1412,9 +1466,6 @@
       "Use new job wizard": [
         ""
       ],
-      "Use old form": [
-        ""
-      ],
       "User Inputs": [
         "用户输入"
       ],
@@ -1448,6 +1499,9 @@
       "View scheduled jobs": [
         "查看调度的作业"
       ],
+      "View task": [
+        ""
+      ],
       "Web Console": [
         "Web 控制台"
       ],

data/app/assets/javascripts/foreman_remote_execution/locale/zh_TW/foreman_remote_execution.js

@@ -78,6 +78,9 @@
       "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.": [
         "要使用執行這 script 的使用者。如果使用者與 SSH 使用者不同，會用 su 或 sudo 來切換使用者。"
       ],
+      "Abort": [
+        ""
+      ],
       "Abort Job": [
         ""
       ],
@@ -153,6 +156,9 @@
       "Cancel job invocation": [
         ""
       ],
+      "Cancel recurring": [
+        ""
+      ],
       "Canceled:": [
         ""
       ],
@@ -210,9 +216,24 @@
       "Control concurrency level and distribution over time": [
         "隨時間控制週期等級並散佈"
       ],
+      "Could not abort the job %s: ${response}": [
+        ""
+      ],
+      "Could not cancel recurring logic %s: ${response}": [
+        ""
+      ],
+      "Could not cancel the job %s: ${response}": [
+        ""
+      ],
+      "Could not disable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not display data for job invocation.": [
         ""
       ],
+      "Could not enable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not find any suitable interface for execution": [
         ""
       ],
@@ -246,6 +267,9 @@
       "Create a recurring job": [
         "建立週期性工作"
       ],
+      "Create report": [
+        ""
+      ],
       "Create report for this job": [
         ""
       ],
@@ -318,6 +342,9 @@
       "Designation of a special purpose": [
         ""
       ],
+      "Disable recurring": [
+        ""
+      ],
       "Display advanced fields": [
         "顯示進階欄位"
       ],
@@ -375,6 +402,9 @@
       "Enable Global Proxy": [
         ""
       ],
+      "Enable recurring": [
+        ""
+      ],
       "End time needs to be after start time": [
         ""
       ],
@@ -681,6 +711,9 @@
       "Learn more about this in the documentation.": [
         "欲知更多，請參閱文件。"
       ],
+      "Legacy UI": [
+        ""
+      ],
       "List available remote execution features for a host": [
         ""
       ],
@@ -912,6 +945,15 @@
       "Recurring logic": [
         "週期邏輯"
       ],
+      "Recurring logic %s cancelled successfully.": [
+        ""
+      ],
+      "Recurring logic %s disabled successfully.": [
+        ""
+      ],
+      "Recurring logic %s enabled successfully.": [
+        ""
+      ],
       "Recursive rendering of templates detected": [
         "偵測到遞迴處理範本"
       ],
@@ -951,6 +993,9 @@
       "Rerun": [
         "重新執行"
       ],
+      "Rerun all": [
+        ""
+      ],
       "Rerun failed": [
         "重新執行失敗"
       ],
@@ -963,6 +1008,9 @@
       "Rerun on failed hosts": [
         "在失敗的主機上重新執行"
       ],
+      "Rerun successful": [
+        ""
+      ],
       "Rerun the job": [
         "重新執行工作"
       ],
@@ -1357,9 +1405,15 @@
       "Trying to abort the job": [
         ""
       ],
+      "Trying to abort the job %s.": [
+        ""
+      ],
       "Trying to cancel the job": [
         ""
       ],
+      "Trying to cancel the job %s.": [
+        ""
+      ],
       "Type": [
         "類型"
       ],
@@ -1414,9 +1468,6 @@
       "Use new job wizard": [
         ""
       ],
-      "Use old form": [
-        ""
-      ],
       "User Inputs": [
         ""
       ],
@@ -1450,6 +1501,9 @@
       "View scheduled jobs": [
         ""
       ],
+      "View task": [
+        ""
+      ],
       "Web Console": [
         ""
       ],

data/app/lib/actions/remote_execution/proxy_action.rb

@@ -14,6 +14,14 @@ module Actions
 
       private
 
+      def check_task_status
+        response = proxy.status_of_task(proxy_task_id)
+        get_proxy_data(response)
+        suspend unless %w[stopped paused].include? response['state']
+      rescue RestClient::NotFound
+        on_proxy_action_missing
+      end
+
       def get_proxy_data(response)
         data = super
         process_proxy_data(data)

data/app/lib/actions/remote_execution/run_host_job.rb

@@ -49,7 +49,8 @@ module Actions
         provider_type = provider.proxy_feature
         proxy = determine_proxy!(proxy_selector, provider_type, host)
         link!(proxy)
-        input[:proxy_id] = proxy.id
+        template_invocation.smart_proxy_id = proxy.id
+        template_invocation.save!
 
         renderer = InputTemplateRenderer.new(template_invocation.template, host, template_invocation)
         script = renderer.render

data/app/lib/actions/remote_execution/run_hosts_job.rb

@@ -75,6 +75,7 @@ module Actions
       end
 
       def on_planning_finished
+        trigger_remote_batch
         plan_event(Actions::TriggerProxyBatch::TriggerLastBatch, nil, step_id: input[:trigger_run_step_id])
         super
       end

data/app/models/concerns/foreman_remote_execution/smart_proxy_extensions.rb

@@ -3,6 +3,7 @@ module ForemanRemoteExecution
     def self.prepended(base)
       base.instance_eval do
         has_many :host_proxy_invocations, :dependent => :destroy
+        has_many :template_invocations, :dependent => :nullify
       end
     end
 

data/app/models/template_invocation.rb

@@ -18,6 +18,7 @@ class TemplateInvocation < ApplicationRecord
   belongs_to :run_host_job_task, :class_name => 'ForemanTasks::Task'
   has_many :remote_execution_features, :through => :template
   has_many :template_invocation_events, :dependent => :destroy
+  belongs_to :smart_proxy, :class_name => '::SmartProxy', :inverse_of => :template_invocations
 
   validates_associated :input_values
   validate :provides_required_input_values

data/app/views/template_invocations/show.html.erb

@@ -28,10 +28,10 @@ end
   </div>
 </div>
 <% if @host %>
-  <% proxy_id = @template_invocation_task.input[:proxy_id] %>
+  <% proxy = @template_invocation.smart_proxy %>
   <h3>
     <%= _('Target: ') %><%= link_to(@host, current_host_details_path(@host)) %>
-    <% if proxy_id && proxy = SmartProxy.find_by(id: proxy_id) %>
+    <% if proxy %>
       <%= _('using Smart Proxy') %> <%= link_to(proxy.name, smart_proxy_path(proxy)) %>
     <% end %>
   </h3>

data/db/migrate/20240522093412_add_smart_proxy_id_to_template_invocation.rb

@@ -0,0 +1,7 @@
+class AddSmartProxyIdToTemplateInvocation < ActiveRecord::Migration[6.0]
+  def change
+    change_table :template_invocations do |t|
+      t.references :smart_proxy, foreign_key: true
+    end
+  end
+end

data/db/migrate/20240522093413_migrate_smart_proxy_ids_to_template_invocations.rb

@@ -0,0 +1,16 @@
+class MigrateSmartProxyIdsToTemplateInvocations < ActiveRecord::Migration[6.0]
+  def up
+    ForemanTasks::Link.joins(:task)
+                      .where(resource_type: 'SmartProxy', task: { label: 'Actions::RemoteExecution::RunHostJob' })
+                      .where.not(resource_id: nil)
+                      .find_in_batches do |batch|
+      batch.group_by(&:resource_id).each do |resource_id, links|
+        template_invocation_ids = ForemanTasks::Link.where(resource_type: 'TemplateInvocation', task_id: links.map(&:task_id)).select(:resource_id)
+        TemplateInvocation.where(id: template_invocation_ids).update_all(smart_proxy_id: resource_id)
+      end
+    end
+  end
+
+  def down
+  end
+end