foreman_remote_execution 13.2.8 → 14.0.0

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

@@ -3,11 +3,11 @@
   "locale_data": {
     "foreman_remote_execution": {
       "": {
-        "Project-Id-Version": "foreman_remote_execution 14.0.0",
+        "Project-Id-Version": "foreman_remote_execution 9.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-02-15 13:54+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
-        "Language-Team": "Chinese (Taiwan) (http://app.transifex.com/foreman/foreman/language/zh_TW/)",
+        "Language-Team": "Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
         "Content-Transfer-Encoding": "8bit",
@@ -85,7 +85,7 @@
         ""
       ],
       "Access denied": [
-        "拒絕存取"
+        ""
       ],
       "Actions": [
         "動作"
@@ -136,7 +136,7 @@
         ""
       ],
       "Back": [
-        "上一步"
+        ""
       ],
       "Back to Job": [
         "回到工作"
@@ -775,7 +775,7 @@
         ""
       ],
       "Next": [
-        "下一步"
+        ""
       ],
       "No (override)": [
         ""
@@ -1553,7 +1553,7 @@
         "您不能看到目前指定的範本。現在儲存表單會取消指定範本。"
       ],
       "You are not authorized to perform this action.": [
-        "您未經許可執行這項動作。"
+        ""
       ],
       "You have %s results to display. Showing first %s results": [
         ""

data/app/controllers/ui_job_wizard_controller.rb

@@ -1,4 +1,4 @@
-class UiJobWizardController < Api::V2::BaseController
+class UIJobWizardController < Api::V2::BaseController
   include FiltersHelper
   def categories
     job_categories = resource_scope(permission: action_permission)

data/app/lib/foreman_remote_execution/renderer_methods.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# macros to fetch information about invoked jobs
+module ForemanRemoteExecution
+  module RendererMethods
+    extend ActiveSupport::Concern
+
+    def find_job_invocation_by_id(job_id, preload: nil)
+      JobInvocation.preload(preload).find_by(id: job_id)
+    rescue ActiveRecord::NotFound => _e
+      raise ::Foreman::Exception.new(N_("Can't find Job Invocation for an id %s"), job_id)
+    end
+  end
+end

data/app/views/templates/script/convert2rhel_analyze.erb

@@ -5,20 +5,7 @@ model: JobTemplate
 job_category: Convert 2 RHEL
 provider_type: script
 kind: job_template
-template_inputs:
-- name: ELS
-  required: false
-  input_type: user
-  description: Use an Extended Lifecycle Support (ELS) add-on subscription
-  advanced: false
-  value_type: plain
-  options: "yes\r\nno"
-  default: "no"
-  hidden_value: false
 %>
-<%-
-  els = input('ELS') == "yes" ? "--els" : ""
--%>
 <% if @host.operatingsystem.family == 'Redhat' -%>
 if ! [ $(id -u) -eq 0 ]; then
   echo "You must run convert2rhel as a root user."
@@ -31,7 +18,7 @@ fi
 
 export CONVERT2RHEL_THROUGH_FOREMAN=1
 
-/usr/bin/convert2rhel analyze -y <%= els %>
+/usr/bin/convert2rhel analyze -y
 
 # Workaround for https://issues.redhat.com/browse/RHELC-1280
 subscription-manager facts --update

data/config/initializers/inflections.rb

@@ -0,0 +1,6 @@
+Rails.autoloaders.each do |autoloader|
+  autoloader.inflector.inflect(
+    'ssh_execution_provider' => 'SSHExecutionProvider',
+    'remote_execution_ssh' => 'RemoteExecutionSSH'
+  )
+end

data/db/migrate/20240522093413_migrate_smart_proxy_ids_to_template_invocations.rb

@@ -1,13 +1,10 @@
 class MigrateSmartProxyIdsToTemplateInvocations < ActiveRecord::Migration[6.0]
   def up
-    proxy_lookup_cache = {}
     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|
-        proxy_lookup_cache[resource_id] = SmartProxy.where(id: resource_id).exists? unless proxy_lookup_cache.key?(resource_id)
-        next unless proxy_lookup_cache[resource_id]
         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