foreman_remote_execution 14.0.0 → 14.1.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 9.0.1",
+        "Project-Id-Version": "foreman_remote_execution 14.0.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2016-02-15 13:54+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
-        "Language-Team": "Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)",
+        "Language-Team": "Chinese (Taiwan) (http://app.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/api/v2/job_invocations_controller.rb

@@ -3,10 +3,11 @@ module Api
     class JobInvocationsController < ::Api::V2::BaseController
       include ::Api::Version2
       include ::Foreman::Renderer
+      include RemoteExecutionHelper
 
       before_action :find_optional_nested_object, :only => %w{output raw_output}
       before_action :find_host, :only => %w{output raw_output}
-      before_action :find_resource, :only => %w{show update destroy clone cancel rerun outputs}
+      before_action :find_resource, :only => %w{show update destroy clone cancel rerun outputs hosts}
 
       wrap_parameters JobInvocation, :include => (JobInvocation.attribute_names + [:ssh])
 
@@ -20,14 +21,9 @@ module Api
       param :id, :identifier, :required => true
       param :host_status, :bool, required: false, desc: N_('Show Job status for the hosts')
       def show
-        @hosts = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
-        @template_invocations = @job_invocation.template_invocations
-                                               .where(host: @hosts)
-                                               .includes(:input_values)
-
+        set_hosts_and_template_invocations
         if params[:host_status] == 'true'
-          template_invocations = @template_invocations.includes(:run_host_job_task).to_a
-          @host_statuses = Hash[template_invocations.map { |ti| [ti.host_id, template_invocation_status(ti)] }]
+          set_statuses_and_smart_proxies
         end
       end
 
@@ -111,6 +107,19 @@ module Api
         render :json => host_output(@nested_obj, @host, :default => [], :since => params[:since])
       end
 
+      api :GET, '/job_invocations/:id/hosts', N_('List hosts belonging to job invocation')
+      param_group :search_and_pagination, ::Api::V2::BaseController
+      add_scoped_search_description_for(JobInvocation)
+      param :id, :identifier, :required => true
+      def hosts
+        set_hosts_and_template_invocations
+        set_statuses_and_smart_proxies
+        @total = @job_invocation.targeting.hosts.size
+        @hosts = @hosts.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page], :per_page => params[:per_page])
+        @subtotal = @hosts.respond_to?(:total_entries) ? @hosts.total_entries : @hosts.sizes
+        render :hosts, :layout => 'api/v2/layouts/index_layout'
+      end
+
       api :GET, '/job_invocations/:id/hosts/:host_id/raw', N_('Get raw output for a host')
       param :id, :identifier, :required => true
       param :host_id, :identifier, :required => true
@@ -187,7 +196,7 @@ module Api
 
       def action_permission
         case params[:action]
-        when 'output', 'raw_output', 'outputs'
+        when 'output', 'raw_output', 'outputs', 'hosts'
           :view
         when 'cancel'
           :cancel
@@ -256,15 +265,23 @@ module Api
         resource_class.where(nil)
       end
 
-      def template_invocation_status(template_invocation)
-        task = template_invocation.try(:run_host_job_task)
-        parent_task = @job_invocation.task
-
-        return(parent_task.result == 'cancelled' ? 'cancelled' : 'N/A') if task.nil?
-        return task.state if task.state == 'running' || task.state == 'planned'
-        return 'error' if task.result == 'warning'
+      def set_hosts_and_template_invocations
+        @hosts = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
+        @template_invocations = @job_invocation.template_invocations
+                                               .where(host: @hosts)
+                                               .includes(:input_values)
+      end
 
-        task.result
+      def set_statuses_and_smart_proxies
+        template_invocations = @template_invocations.includes(:run_host_job_task).to_a
+        hosts = @hosts.to_a
+        @host_statuses = Hash[hosts.map do |host|
+          template_invocation = template_invocations.find { |ti| ti.host_id == host.id }
+          task = template_invocation.try(:run_host_job_task)
+          [host.id, template_invocation_status(task, @job_invocation.task)]
+        end]
+        @smart_proxy_id = Hash[template_invocations.map { |ti| [ti.host_id, ti.smart_proxy_id] }]
+        @smart_proxy_name = Hash[template_invocations.map { |ti| [ti.host_id, ti.smart_proxy_name] }]
       end
     end
   end

data/app/helpers/job_invocations_helper.rb

@@ -33,7 +33,7 @@ module JobInvocationsHelper
   end
 
   def collapsed_preview(target)
-    title = target || 'N/A'
+    title = (target || 'N/A').to_s
     content_tag(:h5,
       :class => "expander collapsed out",
       :data => { :toggle => 'collapse',

data/app/helpers/remote_execution_helper.rb

@@ -18,9 +18,9 @@ module RemoteExecutionHelper
   end
 
   def template_invocation_status(task, parent_task)
-    return(parent_task.result == 'cancelled' ? _('cancelled') : _('Awaiting start')) if task.nil?
+    return(parent_task.result == 'cancelled' ? 'cancelled' : 'N/A') if task.nil?
     return task.state if task.state == 'running' || task.state == 'planned'
-    return _('error') if task.result == 'warning'
+    return 'error' if task.result == 'warning'
 
     task.result
   end

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

@@ -33,7 +33,7 @@ module Actions
           {
             # For N-1 compatibility, we assume that the output provided here is
             # complete
-            sequence_id: update['sequence_id'] || seq_id,
+            external_id: update['id'] || seq_id,
             template_invocation_id: template_invocation.id,
             event: update['output'],
             timestamp: Time.at(update['timestamp']).getlocal,
@@ -41,17 +41,22 @@ module Actions
           }
         end
         if data['exit_status']
-          last = events.last || {:sequence_id => -1, :timestamp => Time.zone.now}
+          last = events.last || {:timestamp => Time.zone.now}
+          exit_timestamp = if data['exit_status_timestamp']
+                             Time.at(data['exit_status_timestamp']).getlocal
+                           else
+                             last[:timestamp] + 1
+                           end
           events << {
-            sequence_id: last[:sequence_id] + 1,
+            external_id: 'exit',
             template_invocation_id: template_invocation.id,
             event: data['exit_status'],
-            timestamp: last[:timestamp],
+            timestamp: exit_timestamp,
             event_type: 'exit',
           }
         end
         events.each_slice(1000) do |batch|
-          TemplateInvocationEvent.insert_all(batch, unique_by: [:template_invocation_id, :sequence_id]) # rubocop:disable Rails/SkipsModelValidations
+          TemplateInvocationEvent.insert_all(batch, unique_by: [:template_invocation_id, :external_id]) # rubocop:disable Rails/SkipsModelValidations
         end
       end
     end

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

@@ -160,7 +160,7 @@ module Actions
           # This is enough, the error will get shown using add_exception at the end of the method
         end
 
-        task.template_invocation.template_invocation_events.order(:sequence_id).find_each do |output|
+        task.template_invocation.template_invocation_events.order(:timestamp).find_each do |output|
           if output.event_type == 'exit'
             continuous_output.add_output(_('Exit status: %s') % output.event, 'stdout', output.timestamp)
           else

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

@@ -6,13 +6,12 @@ module Actions
       end
 
       def log_template_invocation_exception(exception)
-        last = template_invocation.template_invocation_events.order(:sequence_id).last
-        id = last ? last.sequence_id + 1 : 0
+        id = 'exception-' + SecureRandom.hex(4)
         template_invocation.template_invocation_events.create!(
           :event_type => 'debug',
           :event => "#{exception.class}: #{exception.message}",
           :timestamp => Time.zone.now,
-          :sequence_id => id
+          :external_id => id
         )
       end
 

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

@@ -7,8 +7,8 @@ module ForemanRemoteExecution
     def flattened_errors
       errors = Hash.new { |h, k| h[k] = [] }
       # self.errors is ActiveModel::Errors, not Hash and doesn't have the #each_key method
-      self.errors.keys.each do |key|
-        messages = self.errors[key]
+      self.errors.attribute_names.each do |key|
+        messages = self.errors.messages_for(key)
         invalid_objects = invalid_objects_for_attribute(key)
         if invalid_objects.blank?
           errors[key] = messages

data/app/views/api/v2/job_invocations/hosts.json.rabl

@@ -0,0 +1,15 @@
+collection @hosts
+
+attribute :name, :operatingsystem_id, :operatingsystem_name, :hostgroup_id, :hostgroup_name
+
+node :job_status do |host|
+  @host_statuses[host.id]
+end
+
+node :smart_proxy_id do |host|
+  @smart_proxy_id[host.id]
+end
+
+node :smart_proxy_name do |host|
+  @smart_proxy_name[host.id]
+end

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

@@ -55,7 +55,7 @@ end
   </div>
 
   <script>
-    <%= render :partial => 'refresh.js' %>
+    <%= render partial: 'refresh', formats: :js %>
   </script>
 <% else %>
   <%= _("Could not display data for job invocation.") %>

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

@@ -148,7 +148,7 @@ handle_zypp_res_codes () {
     end
   -%>
   zypper refresh
-  zypper -n <%= action %> <%= input("options") %> <%= input("package") %>
+  zypper -n --gpg-auto-import-keys <%= action %> <%= input("options") %> <%= input("package") %>
   handle_zypp_res_codes $? "<%= action %>"
 <% end -%>
 RETVAL=$?

data/config/routes.rb

@@ -63,6 +63,7 @@ Rails.application.routes.draw do
           get '/raw', :to => 'job_invocations#raw_output'
         end
         member do
+          get 'hosts'
           post 'cancel'
           post 'rerun'
           get  'template_invocations', :to => 'template_invocations#template_invocations'

data/db/migrate/20240312133027_extend_template_invocation_events.rb

@@ -0,0 +1,19 @@
+class ExtendTemplateInvocationEvents < ActiveRecord::Migration[6.1]
+  def up
+    change_table :template_invocation_events do |t|
+      t.string :external_id
+    end
+
+    TemplateInvocationEvent.update_all("external_id = CASE WHEN event_type = 'exit' THEN 'exit' ELSE sequence_id::varchar END")
+
+    remove_index :template_invocation_events, name: :unique_template_invocation_events_index
+    remove_column :template_invocation_events, :sequence_id
+
+    change_table :template_invocation_events do |t|
+      t.index [:template_invocation_id, :external_id],
+        unique: true,
+        name: 'unique_template_invocation_events_index'
+      t.change :external_id, :string, null: false
+    end
+  end
+end

data/db/migrate/20240522093413_migrate_smart_proxy_ids_to_template_invocations.rb

@@ -1,10 +1,13 @@
 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

data/lib/foreman_remote_execution/engine.rb

@@ -4,10 +4,6 @@ module ForemanRemoteExecution
   class Engine < ::Rails::Engine
     engine_name 'foreman_remote_execution'
 
-    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-
     # Precompile any JS or CSS files under app/assets/
     # If requiring files from each other, list them explicitly here to avoid precompiling the same
     # content twice.

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '14.0.0'.freeze
+  VERSION = '14.1.0'.freeze
 end

data/locale/Makefile

@@ -31,9 +31,16 @@ all-mo: $(MOFILES)
 	cat $@
 	! grep -q msgid $@
 
-%.edit.po:
+%.edit.po: %.po.time_stamp
 	touch $@
 
+# gettext will trash the .edit.po file if the time stamp doesn't exist or is older than the po file
+%.po.time_stamp: %.po
+	touch --reference $< $@
+
+# Prevent make from treating this as an intermediate file to be cleaned up
+.PRECIOUS: %.po.time_stamp
+
 check: $(POXFILES)
 
 # Unify duplicate translations
@@ -43,7 +50,10 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	cd .. && tx pull -f --all
+	# Initialize new languages
+	cd .. && tx pull -f --all --minimum-perc 50
+	# Force update all existing languages
+	cd .. && tx pull -f --minimum-perc 0
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done