foreman_remote_execution 13.2.1 → 13.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 473900c99e054678a879651060b7596221f32c7f2713d28efb472957b7ac73ed
-  data.tar.gz: 14e55ba559f96def212e56aad5087b3e171fceb0cae2209b2ba1ef0566bda620
+  metadata.gz: 96681556d3f5a6992e71260803846de43b28006b4c6632dc8def7772ae8c42b5
+  data.tar.gz: 13fffbea7ed8fa8a9556db7ce1c251ab4a879de339f85a5fb4e0f83977a12bfc
 SHA512:
-  metadata.gz: 715de4ec99b4f17450ec02cca4db12e7778001098f49c1a733fae18c84d72855dd59e8dc86c1a6edddd72856a26c345c1397b2e2c1a66f14b0e605497f59e747
-  data.tar.gz: 7dd731683f6f68d5c9f32c14b9411cbde8a65e0de38de249f691cd70447b2ff936bac8f7413b4edad8bb776ae0612ccbcb487650a20a16c35e37fc2ded3b4af2
+  metadata.gz: e2f596ae2c2dd3ed2483ee32f78104b26fe39e6e4faa60ba50dfefac947346bd639bad3714a5c89e9df47f0a81389ca59c7c05c7915432985bf1ab03ec53e71a
+  data.tar.gz: c81d5218ffceb943120ed6c141bad17d7ed87e8feaff517b984fde44684ffffe72598f2adc7f350e187139f8e68c521d8c296a53ec9a88baf2f2987176b2d857

data/.gitignore

@@ -15,3 +15,4 @@ Gemfile.lock
 node_modules/
 package-lock.json
 coverage/
+public/

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

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '13.2.1'.freeze
+  VERSION = '13.2.2'.freeze
 end

data/webpack/JobWizard/steps/HostsAndInputs/__tests__/HostsAndInputs.test.js

@@ -61,14 +61,20 @@ describe('Hosts', () => {
     await act(async () => {
       fireEvent.click(screen.getByText('Host groups'));
     });
-    fireEvent.click(select('host groups'));
+    await act(async () => {
+      fireEvent.click(select('host groups'));
+    });
     await act(async () => {
       fireEvent.click(screen.getByText('host_group1'));
     });
 
-    fireEvent.click(
-      screen.getByText('Host groups', { selector: '.pf-c-select__toggle-text' })
-    );
+    await act(async () => {
+      fireEvent.click(
+        screen.getByText('Host groups', {
+          selector: '.pf-c-select__toggle-text',
+        })
+      );
+    });
     await act(async () => {
       fireEvent.click(screen.getByText('Host collections'));
     });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 13.2.1
+  version: 13.2.2
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -350,6 +350,8 @@ files:
 - db/migrate/20220822155946_add_time_to_pickup_to_job_invocation.rb
 - db/migrate/20221129170145_redefine_template_invocation_events_index.rb
 - db/migrate/20230816154510_drop_time_span_from_job_invocations.rb
+- db/migrate/20240522093412_add_smart_proxy_id_to_template_invocation.rb
+- db/migrate/20240522093413_migrate_smart_proxy_ids_to_template_invocations.rb
 - db/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb