foreman_remote_execution 4.3.1 → 4.5.2

data/webpack/react_app/components/TargetingHosts/__tests__/TargetingHostsSelectors.test.js

@@ -9,9 +9,14 @@ import {
 } from '../TargetingHostsSelectors';
 
 const state = {
-  hosts: [],
-  autoRefresh: 'true',
-  total_hosts: 0,
+  TARGETING_HOSTS: {
+    status: 'RESOLVED',
+    response: {
+      hosts: [1, 2],
+      total_hosts: 2,
+      autoRefresh: 'true',
+    },
+  },
 };
 
 const fixtures = {

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

@@ -27,6 +27,7 @@ exports[`TargetingHostsPage renders 1`] = `
             "controller": "hosts",
           }
         }
+        onChange={[Function]}
         onSearch={[Function]}
       />
     </Col>

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

@@ -4,8 +4,13 @@ exports[`TargetingHostsSelectors should return apiStatus 1`] = `"RESOLVED"`;
 
 exports[`TargetingHostsSelectors should return autoRefresh 1`] = `"true"`;
 
-exports[`TargetingHostsSelectors should return hosts 1`] = `Array []`;
+exports[`TargetingHostsSelectors should return hosts 1`] = `
+Array [
+  1,
+  2,
+]
+`;
 
 exports[`TargetingHostsSelectors should return intervalExists 1`] = `false`;
 
-exports[`TargetingHostsSelectors should return totalHosts 1`] = `0`;
+exports[`TargetingHostsSelectors should return totalHosts 1`] = `2`;

data/webpack/react_app/extend/fillRecentJobsCard.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import RecentJobsCard from '../components/RecentJobsCard';
+
+export default () =>
+  addGlobalFill(
+    'details-cards',
+    'rex-host-details-latest-jobs',
+    <RecentJobsCard />,
+    1000
+  );

data/webpack/react_app/extend/fillregistrationAdvanced.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import RexInterface from '../components/RegistrationExtension/RexInterface';
+
+export default () =>
+  addGlobalFill(
+    'registrationAdvanced',
+    'foreman-remote-exectuion-rex-interface',
+    <RexInterface key="registration-rex-interface" />,
+    100
+  );

data/webpack/react_app/extend/reducers.js

@@ -0,0 +1,5 @@
+import { registerReducer } from 'foremanReact/common/MountingService';
+import rootReducer from '../redux/reducers';
+
+export default () =>
+  registerReducer('foremanRemoteExecutionReducers', rootReducer);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.5.2
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,7 @@ files:
 - app/controllers/concerns/foreman/controller/parameters/job_template.rb
 - app/controllers/concerns/foreman/controller/parameters/remote_execution_feature.rb
 - app/controllers/concerns/foreman/controller/parameters/targeting.rb
+- app/controllers/foreman_remote_execution/concerns/api/v2/registration_commands_controller_extensions.rb
 - app/controllers/foreman_remote_execution/concerns/api/v2/registration_controller_extensions.rb
 - app/controllers/foreman_remote_execution/concerns/api/v2/subnets_controller_extensions.rb
 - app/controllers/job_invocations_controller.rb
@@ -158,6 +159,7 @@ files:
 - app/lib/actions/middleware/bind_job_invocation.rb
 - app/lib/actions/remote_execution/run_host_job.rb
 - app/lib/actions/remote_execution/run_hosts_job.rb
+- app/lib/foreman_remote_execution/provider_input.rb
 - app/lib/foreman_remote_execution/renderer/scope/input.rb
 - app/lib/proxy_api/remote_execution_ssh.rb
 - app/mailers/.gitkeep
@@ -169,7 +171,6 @@ files:
 - app/models/concerns/foreman_remote_execution/foreman_tasks_triggering_extensions.rb
 - app/models/concerns/foreman_remote_execution/host_extensions.rb
 - app/models/concerns/foreman_remote_execution/nic_extensions.rb
-- app/models/concerns/foreman_remote_execution/orchestration/ssh.rb
 - app/models/concerns/foreman_remote_execution/smart_proxy_extensions.rb
 - app/models/concerns/foreman_remote_execution/subnet_extensions.rb
 - app/models/concerns/foreman_remote_execution/taxonomy_extensions.rb
@@ -178,8 +179,10 @@ files:
 - app/models/concerns/foreman_remote_execution/template_overrides.rb
 - app/models/concerns/foreman_remote_execution/user_extensions.rb
 - app/models/foreign_input_set.rb
+- app/models/host_proxy_invocation.rb
 - app/models/host_status/execution_status.rb
 - app/models/input_template_renderer.rb
+- app/models/invocation_provider_input_value.rb
 - app/models/job_invocation.rb
 - app/models/job_invocation_composer.rb
 - app/models/job_invocation_task_group.rb
@@ -198,6 +201,7 @@ files:
 - app/overrides/subnet_proxies.rb
 - app/services/default_proxy_proxy_selector.rb
 - app/services/remote_execution_proxy_selector.rb
+- app/services/renderer_methods.rb
 - app/services/ui_notifications/remote_execution_jobs/base_job_finish.rb
 - app/views/api/v2/foreign_input_sets/base.json.rabl
 - app/views/api/v2/foreign_input_sets/create.json.rabl
@@ -216,7 +220,6 @@ files:
 - app/views/api/v2/job_templates/main.json.rabl
 - app/views/api/v2/job_templates/show.json.rabl
 - app/views/api/v2/job_templates/update.json.rabl
-- app/views/api/v2/registration/_form.html.erb
 - app/views/api/v2/remote_execution_features/base.json.rabl
 - app/views/api/v2/remote_execution_features/index.json.rabl
 - app/views/api/v2/remote_execution_features/main.json.rabl
@@ -320,6 +323,8 @@ files:
 - db/migrate/20190111153330_remove_remote_execution_without_proxy_setting.rb
 - db/migrate/20200623073022_rename_sudo_password_to_effective_user_password.rb
 - db/migrate/20200820122057_add_proxy_selector_override_to_remote_execution_feature.rb
+- db/migrate/20210312074713_add_provider_inputs.rb
+- db/migrate/2021051713291621250977_add_host_proxy_invocations.rb
 - db/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb
@@ -376,7 +381,6 @@ files:
 - test/functional/job_templates_controller_test.rb
 - test/functional/ui_job_wizard_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
-- test/models/orchestration/ssh_test.rb
 - test/support/remote_execution_helper.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
@@ -387,6 +391,7 @@ files:
 - test/unit/execution_task_status_mapper_test.rb
 - test/unit/input_template_renderer_test.rb
 - test/unit/job_invocation_composer_test.rb
+- test/unit/job_invocation_report_template_test.rb
 - test/unit/job_invocation_test.rb
 - test/unit/job_template_effective_user_test.rb
 - test/unit/job_template_test.rb
@@ -396,18 +401,54 @@ files:
 - test/unit/targeting_test.rb
 - test/unit/template_invocation_input_value_test.rb
 - webpack/JobWizard/JobWizard.js
+- webpack/JobWizard/JobWizard.scss
+- webpack/JobWizard/JobWizardConstants.js
+- webpack/JobWizard/JobWizardSelectors.js
+- webpack/JobWizard/__tests__/__snapshots__/integration.test.js.snap
+- webpack/JobWizard/__tests__/fixtures.js
+- webpack/JobWizard/__tests__/integration.test.js
 - webpack/JobWizard/index.js
+- webpack/JobWizard/steps/AdvancedFields/AdvancedFields.js
+- webpack/JobWizard/steps/AdvancedFields/DescriptionField.js
+- webpack/JobWizard/steps/AdvancedFields/Fields.js
+- webpack/JobWizard/steps/AdvancedFields/__tests__/AdvancedFields.test.js
+- webpack/JobWizard/steps/AdvancedFields/__tests__/DescriptionField.test.js
+- webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.js
+- webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.test.js
+- webpack/JobWizard/steps/CategoryAndTemplate/index.js
+- webpack/JobWizard/steps/Schedule/QueryType.js
+- webpack/JobWizard/steps/Schedule/RepeatOn.js
+- webpack/JobWizard/steps/Schedule/ScheduleType.js
+- webpack/JobWizard/steps/Schedule/StartEndDates.js
+- webpack/JobWizard/steps/Schedule/__tests__/StartEndDates.test.js
+- webpack/JobWizard/steps/Schedule/index.js
+- webpack/JobWizard/steps/form/FormHelpers.js
+- webpack/JobWizard/steps/form/Formatter.js
+- webpack/JobWizard/steps/form/GroupedSelectField.js
+- webpack/JobWizard/steps/form/NumberInput.js
+- webpack/JobWizard/steps/form/SelectField.js
+- webpack/JobWizard/steps/form/__tests__/Formatter.test.js.example
 - webpack/Routes/routes.js
 - webpack/__mocks__/foremanReact/common/I18n.js
+- webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/SearchBar.js
 - webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
 - webpack/__mocks__/foremanReact/constants.js
 - webpack/__mocks__/foremanReact/history.js
 - webpack/__mocks__/foremanReact/redux/API/APISelectors.js
+- webpack/__mocks__/foremanReact/redux/API/index.js
 - webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware/IntervalSelectors.js
+- webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
 - webpack/global_index.js
 - webpack/index.js
+- webpack/react_app/components/RecentJobsCard/RecentJobsCard.js
+- webpack/react_app/components/RecentJobsCard/constants.js
+- webpack/react_app/components/RecentJobsCard/index.js
+- webpack/react_app/components/RecentJobsCard/styles.css
+- webpack/react_app/components/RegistrationExtension/RexInterface.js
+- webpack/react_app/components/RegistrationExtension/__tests__/RexInterface.test.js
+- webpack/react_app/components/RegistrationExtension/__tests__/__snapshots__/RexInterface.test.js.snap
 - webpack/react_app/components/TargetingHosts/TargetingHosts.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsConsts.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsHelpers.js
@@ -431,6 +472,9 @@ files:
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.js
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.test.js
 - webpack/react_app/components/jobInvocations/index.js
+- webpack/react_app/extend/fillRecentJobsCard.js
+- webpack/react_app/extend/fillregistrationAdvanced.js
+- webpack/react_app/extend/reducers.js
 - webpack/react_app/redux/actions/jobInvocations/index.js
 - webpack/react_app/redux/consts.js
 - webpack/react_app/redux/reducers/index.js
@@ -477,7 +521,6 @@ test_files:
 - test/functional/job_templates_controller_test.rb
 - test/functional/ui_job_wizard_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
-- test/models/orchestration/ssh_test.rb
 - test/support/remote_execution_helper.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
@@ -488,6 +531,7 @@ test_files:
 - test/unit/execution_task_status_mapper_test.rb
 - test/unit/input_template_renderer_test.rb
 - test/unit/job_invocation_composer_test.rb
+- test/unit/job_invocation_report_template_test.rb
 - test/unit/job_invocation_test.rb
 - test/unit/job_template_effective_user_test.rb
 - test/unit/job_template_test.rb

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

@@ -1,70 +0,0 @@
-module ForemanRemoteExecution
-  module Orchestration::SSH
-    extend ActiveSupport::Concern
-
-    included do
-      before_destroy :ssh_destroy
-      after_validation :queue_ssh_destroy
-      register_rebuild(:queue_ssh_destroy, N_("SSH_#{self.to_s.split('::').first}"))
-    end
-
-    def drop_from_known_hosts(proxy_id)
-      _, _, target = host_kind_target
-      return true if target.nil?
-
-      proxy = ::SmartProxy.find(proxy_id)
-      begin
-        proxy.drop_host_from_known_hosts(target)
-      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
-      end
-      true
-    end
-
-    def ssh_destroy
-      logger.debug "Scheduling SSH known_hosts cleanup"
-
-      host, _kind, _target = host_kind_target
-      # #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])
-      end
-    end
-
-    def queue_ssh_destroy
-      should_drop_from_known_hosts? && ssh_destroy
-    end
-
-    def should_drop_from_known_hosts?
-      host, = host_kind_target
-      host && !host.new_record? && host.build && host.changes.key?('build')
-    end
-
-    private
-
-    def host_kind_target
-      if self.is_a?(::Host::Base)
-        [self, 'host', name]
-      else
-        [self.host, 'interface', ip]
-      end
-    end
-
-    def queue_id(proxy_id)
-      _, kind, id = host_kind_target
-      "ssh_remove_known_hosts_#{kind}_#{id}_#{proxy_id}"
-    end
-  end
-end

data/app/views/api/v2/registration/_form.html.erb

@@ -1,12 +0,0 @@
-<div class='form-group'>
-  <label class='col-md-2 control-label'>
-    <%= _('Remote Execution Interface') %>
-    <% help = _('Identifier of the Host interface for Remote execution') %>
-    <a rel="popover" data-content="<%= help %>" data-trigger="focus" data-container="body" data-html="true" tabindex="-1">
-      <span class="pficon pficon-info "></span>
-    </a>
-  </label>
-  <div class='col-md-4'>
-    <%= text_field_tag 'remote_execution_interface', params[:remote_execution_interface], class: 'form-control' %>
-  </div>
-</div>

data/test/models/orchestration/ssh_test.rb

@@ -1,56 +0,0 @@
-require 'test_plugin_helper'
-
-class SSHOrchestrationTest < ActiveSupport::TestCase
-  let(:host) { FactoryBot.create(:host, :managed, :with_subnet) }
-  let(:proxy) { FactoryBot.create(:smart_proxy, :ssh) }
-  let(:interface) { host.interfaces.first }
-
-  before { interface.subnet.remote_execution_proxies = [proxy] }
-
-  it 'attempts to drop IP address and hostname from smart proxies on destroy' do
-    host.stubs(:skip_orchestration?).returns false
-    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).with(interface.ip)
-    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).with(host.name)
-    host.destroy
-  end
-
-  it 'attempts to drop IP address and hostname from smart proxies on rebuild' do
-    host.stubs(:skip_orchestration?).returns false
-    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).with(interface.ip)
-    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).with(host.name)
-
-    host.build = true
-    host.save!
-
-    ids = ["ssh_remove_known_hosts_interface_#{interface.ip}_#{proxy.id}",
-           "ssh_remove_known_hosts_host_#{host.name}_#{proxy.id}"]
-    _(host.queue.task_ids).must_equal ids
-    _(host.queue.items.map(&:status)).must_equal %w(completed completed)
-  end
-
-  it 'does not fail on 404 from the smart proxy' do
-    host.stubs(:skip_orchestration?).returns false
-    ::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}",
-           "ssh_remove_known_hosts_host_#{host.name}_#{proxy.id}"]
-    _(host.queue.task_ids).must_equal ids
-    _(host.queue.items.map(&:status)).must_equal %w(completed completed)
-  end
-
-  it 'does not trigger the removal when creating a new host' do
-    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).never
-    host = Host::Managed.new(:name => 'test', :ip => '127.0.0.1')
-    host.stubs(:skip_orchestration?).returns false
-    _(host.queue.task_ids).must_equal []
-  end
-
-  it 'does not call to the proxy when target is nil' do
-    host.stubs(:skip_orchestration?).returns false
-    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).with(host.name)
-    host.interfaces.first.stubs(:ip)
-    host.destroy
-    _(host.queue.items.map(&:status)).must_equal %w(completed completed)
-  end
-end