foreman_remote_execution 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd91f2539393453fe888022502baba8ad7597da50682a4d87a8cf78dcaaebbfa
-  data.tar.gz: 2c97670fa1b3555f9660ea8adee03e48ae83779aff3324d977eae65a70b86956
+  metadata.gz: 831ec5aca2ec4aaa3df1229f7addd9a968c7c49b0fc49a15253e33d2ab0f5689
+  data.tar.gz: 07a4f17f0d4d694c4b927291ee8e55dafd839cf902a9ef06c79b227fdf65760f
 SHA512:
-  metadata.gz: 7fbc26b3be07128f7dd015db03b8e46d34faee8f13f8b7e7f3d6ff54f360afd70cdd6f4143862695342591be55cfed9a74f315ae77ef5231cd20bee5f9bf8565
-  data.tar.gz: 851d5fd53efb928e8a6ce15468af83bc992b98265bc289f23fed310834e1c83753113e981a673f89e3183efaa7d6f76ec270f06f1f41072f79c045947a78b6c8
+  metadata.gz: 75fd11cfe45b5223a2427561c0859c39f19923535283fa919927af9b4ffd67ea56a4c9b791632e73c72c4dff1946f2e1046cb10a1f84ed7dae0e686daff2d90d
+  data.tar.gz: 03557c309e25a902c0def6e7575ad74a02e724482da823b4580f4bbe9b80358eadb2e0781b832f45a2e9101196447edf887476fa79782a3d6ee125640dccd92a

data/Gemfile

@@ -2,4 +2,4 @@ source 'http://rubygems.org'
 
 gemspec :name => 'foreman_remote_execution'
 
-gem 'theforeman-rubocop', '~> 0.1.0.pre'
+gem 'theforeman-rubocop', '~> 0.1.1'

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

@@ -42,6 +42,8 @@ module Actions
 
         provider_type = template_invocation.template.provider_type.to_s
         proxy = determine_proxy!(proxy_selector, provider_type, host)
+        link!(proxy)
+        input[:proxy_id] = proxy.id
 
         renderer = InputTemplateRenderer.new(template_invocation.template, host, template_invocation)
         script = renderer.render

data/app/lib/foreman_remote_execution/renderer/scope/input.rb

@@ -98,7 +98,7 @@ module ForemanRemoteExecution
         def input(name)
           return template_input_values[name.to_s] if template_input_values.key?(name.to_s)
 
-          input = find_by_name(template.template_inputs_with_foreign, name) # rubocop:disable Rails/DynamicFindBy
+          input = find_by_name(template.template_inputs_with_foreign, name)
           if input
             @preview ? input.preview(self) : input.value(self)
           else

data/app/models/job_invocation.rb

@@ -15,8 +15,10 @@ class JobInvocation < ApplicationRecord
 
   belongs_to :targeting, :dependent => :destroy
   has_many :all_template_invocations, :inverse_of => :job_invocation, :dependent => :destroy, :class_name => 'TemplateInvocation'
+  # rubocop:disable Rails/HasManyOrHasOneDependent
   has_many :template_invocations, -> { where('template_invocations.host_id IS NOT NULL') }, :inverse_of => :job_invocation
   has_many :pattern_template_invocations, -> { where('template_invocations.host_id IS NULL') }, :inverse_of => :job_invocation, :class_name => 'TemplateInvocation'
+  # rubocop:enable Rails/HasManyOrHasOneDependent
   has_many :pattern_templates, :through => :pattern_template_invocations, :source => :template
 
   validates :targeting, :presence => true

data/app/models/job_template.rb

@@ -17,8 +17,10 @@ class JobTemplate < ::Template
 
   has_many :audits, :as => :auditable, :class_name => Audited.audit_class.name, :dependent => :nullify
   has_many :all_template_invocations, :dependent => :destroy, :foreign_key => 'template_id', :class_name => 'TemplateInvocation'
+  # rubocop:disable Rails/HasManyOrHasOneDependent
   has_many :template_invocations, -> { where('host_id IS NOT NULL') }, :foreign_key => 'template_id'
   has_many :pattern_template_invocations, -> { where('host_id IS NULL') }, :foreign_key => 'template_id', :class_name => 'TemplateInvocation'
+  # rubocop:enable Rails/HasManyOrHasOneDependent
   has_many :remote_execution_features, :dependent => :nullify
 
   # these can't be shared in parent class, scoped search can't handle STI properly
@@ -192,7 +194,7 @@ class JobTemplate < ::Template
   end
 
   def default_input_values(ignore_keys)
-    result = self.template_inputs_with_foreign.select { |ti| !ti.required? && ti.user_template_input? }.map { |ti| ti.name.to_s }
+    result = self.template_inputs_with_foreign.select { |ti| !ti.required? && ti.input_type == 'user' }.map { |ti| ti.name.to_s }
     result -= ignore_keys.map(&:to_s)
     Hash[result.map { |k| [ k, nil ] }]
   end

data/app/views/job_templates/_custom_tabs.html.erb

@@ -1,14 +1,9 @@
 <div class="tab-pane" id="template_job">
 
-  <%= field(f, :job_category, :label => _('Job category')) do %>
-    <%= auto_complete_search(:job_category,
-                             f.object.job_category,
-                             :placeholder => _("Job category") + ' ...',
-                             :name => 'job_template[job_category]',
-                             :id => 'search',
-                             :disabled => @template.locked?) %>
-  <% end %>
-
+  <%= autocomplete_f(f, :job_category,
+        :search_query => '',
+        :placeholder => _("Job category") + ' ...',
+        :disabled => @template.locked?) %>
   <%= text_f f, :description_format,
              :disabled => @template.locked?,
              :label_help => description_format_help %>

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

@@ -28,7 +28,13 @@ end
   </div>
 </div>
 <% if @host %>
-  <h3><%= _('Target: ') %><%= link_to(@host.name, host_path(@host)) %></h3>
+  <% proxy_id = @template_invocation_task.input[:proxy_id] %>
+  <h3>
+    <%= _('Target: ') %><%= link_to(@host.name, host_path(@host)) %>
+    <% if proxy_id && proxy = SmartProxy.find_by(id: proxy_id) %>
+      <%= _('using Smart Proxy') %> <%= link_to(proxy.name, smart_proxy_path(proxy)) %>
+    <% end %>
+  </h3>
 
   <div class="preview hidden">
     <%= preview_box(@template_invocation, @host) %>

data/lib/foreman_remote_execution/engine.rb

@@ -152,7 +152,7 @@ module ForemanRemoteExecution
             setting 'remote_execution_job_invocation_report_template',
               type: :string,
               description: N_('Select a report template used for generating a report for a particular remote execution job'),
-              default: 'Jobs - Invocation report template',
+              default: 'Job invocation - report template',
               full_name: N_('Job Invocation Report Template'),
               collection: proc { ForemanRemoteExecution.job_invocation_report_templates_select }
           end

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '5.0.1'.freeze
+  VERSION = '5.1.0'.freeze
 end

data/test/unit/job_invocation_report_template_test.rb

@@ -9,7 +9,7 @@ class JobReportTemplateTest < ActiveSupport::TestCase
 
   context 'with valid job invocation report template' do
     let(:job_invocation_template) do
-      file_path = File.read(File.expand_path(Rails.root + "app/views/unattended/report_templates/jobs_-_invocation_report_template.erb"))
+      file_path = File.read(File.expand_path(Rails.root + "app/views/unattended/report_templates/job_invocation_-_report_template.erb"))
       template = ReportTemplate.import_without_save("Job Invocation Report Template", file_path)
       template.save!
       template

data/test/unit/targeting_test.rb

@@ -61,7 +61,7 @@ class TargetingTest < ActiveSupport::TestCase
       users(:one).destroy
     end
 
-    it { assert targeting.reload.user.nil? }
+    it { assert_nil targeting.reload.user }
     it do
       -> { targeting.resolve_hosts! }.must_raise(Foreman::Exception)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface