foreman_remote_execution 3.3.2 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d093d837d0009e477549fba4700f3e0090045ba23f8b2c50fb05439fee53e403
-  data.tar.gz: 54dffc56caa3fa1bb72bb159b152d267d2e348b64b57322ea74cdf0ad9289cc1
+  metadata.gz: 7c5854e373426c0a630f0a643f88522425c6482fb88fee1888fc6f61114217c3
+  data.tar.gz: f333b2504dc7db6e1119d418c89fcd2cd35d5dcbd72e97d393b57a16c9d305a6
 SHA512:
-  metadata.gz: e3524503031c73f86a0f3ed0b6c8dd39499f85df47052eca941f455552665b93ff041e5d6df9870cfb95ac1219017a561a483556306905bdc005caf252a5e088
-  data.tar.gz: 537da427406ce7c794d5e589e7e82f8c6fbda33a3a4231129905b69171421f41e98563c0496d9c7cc748f675d200729ec52f4d9067a8f7879972922358a2a868
+  metadata.gz: 3df47233fbc5b7bb2628a2bb49906c284e8e7c821bb8a026659e0473f9bc8760d5ed3c19f27183f5fd32ab39d5b06cdb0e9345a1e9e4a4629a269adb3121370a
+  data.tar.gz: 33d40d8f6449814f23648dbe20c6a376a152135b4a4c5de583a73e1db03ab69ecb39b1a2ce3a1cabad717be898a683f3d58fe5e1aaf50438011f6ce4cfbbe2b4

data/.github/workflows/ci.yml

@@ -34,6 +34,7 @@ jobs:
         ruby-version: [2.5, 2.6]
         node-version: [12]
     steps:
+      - run: sudo apt-get update
       - run: sudo apt-get install build-essential libcurl4-openssl-dev zlib1g-dev libpq-dev
       - uses: actions/checkout@v2
         with:

data/app/assets/stylesheets/foreman_remote_execution/job_invocations.scss

@@ -1,9 +1,6 @@
-div.infoblock {
-  margin-bottom: 20px;
-  line-height: 2;
-
+.target-hosts-card {
   pre {
-    margin-top: 5px;
+    white-space:pre-line;
   }
 }
 
@@ -29,3 +26,7 @@ div.infoblock {
     }
   }
 }
+
+.text_warp{
+  word-wrap: break-word;
+}

data/app/controllers/api/v2/job_invocations_controller.rb

@@ -18,14 +18,14 @@ module Api
 
       api :GET, '/job_invocations/:id', N_('Show job invocation')
       param :id, :identifier, :required => true
-      param :host_status, String, required: false, allow_blank: true, desc: N_('Show Job status for the hosts.')
+      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)
 
-        if params[:host_status]
+        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)] }]
         end
@@ -80,6 +80,7 @@ module Api
         end
         composer.trigger!
         @job_invocation = composer.job_invocation
+        @hosts = @job_invocation.targeting.hosts
         process_response @job_invocation
       end
 

data/app/models/concerns/foreman_remote_execution/orchestration/ssh.rb

@@ -15,9 +15,13 @@ module ForemanRemoteExecution
       proxy = ::SmartProxy.find(proxy_id)
       begin
         proxy.drop_host_from_known_hosts(target)
-      rescue RestClient::ResourceNotFound => e
-        # ignore 404 when known_hosts entry is missing or the module was not enabled
-        Foreman::Logging.exception "Proxy failed to delete SSH known_hosts for #{name}, #{ip}", e, :level => :error
+      rescue ::ProxyAPI::ProxyException => e
+        if e.wrapped_exception.is_a?(RestClient::NotFound)
+          # ignore 404 when known_hosts entry is missing or the module was not enabled
+          Foreman::Logging.exception "Proxy failed to delete SSH known_hosts for #{name}, #{ip}", e, :level => :error
+        else
+          raise e
+        end
       rescue => e
         Rails.logger.warn e.message
         return false
@@ -29,7 +33,10 @@ module ForemanRemoteExecution
       logger.debug "Scheduling SSH known_hosts cleanup"
 
       host, _kind, _target = host_kind_target
-      proxies = host.remote_execution_proxies('SSH').values
+      # #remote_execution_proxies may not be defined on the host object in some case
+      # for example Host::Discovered does not have it defined, even though these hosts
+      # have Nic::Managed interfaces associated with them
+      proxies = (host.try(:remote_execution_proxies, 'SSH') || {}).values
       proxies.flatten.uniq.each do |proxy|
         queue.create(id: queue_id(proxy.id), name: _("Remove SSH known hosts for %s") % self,
           priority: 200, action: [self, :drop_from_known_hosts, proxy.id])

data/app/services/default_proxy_proxy_selector.rb

@@ -10,7 +10,9 @@ class DefaultProxyProxySelector < ::RemoteExecutionProxySelector
   def available_proxies(host, provider)
     # TODO: Once we have a internal proxy marker/feature on the proxy, we can
     # swap the implementation
-    internal_proxy = ::Katello.default_capsule
+    raise _('default_capsule method missing from SmartProxy') unless ::SmartProxy.respond_to?(:default_capsule)
+
+    internal_proxy = ::SmartProxy.default_capsule
     super.reduce({}) do |acc, (key, proxies)|
       acc.merge(key => proxies.select { |proxy| proxy == internal_proxy })
     end

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

@@ -19,10 +19,10 @@ child :targeting do
   attributes :bookmark_id, :search_query, :targeting_type, :user_id, :status, :status_label,
     :randomized_ordering
 
-  child @hosts do
+  child @hosts => :hosts do
     extends 'api/v2/hosts/base'
 
-    if params[:host_status]
+    if params[:host_status] == 'true'
       node :job_status do |host|
         @host_statuses[host.id]
       end

data/app/views/job_invocations/_card_target_hosts.html.erb

@@ -1,5 +1,5 @@
 <% template_invocations = job_invocation.pattern_template_invocations %>
-<div class="card-pf card-pf-accented">
+<div class="card-pf card-pf-accented target-hosts-card">
   <div class="card-pf-title">
     <h2 style="height: 18px;" class="card-pf-title">
       <%= _('Target hosts') %>

data/app/views/job_invocations/index.html.erb

@@ -1,3 +1,4 @@
+<% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
 <% title _('Job invocations') %>
 
 <% title_actions(job_invocations_buttons) %>
@@ -19,7 +20,7 @@
   <tbody>
     <% @job_invocations.each do |invocation| %>
       <tr>
-        <td><%= link_to_if_authorized invocation_description(invocation), hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocations, :authorizer => authorizer) %></td>
+        <td class="text_warp"><%= link_to_if_authorized invocation_description(invocation), hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocations, :authorizer => authorizer) %></td>
         <td><%= trunc_with_tooltip(invocation&.targeting&.search_query, 15) %></td>
         <td><%= link_to_invocation_task_if_authorized(invocation) %></td>
         <td><%= invocation_result(invocation, :success_count) %></td>

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

@@ -41,3 +41,9 @@
   <% end %>
   <%= render_tab_content_for(:main_tabs, subject: @job_invocation) %>
 </div>
+
+<script id="job_invocation_refresh" data-refresh-url="<%= job_invocation_path(@job_invocation) %>">
+  <% if @auto_refresh %>
+    delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), {});
+  <% end %>
+</script>

data/app/views/job_invocations/show.js.erb

@@ -0,0 +1,5 @@
+$('div#title_action div.btn-group').html('<%= button_group(job_invocation_task_buttons(@job_invocation.task)).html_safe %>');
+
+<% if @auto_refresh %>
+  delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), job_invocation_refresh_data());
+<% end %>

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

@@ -97,6 +97,7 @@ handle_zypp_res_codes () {
       end
     end
   -%>
+  [ -x "$(command -v subscription-manager)" ] && subscription-manager refresh
   apt-get -y update
   apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y <%= action %> <%= input("package") %>
 <% elsif package_manager == 'zypper' -%>

data/app/views/templates/ssh/puppet_agent_disable.erb

@@ -13,4 +13,7 @@ template_inputs:
 provider_type: SSH
 kind: job_template
 -%>
+<% if @host.operatingsystem.family == 'Debian' -%>
+export PATH=/opt/puppetlabs/bin:$PATH
+<% end -%>
 puppet agent --disable "<%= input("comment").present? ? input("comment") : "Disabled using Foreman Remote Execution"  %> - <%= current_user %> - $(date "+%d/%m/%Y %H:%M")"

data/app/views/templates/ssh/puppet_agent_enable.erb

@@ -7,4 +7,7 @@ snippet: false
 provider_type: SSH
 kind: job_template
 -%>
+<% if @host.operatingsystem.family == 'Debian' -%>
+export PATH=/opt/puppetlabs/bin:$PATH
+<% end -%>
 puppet agent --enable

data/app/views/templates/ssh/puppet_install_modules_from_forge.erb

@@ -33,4 +33,7 @@ template_inputs:
 provider_type: SSH
 kind: job_template
 -%>
+<% if @host.operatingsystem.family == 'Debian' -%>
+export PATH=/opt/puppetlabs/bin:$PATH
+<% end -%>
 puppet module install <%= input('puppet_module') %> <%= "--target-dir #{input('target_dir')}" if input('target_dir').present? %> <%= "--version #{input('version')}" if input('version').present? %> <%= "--force" if input('force') == "true" %> <%= "--ignore-dependencies" if input('ignore_dependencies') == "true" %>

data/app/views/templates/ssh/puppet_run_once.erb

@@ -11,4 +11,7 @@ template_inputs:
   input_type: user
   required: false
 %>
+<% if @host.operatingsystem.family == 'Debian' -%>
+export PATH=/opt/puppetlabs/bin:$PATH
+<% end -%>
 puppet agent --onetime --no-usecacheonfailure --no-daemonize <%= input("puppet_options") %>

data/lib/foreman_remote_execution/engine.rb

@@ -32,6 +32,15 @@ module ForemanRemoteExecution
       end
     end
 
+    # A workaround for https://projects.theforeman.org/issues/30685
+    initializer 'foreman_remote_execution.rails_loading_workaround' do
+      # Without this, in production environment the module gets prepended too
+      # late and the extensions do not get applied
+      # TODO: Remove this and from config.to_prepare once there is an extension
+      # point in Foreman
+      ProvisioningTemplatesHelper.prepend ForemanRemoteExecution::JobTemplatesExtensions
+    end
+
     initializer 'foreman_remote_execution.apipie' do
       Apipie.configuration.checksum_path += ['/api/']
     end

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '3.3.2'.freeze
+  VERSION = '3.3.7'.freeze
 end

data/test/functional/api/v2/job_invocations_controller_test.rb

@@ -44,7 +44,7 @@ module Api
           get :show, params: { :id => @invocation.id }, session: set_session_user(@user)
           assert_response :success
           response = ActiveSupport::JSON.decode(@response.body)
-          assert_empty response['targeting']['hosts']
+          assert_equal response['targeting']['hosts'], []
         end
       end
 

data/test/models/orchestration/ssh_test.rb

@@ -30,7 +30,7 @@ class SSHOrchestrationTest < ActiveSupport::TestCase
 
   it 'does not fail on 404 from the smart proxy' do
     host.stubs(:skip_orchestration?).returns false
-    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).raises(RestClient::ResourceNotFound).twice
+    ::ProxyAPI::RemoteExecutionSSH.any_instance.expects(:delete).raises(RestClient::ResourceNotFound).twice
     host.build = true
     host.save!
     ids = ["ssh_remove_known_hosts_interface_#{interface.ip}_#{proxy.id}",

data/webpack/react_app/components/TargetingHosts/TargetingHosts.js

@@ -17,7 +17,7 @@ const TargetingHosts = ({ status, items }) => {
   }
 
   return (
-    <LoadingState loading={!items.length}>
+    <LoadingState loading={!items.length && status === STATUS.PENDING}>
       <div>
         <table className="table table-bordered table-striped table-hover">
           <thead>

data/webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/TargetingHosts.test.js.snap

@@ -52,7 +52,7 @@ exports[`TargetingHosts renders with error 1`] = `
 exports[`TargetingHosts renders with loading 1`] = `
 <LoadingState
   additionalClasses=""
-  loading={true}
+  loading={false}
   loadingText="Loading"
   size="lg"
   timeout={300}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.7
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -249,6 +249,7 @@ files:
 - app/views/job_invocations/new.html.erb
 - app/views/job_invocations/refresh.js.erb
 - app/views/job_invocations/show.html.erb
+- app/views/job_invocations/show.js.erb
 - app/views/job_invocations/show.json.erb
 - app/views/job_invocations/welcome.html.erb
 - app/views/job_templates/_custom_tab_headers.html.erb