foreman_remote_execution 3.1.0 → 3.3.2

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

@@ -12,6 +12,10 @@ module ForemanRemoteExecution
       key
     end
 
+    def drop_host_from_known_hosts(host)
+      ::ProxyAPI::RemoteExecutionSSH.new(:url => url).drop_from_known_hosts(host)
+    end
+
     def refresh
       errors = super
       update_pubkey

data/app/models/host_status/execution_status.rb

@@ -7,8 +7,10 @@ class HostStatus::ExecutionStatus < HostStatus::Status
   QUEUED = 2
   # execution is in progress, dynflow task was created
   RUNNING = 3
+  # execution has been cancelled
+  CANCELLED = 4
   # mapping to string representation
-  STATUS_NAMES = { OK => 'succeeded', ERROR => 'failed', QUEUED => 'queued', RUNNING => 'running' }.freeze
+  STATUS_NAMES = { OK => 'succeeded', ERROR => 'failed', QUEUED => 'queued', RUNNING => 'running', CANCELLED => 'cancelled' }.freeze
 
   def relevant?(*args)
     execution_tasks.present?
@@ -38,6 +40,8 @@ class HostStatus::ExecutionStatus < HostStatus::Status
     case to_status(options)
       when OK
         execution_tasks.present? ? N_('Last execution succeeded') : N_('No execution finished yet')
+      when CANCELLED
+        N_('Last execution cancelled')
       when ERROR
         N_('Last execution failed')
       else
@@ -54,6 +58,8 @@ class HostStatus::ExecutionStatus < HostStatus::Status
       case status
         when OK
           [ "state = 'stopped' AND result = 'success'" ]
+        when CANCELLED
+          [ "state = 'stopped' AND result = 'cancelled'" ]
         when ERROR
           [ "state = 'stopped' AND (result = 'error' OR result = 'warning')" ]
         when QUEUED
@@ -74,6 +80,8 @@ class HostStatus::ExecutionStatus < HostStatus::Status
         QUEUED
       elsif task.state == 'stopped' && task.result == 'success'
         OK
+      elsif task.state == 'stopped' && task.result == 'cancelled'
+        CANCELLED
       elsif task.pending?
         RUNNING
       else

data/app/models/remote_execution_provider.rb

@@ -98,5 +98,10 @@ class RemoteExecutionProvider
     def proxy_action_class
       ForemanRemoteExecutionCore::Actions::RunScript
     end
+
+    # Return a specific proxy selector to use for running a given template
+    # Returns either nil to use the default selector or an instance of a (sub)class of ::ForemanTasks::ProxySelector
+    def required_proxy_selector_for(_template)
+    end
   end
 end

data/app/services/default_proxy_proxy_selector.rb

@@ -0,0 +1,18 @@
+class DefaultProxyProxySelector < ::RemoteExecutionProxySelector
+  def initialize
+    # TODO: Remove this once we have a reliable way of determining the internal proxy without katello
+    # Tracked as https://projects.theforeman.org/issues/29840
+    raise _('Internal proxy selector can only be used if Katello is enabled') unless defined?(::Katello)
+
+    super
+  end
+
+  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
+    super.reduce({}) do |acc, (key, proxies)|
+      acc.merge(key => proxies.select { |proxy| proxy == internal_proxy })
+    end
+  end
+end

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

@@ -19,8 +19,14 @@ child :targeting do
   attributes :bookmark_id, :search_query, :targeting_type, :user_id, :status, :status_label,
     :randomized_ordering
 
-  child :hosts do
+  child @hosts do
     extends 'api/v2/hosts/base'
+
+    if params[:host_status]
+      node :job_status do |host|
+        @host_statuses[host.id]
+      end
+    end
   end
 end
 
@@ -28,7 +34,7 @@ child :task do
   attributes :id, :state
 end
 
-child :template_invocations do
+child @template_invocations do
   attributes :template_id, :template_name
   child :input_values do
     attributes :template_input_name, :template_input_id

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

@@ -5,6 +5,7 @@
     </h2>
     <div class="card-pf-body">
       <div id='status_chart'>
+        <%= react_component('JobInvocationContainer', data: { url: "/job_invocations/chart?id=#{job_invocation.id}" }) %>
       </div>
     </div>
   </div>

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

@@ -8,7 +8,7 @@
     <p>
     <ul>
       <% template_invocation.input_values.joins(:template_input).each do |input_value| %>
-        <li><b><%= input_value.template_input.name %></b>: <%= input_value.template_input.hidden_value ? '*' * 5 : trunc_with_tooltip(input_value.value, 255) %></li>
+        <li><b><%= input_value.template_input.name %></b>: <%= trunc_with_tooltip(input_safe_value(input_value), 255) %></li>
       <% end %>
     </ul>
     </p>

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

@@ -15,29 +15,9 @@
   <% end %>
   <br>
 
-  <table class="<%= table_css_classes('table-condensed') %>">
-    <thead>
-    <tr>
-      <th><%= sort :name, :as => _('Host') %></th>
-      <th><%= _('Status') %></th>
-      <th><%= _('Actions') %></th>
-    </tr>
-    </thead>
-
-    <tbody>
-    <% hosts.each do |host| %>
-      <% template_invocation = job_invocation.template_invocations.find { |template_invocation| template_invocation.host_id == host.id } %>
-      <% task = template_invocation.try(:run_host_job_task) %>
-      <tr>
-        <% options = { :host => host, :task => task, :job_invocation => job_invocation, :template_invocation => template_invocation } %>
-        <%= render 'host_name_td', options %>
-        <%= render 'host_status_td', options %>
-        <%= render 'host_actions_td', options %>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
-
+  <div id="targeting_hosts">
+    <%= mount_react_component('TargetingHosts', '#targeting_hosts') %>
+  </div>
   <%= will_paginate_with_info @hosts, :container => true %>
 <% else %>
   <div class="alert alert-warning">

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

@@ -1,7 +1,7 @@
 <% template_invocations = job_invocation.pattern_template_invocations %>
 <div class='row'>
   <div class="col-xs-6 col-sm-6 col-md-6">
-    <%= render :partial => 'card_results' %>
+    <%= render :partial => 'card_results', :locals => { :job_invocation => job_invocation } %>
     <%= render :partial => 'card_schedule', :locals => { :job_invocation => job_invocation } %>
   </div>
   <div class='col-xs-12 col-sm-6 col-md-6'>

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

@@ -12,7 +12,7 @@
       <% template_invocation.input_values.joins(:template_input).each do |input_value| %>
         <tr>
           <td><b><%= input_value.template_input.name %></b></td>
-          <td><%= input_value.template_input.hidden_value? ? '*' * 5 : input_value.value %></td>
+          <td><%= input_safe_value(input_value) %></td>
         </tr>
       <% end %>
       </tbody>

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

@@ -1,7 +1,7 @@
 <% title @job_invocation.description %>
 <% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
 <% javascript 'charts', 'foreman_remote_execution/template_invocation' %>
-<%= javascript_include_tag *webpack_asset_paths('foreman_remote_execution', :extension => 'js'), "data-turbolinks-track" => true, 'defer' => 'defer' %>
+<% javascript *webpack_asset_paths('foreman_remote_execution', :extension => 'js') %>
 
 <%= breadcrumbs name_field: 'description' %>
 
@@ -41,9 +41,3 @@
   <% 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'), job_invocation_refresh_data());
-<% end %>
-</script>

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

@@ -0,0 +1,4 @@
+{
+  "autoRefresh": "<%= @auto_refresh %>",
+  "hosts": <%= targeting_hosts(@job_invocation, @hosts).to_json.html_safe %>
+}

data/config/routes.rb

@@ -16,7 +16,8 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :job_invocations, :only => [:new, :create, :show, :index] do
+  match 'job_invocations/new', to: 'job_invocations#new', via: [:get, :post], as: 'new_job_invocation'
+  resources :job_invocations, :only => [:create, :show, :index] do
     collection do
       post 'refresh'
       get 'chart'

data/db/seeds.d/70-job_templates.rb

@@ -4,7 +4,7 @@ User.as_anonymous_admin do
   JobTemplate.without_auditing do
     Dir[File.join("#{ForemanRemoteExecution::Engine.root}/app/views/templates/**/*.erb")].each do |template|
       sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
-      template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+      template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
       template.organizations = organizations if template.present?
       template.locations = locations if template.present?
     end

data/foreman_remote_execution.gemspec

@@ -15,21 +15,20 @@ Gem::Specification.new do |s|
   s.description = 'A plugin bringing remote execution to the Foreman, completing the config ' +
                   'management functionality with remote management functionality.'
 
-  s.files =            `git ls-files`.split("\n").reject do |file|
-    file =~ /^scripts/ ||
-        file.start_with?('lib/foreman_remote_execution_core') ||
-        file == 'foreman_remote_execution_core.gemspec'
+  s.files = `git ls-files`.split("\n").reject do |file|
+    file.start_with?('scripts', 'lib/foreman_remote_execution_core') ||
+      file == 'foreman_remote_execution_core.gemspec'
   end
 
   s.test_files =       `git ls-files test`.split("\n")
   s.extra_rdoc_files = Dir['README*', 'LICENSE']
 
   s.add_dependency 'deface'
-  s.add_dependency 'dynflow', '>= 1.0.1', '< 2.0.0'
+  s.add_dependency 'dynflow', '>= 1.0.2', '< 2.0.0'
   s.add_dependency 'foreman_remote_execution_core'
   s.add_dependency 'foreman-tasks', '>= 0.15.1'
 
   s.add_development_dependency 'factory_bot_rails', '~> 4.8.0'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop', '~> 0.80.0'
   s.add_development_dependency 'rdoc'
 end

data/lib/foreman_remote_execution/engine.rb

@@ -166,10 +166,12 @@ module ForemanRemoteExecution
 
       Host::Managed.prepend ForemanRemoteExecution::HostExtensions
       Host::Managed.include ForemanTasks::Concerns::HostActionSubject
+      Host::Managed.include ForemanRemoteExecution::Orchestration::SSH
 
       (Nic::Base.descendants + [Nic::Base]).each do |klass|
         klass.send(:include, ForemanRemoteExecution::NicExtensions)
       end
+      Nic::Managed.include ForemanRemoteExecution::Orchestration::SSH
 
       Bookmark.include ForemanRemoteExecution::BookmarkExtensions
       HostsHelper.prepend ForemanRemoteExecution::HostsHelperExtensions

data/lib/foreman_remote_execution/version.rb

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

data/locale/action_names.rb

@@ -1,5 +1,5 @@
 # Autogenerated!
-_("Remote action:")
-_("Import Puppet classes")
-_("Import facts")
 _("Action with sub plans")
+_("Import facts")
+_("Import Puppet classes")
+_("Remote action:")

data/locale/de/foreman_remote_execution.po

@@ -27,11 +27,6 @@ msgstr "vor %s"
 msgid "%{description} on %{host}"
 msgstr "%{description} auf %{host}"
 
-msgid "...and %{count} more"
-msgid_plural "...and %{count} more"
-msgstr[0] "...und %{count} weiteren"
-msgstr[1] "...und %{count} weiteren"
-
 msgid "A comma separated list of input names to be excluded from the foreign template."
 msgstr "Kommagetrennte Liste von Eingabenamen, die aus der Fremdvorlage auszuschließen ist"
 
@@ -59,12 +54,21 @@ msgstr "Aktionen"
 msgid "Add Foreign Input Set"
 msgstr "Fremdeingabe-Satz hinzufügen"
 
+msgid "Alphabetical"
+msgstr ""
+
 msgid "Amount of workers in the pool to handle the execution of the remote execution jobs. Restart of the dynflowd/foreman-tasks service is required."
 msgstr ""
 
 msgid "Another interface is already set as execution. Are you sure you want to use this one instead?"
 msgstr "Es ist bereits eine andere Schnittstelle für die Ausführung bestimmt. Sind Sie sicher, dass Sie stattdessen diese Schnittstelle verwenden möchten?"
 
+msgid "Any Location"
+msgstr ""
+
+msgid "Any Organization"
+msgstr ""
+
 msgid "Back to Job"
 msgstr "Zurück zum Job"
 
@@ -92,6 +96,9 @@ msgstr "bookmark_id und search_query konnte nicht angegeben werden"
 msgid "Cannot specify both recurrence and scheduling"
 msgstr "Wiederholung und Planung konnten nicht angegeben werden"
 
+msgid "Choose a job template that is pre-selected in job invocation form"
+msgstr ""
+
 msgid "Circular dependency detected in foreign input set '%{template}' -> '%{target_template}'. Templates stack: %{templates_stack}"
 msgstr "Zirkuläre Abhängigkeit im Fremdeingabe-Satz gefunden '%{template}' -> '%{target_template}'. Vorlagen-Stack: %{templates_stack}"
 
@@ -146,6 +153,12 @@ msgstr "Job-Vorlage erstellen"
 msgid "Create a recurring job"
 msgstr "Wiederholten Job erstellen"
 
+msgid "Current location %{loc_c} is different from job's location %{loc_j}."
+msgstr ""
+
+msgid "Current organization %{org_c} is different from job's organization %{org_j}."
+msgstr ""
+
 msgid "Default SSH key passphrase"
 msgstr ""
 
@@ -179,8 +192,8 @@ msgstr "Beschreibungsvorlage"
 msgid "Display advanced fields"
 msgstr "Erweiterte Felder einblenden"
 
-msgid "Distribute execution over N seconds"
-msgstr "Ausführung über n Sekunden verteilen"
+msgid "Distribute execution over N seconds. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
+msgstr ""
 
 msgid "Distribute tasks over N seconds"
 msgstr "Aufgaben über n Sekunden verteilen"
@@ -224,9 +237,21 @@ msgstr "Fehler die Daten vom Proxy zu laden."
 msgid "Evaluated at:"
 msgstr "Evaluiert an:"
 
+msgid "Execute the jobs on hosts in randomized order"
+msgstr ""
+
 msgid "Execution"
 msgstr "Ausführung"
 
+msgid "Execution order"
+msgstr ""
+
+msgid "Execution ordering"
+msgstr ""
+
+msgid "Execution ordering determines whether the jobs should be executed on hosts in alphabetical order or in randomized order.<br><ul><li><b>Ordered</b> - executes the jobs on hosts in alphabetical order</li><li><b>Randomized</b> - randomizes the order in which jobs are executed on hosts</li></ul>"
+msgstr ""
+
 msgid "Exit status: %s"
 msgstr "Exit-Status: %s"
 
@@ -257,6 +282,9 @@ msgstr "Fremdeingabe-Satz"
 msgid "Foreman can run arbitrary commands on remote hosts using different providers, such as SSH or Ansible. Communication goes through the Smart Proxy so Foreman does not have to have direct access to the target hosts and can scale to control many hosts."
 msgstr ""
 
+msgid "Form Job Template"
+msgstr ""
+
 msgid "Get output for a host"
 msgstr "Ausgabe für einen Host abfragen"
 
@@ -377,6 +405,9 @@ msgstr ""
 msgid "Label"
 msgstr "Kennung"
 
+msgid "Last execution cancelled"
+msgstr ""
+
 msgid "Last execution failed"
 msgstr "Letzte Ausführung fehlgeschlagen"
 
@@ -407,6 +438,9 @@ msgstr "Entfernte Ausführungsfunktionen auflisten"
 msgid "List template invocations belonging to job invocation"
 msgstr ""
 
+msgid "Location"
+msgstr ""
+
 msgid "Manual selection"
 msgstr "Manuelle Auswahl"
 
@@ -425,15 +459,15 @@ msgstr "Neue Job-Vorlage"
 msgid "No execution finished yet"
 msgstr "Noch keine Ausführung abgeschlossen"
 
-msgid "No hosts found."
-msgstr "Keine Hosts gefunden"
-
 msgid "No template mapped to feature %{feature_name}"
 msgstr "Der Funktion %{feature_name} wurde keine Vorlage zugewiesen"
 
 msgid "Not all required inputs have values. Missing inputs: %s"
 msgstr "Nicht alle erforderlichen Eingaben haben Werte. Fehlende Eingaben: %s"
 
+msgid "Organization"
+msgstr ""
+
 msgid "Override the description format from the template for this invocation only"
 msgstr "Beschreibungsformat der Vorlage nur für diesen Aufruf außer Kraft setzen "
 
@@ -458,6 +492,9 @@ msgstr ""
 msgid "Pending"
 msgstr "Ausstehend"
 
+msgid "Perform a single Puppet run"
+msgstr ""
+
 msgid "Perform no more executions after this time"
 msgstr "Danach nicht mehr ausführen"
 
@@ -487,6 +524,9 @@ msgstr "Anbieter und Vorlagen"
 msgid "Proxies"
 msgstr "Proxys"
 
+msgid "Randomized"
+msgstr ""
+
 msgid "Recurring logic"
 msgstr "Wiederholungslogik"
 
@@ -511,6 +551,9 @@ msgstr "Entfernte Ausführung"
 msgid "Remote execution feature label that should be triggered, job template assigned to this feature will be used"
 msgstr ""
 
+msgid "Remove SSH known hosts for %s"
+msgstr ""
+
 msgid "Repeat a maximum of N times"
 msgstr "Maximal n-mal wiederholen"
 
@@ -544,9 +587,15 @@ msgstr "Ausführen"
 msgid "Run Job"
 msgstr "Job ausführen"
 
+msgid "Run Puppet Once"
+msgstr ""
+
 msgid "Run at most N tasks at a time"
 msgstr "Höchstens n Aufgaben gleichzeitig ausführen"
 
+msgid "Run at most N tasks at a time. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
+msgstr ""
+
 msgid "SSH"
 msgstr "SSH"
 
@@ -589,8 +638,8 @@ msgstr "Suchen"
 msgid "Search Query"
 msgstr ""
 
-msgid "Search for remote execution proxy outside of the proxies assigned to the host. If locations or organizations are enabled, the search will be limited to the host's organization or location."
-msgstr "Außerhalb der dem Host zugewiesenen Proxys nach Proxy mit entfernter Ausführung suchen. Wenn Standorte oder Organisationen aktiviert sind, wird die Suche auf Organisation oder Standort des Hosts begrenzt."
+msgid "Search for remote execution proxy outside of the proxies assigned to the host. The search will be limited to the host's organization and location."
+msgstr ""
 
 msgid "Search the host for any proxy with Remote Execution, useful when the host has no subnet or the subnet does not have an execution proxy"
 msgstr "Den Host nach einem Proxy mit entfernter Ausführung durchsuchen. Dies ist nützlich, wenn der Host kein Subnetz hat oder das Subnetz keinen Proxy für die Ausführung hat."
@@ -610,7 +659,7 @@ msgstr "Wählen Sie so viele Proxys für entfernte Ausführung aus, wie es für
 msgid "Set to distribute over"
 msgstr ""
 
-msgid "Should the ip addresses on host interfaces be preferred over the fqdn? It is useful, when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip."
+msgid "Should the ip addresses on host interfaces be preferred over the fqdn? It is useful when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip. This setting only applies to IPv4. When the host has only an IPv6 address on the interface used for remote execution, hostname will be used even if this setting is set to true."
 msgstr ""
 
 msgid "Show foreign input set details"
@@ -682,9 +731,6 @@ msgstr "Vorlagenversion"
 msgid "Template with id '%{id}' was not found"
 msgstr "Vorlage mit ID '%{id}' nicht gefunden"
 
-msgid "The dynamic query '#{job_invocation.targeting.search_query}' was not resolved yet. The list of hosts to which it would resolve now can be seen"
-msgstr ""
-
 msgid "The dynamic query '%{query}' was not resolved yet. The list of hosts to which it would resolve now can be seen %{here}."
 msgstr "Die dynamische Anfrage '%{query}' wurde noch nicht aufgelöst. Die Liste von Hosts, zu denen sie sich auflösen würde, ist jetzt %{here} zu sehen."
 
@@ -786,6 +832,9 @@ msgstr "Anfragetyp"
 msgid "Unable to fetch public key"
 msgstr "Öffentlicher Schlüssel konnte nicht abgerufen werden"
 
+msgid "Unable to remove host from known hosts"
+msgstr ""
+
 msgid "Unable to save template. Correct highlighted errors"
 msgstr "Vorlage kann nicht gespeichert werden. Bitte korrigieren Sie die markierten Fehler"