foreman_remote_execution 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19c80592b90b1ba20ac213bae2ff36e9608202161e29718a063d3ac52ed249b3
-  data.tar.gz: daa58fc0cfe1a9b788a49372c1d200579502331ef9e1f1424fa4a81270898a8b
+  metadata.gz: d00f4722f74258ad947432c2d8104522d3fb53749f7bac4e7c52914862af3ecc
+  data.tar.gz: 187645d51578339523b94fb83fe781cba865477a616c2d8c0980255be1fd0377
 SHA512:
-  metadata.gz: c3b9ee1922a5ece712f8f431eb84de7ab5793d5108fe4959ce690a0acd6edb14f21ab5135cc1b7bcf37d3fbe81af45731fe1900e1803683c131bc3dba13aa931
-  data.tar.gz: 5db356770b3017319ef2e4f0d1a16598025c9227b540661b2f3e6104f2bd522dbbfb351266eae0bc63d19667a2edc079de0136b50e648e6abddf973bbbe58ead
+  metadata.gz: 04c6a44e96bb03d75310d7dd48acd249503f04778c62f520d1101bf4719d195c2cd4d11e9a6ae63c97e24d8cbd50884dd090ec56a54aff933ee19f3379bbeec1
+  data.tar.gz: 165ba49b54b18ed4128c7b72a53ef52fea60f6f9a619ee7bd0a22545910cf68997b763e27f3569892b20dd528e70236c44b241c1d1b6c5fcec15a5a21f76af7e

data/.eslintrc

@@ -1,32 +1,7 @@
 {
-  "root": true,
-  "extends": ["airbnb-base", "./node_modules/@theforeman/vendor-dev/eslint.extends.js"],
-  "plugins": [
-    "react"
-  ],
-  "env": {
-    "browser": true,
-    "es6": true,
-    "node": true,
-    "jasmine": true,
-    "jest": true
-  },
-  "parser": "babel-eslint",
-  "rules": {
-    "react/jsx-uses-vars": "error",
-    "react/jsx-uses-react": "error",
-    "no-unused-vars": [
-      "error",
-      {
-        "vars": "all",
-        "args": "none"
-      }
-    ],
-    "no-underscore-dangle": "off",
-    "no-use-before-define": "off",
-    "import/prefer-default-export": "off",
-    // Import rules off for now due to HoundCI issue
-    "import/no-unresolved": "off",
-    "import/extensions": "off"
-  }
+  "plugins": ["@theforeman/foreman"],
+  "extends": [
+    "plugin:@theforeman/foreman/core",
+    "plugin:@theforeman/foreman/plugins"
+  ]
 }

data/.gitignore

@@ -14,3 +14,4 @@ locale/*/*.po.time_stamp
 Gemfile.lock
 node_modules/
 package-lock.json
+coverage/

data/.hound.yml

@@ -11,9 +11,4 @@ rubocop:
 jshint:
   enabled: false
 
-eslint:
-  enabled: true
-  config_file: .eslintrc
-  ignore_file: .eslintignore
-
 fail_on_violations: true

data/.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - '6.10' # current EPEL 7
-  - '6' # previous LTS
-  - '8' # current LTS
+  - '10'
+  - '12'
 script: ./scripts/travis_run_js_tests.sh

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

@@ -19,10 +19,6 @@ module Api
       api :GET, '/job_invocations/:id', N_('Show job invocation')
       param :id, :identifier, :required => true
       def show
-        @hosts = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
-        @template_invocations = @job_invocation.template_invocations
-                                               .where(host: @hosts)
-                                               .includes(:input_values)
       end
 
       def_param_group :job_invocation do
@@ -150,7 +146,7 @@ module Api
       end
 
       def find_host
-        @host = @nested_obj.targeting.hosts.authorized(:view_hosts, Host).find(params['host_id'])
+        @host = Host.authorized(:view_hosts).find(params['host_id'])
       rescue ActiveRecord::RecordNotFound
         not_found({ :error => { :message => (_("Host with id '%{id}' was not found") % { :id => params['host_id'] }) } })
       end

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

@@ -26,10 +26,7 @@ module Api
       private
 
       def resource_scope_for_template_invocations
-        @job_invocation.template_invocations
-                       .includes(:host)
-                       .where(host: Host.authorized(:view_hosts, Host))
-                       .search_for(*search_options)
+        @job_invocation.template_invocations.search_for(*search_options)
       end
 
       def find_job_invocation

data/app/helpers/job_invocations_helper.rb

@@ -29,7 +29,7 @@ module JobInvocationsHelper
   end
 
   def preview_hosts(template_invocation)
-    hosts = template_invocation.targeting.hosts.authorized(:view_hosts, Host).take(20)
+    hosts = template_invocation.targeting.hosts.take(20)
     hosts.map do |host|
       collapsed_preview(host) +
         render(:partial => 'job_invocations/user_input',

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

@@ -29,6 +29,9 @@ module Actions
 
         raise _('Could not use any template used in the job invocation') if template_invocation.blank?
 
+        provider = template_invocation.template.provider
+        proxy_selector = provider.required_proxy_selector_for(template_invocation.template) || proxy_selector
+
         provider_type = template_invocation.template.provider_type.to_s
         proxy = determine_proxy!(proxy_selector, provider_type, host)
 
@@ -36,8 +39,6 @@ module Actions
         script = renderer.render
         raise _('Failed rendering template: %s') % renderer.error_message unless script
 
-        provider = template_invocation.template.provider
-
         additional_options = { :hostname => provider.find_ip_or_hostname(host),
                                :script => script,
                                :execution_timeout_interval => job_invocation.execution_timeout_interval,

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

@@ -49,7 +49,7 @@ module ForemanRemoteExecution
       keys = remote_execution_ssh_keys
       source = 'global'
       if keys.present?
-        value, safe_value = params.fetch('remote_execution_ssh_keys', {}).values_at(:value, :safe_value).map { |v| [v].flatten.compact }
+        value, safe_value = params.fetch('remote_execution_ssh_keys', {}).values_at(:value, :safe_value).map { |v| v || [] }
         params['remote_execution_ssh_keys'] = {:value => value + keys, :safe_value => safe_value + keys, :source => source}
       end
       [:remote_execution_ssh_user, :remote_execution_effective_user_method,

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

@@ -8,10 +8,8 @@ module ForemanRemoteExecution
       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?
-
+    def drop_from_known_hosts(args)
+      proxy_id, target = args
       proxy = ::SmartProxy.find(proxy_id)
       begin
         proxy.drop_host_from_known_hosts(target)
@@ -28,11 +26,11 @@ module ForemanRemoteExecution
     def ssh_destroy
       logger.debug "Scheduling SSH known_hosts cleanup"
 
-      host, _kind, _target = host_kind_target
+      host, _kind, target = host_kind_target
       proxies = host.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])
+          priority: 200, action: [self, :drop_from_known_hosts, [proxy.id, target]])
       end
     end
 
@@ -42,7 +40,7 @@ module ForemanRemoteExecution
 
     def should_drop_from_known_hosts?
       host, = host_kind_target
-      host && !host.new_record? && host.build && host.changes.key?('build')
+      host&.build && host&.changes&.key?('build')
     end
 
     private

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,7 +19,7 @@ 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'
   end
 end
@@ -28,7 +28,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/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/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '3.2.2'.freeze
+  VERSION = '3.3.0'.freeze
 end

data/package.json

@@ -3,25 +3,14 @@
   "version": "1.0.0",
   "license": "GPL-3.0",
   "scripts": {
-    "lint": "./node_modules/.bin/eslint -c .eslintrc webpack/ script/",
-    "test": "node node_modules/.bin/jest webpack",
-    "test:watch": "node node_modules/.bin/jest webpack --watchAll",
-    "test:current": "node node_modules/.bin/jest webpack --watch"
-  },
-  "jest": {
-    "verbose": true,
-    "moduleDirectories": [
-      "node_modules",
-      "webpack"
-    ],
-    "setupFiles": [
-      "raf/polyfill",
-      "./webpack/test_setup.js"
-    ],
-    "testPathIgnorePatterns": [
-      "/node_modules/",
-      "<rootDir>/foreman/"
-    ]
+    "lint": "tfm-lint --plugin -d /webpack",
+    "test": "tfm-test --plugin",
+    "test:watch": "tfm-test --plugin --watchAll",
+    "test:current": "tfm-test --plugin --watch",
+    "publish-coverage": "tfm-publish-coverage",
+    "stories": "tfm-stories --plugin",
+    "stories:build": "tfm-build-stories --plugin",
+    "stories:deploy": "surge --project .storybook-dist"
   },
   "repository": {
     "type": "git",
@@ -32,22 +21,16 @@
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.0.2",
-    "@theforeman/vendor-dev": "^4.0.2",
+    "@theforeman/builder": "^4.2.1",
+    "@theforeman/eslint-plugin-foreman": "^4.2.1",
+    "@theforeman/stories": "^4.2.1",
+    "@theforeman/test": "^4.2.1",
+    "@theforeman/vendor-dev": "^4.2.1",
     "babel-eslint": "^10.0.0",
-    "babel-jest": "^24.9.0",
-    "enzyme": "^3.2.0",
-    "enzyme-adapter-react-16": "^1.1.0",
-    "enzyme-to-json": "^3.1.2",
-    "eslint": "^4.10.0",
-    "eslint-config-airbnb": "^16.0.0",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.2.0",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.4.0",
-    "jest": "^24.9.0"
+    "eslint": "^6.8.0",
+    "prettier": "^1.19.1"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 4.0.2"
+    "@theforeman/vendor": ">= 4.2.1"
   }
 }

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

@@ -4,7 +4,7 @@ module Api
   module V2
     class JobInvocationsControllerTest < ActionController::TestCase
       setup do
-        @invocation = FactoryBot.create(:job_invocation, :with_template, :with_task, :with_unplanned_host)
+        @invocation = FactoryBot.create(:job_invocation, :with_template, :with_task)
         @template = FactoryBot.create(:job_template, :with_input)
 
         # Without this the template in template_invocations and in pattern_template_invocations
@@ -20,32 +20,18 @@ module Api
         assert_response :success
       end
 
-      describe 'show' do
-        test 'should get invocation detail' do
-          get :show, params: { :id => @invocation.id }
-          assert_response :success
-          template = ActiveSupport::JSON.decode(@response.body)
-          assert_not_empty template
-          assert_equal template['job_category'], @invocation.job_category
-          assert_not_empty template['targeting']['hosts']
-        end
-
-        test 'should get invocation detail when taxonomies are set' do
-          taxonomy_params = %w(organization location).reduce({}) { |acc, cur| acc.merge("#{cur}_id" => FactoryBot.create(cur)) }
-          get :show, params: taxonomy_params.merge(:id => @invocation.id)
-          assert_response :success
-        end
-
-        test 'should see only permitted hosts' do
-          @user = FactoryBot.create(:user, admin: false)
-          setup_user('view', 'job_invocations', nil, @user)
-          setup_user('view', 'hosts', 'name ~ nope.example.com', @user)
+      test 'should get invocation detail' do
+        get :show, params: { :id => @invocation.id }
+        assert_response :success
+        template = ActiveSupport::JSON.decode(@response.body)
+        assert_not_empty template
+        assert_equal template['job_category'], @invocation.job_category
+      end
 
-          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']
-        end
+      test 'should get invocation detail when taxonomies are set' do
+        taxonomy_params = %w(organization location).reduce({}) { |acc, cur| acc.merge("#{cur}_id" => FactoryBot.create(cur)) }
+        get :show, params: taxonomy_params.merge(:id => @invocation.id)
+        assert_response :success
       end
 
       context 'creation' do
@@ -122,7 +108,7 @@ module Api
       end
 
       describe '#output' do
-        let(:host) { @invocation.targeting.hosts.first }
+        let(:host) { @invocation.template_invocations_hosts.first }
 
         test 'should provide output for delayed task' do
           ForemanTasks::Task.any_instance.expects(:scheduled?).returns(true)
@@ -151,12 +137,6 @@ module Api
           assert_equal result['message'], "Job invocation not found by id '#{invocation_id}'"
           assert_response :missing
         end
-
-        test 'should get output only for host in job invocation' do
-          get :output, params: { job_invocation_id: @invocation.id,
-                                 host_id: FactoryBot.create(:host).id }
-          assert_response :missing
-        end
       end
 
       describe 'raw output' do
@@ -168,7 +148,7 @@ module Api
         let(:fake_task) do
           OpenStruct.new :pending? => false, :main_action => OpenStruct.new(:live_output => fake_output)
         end
-        let(:host) { @invocation.targeting.hosts.first }
+        let(:host) { @invocation.template_invocations_hosts.first }
 
         test 'should provide raw output for a host' do
           JobInvocation.any_instance.expects(:task).returns(OpenStruct.new(:scheduled? => false))
@@ -204,12 +184,6 @@ module Api
           assert_nil result['output']
           assert_response :success
         end
-
-        test 'should get raw output only for host in job invocation' do
-          get :raw_output, params: { job_invocation_id: @invocation.id,
-                                     host_id: FactoryBot.create(:host).id }
-          assert_response :missing
-        end
       end
 
       test 'should cancel a job' do
@@ -258,13 +232,11 @@ module Api
       end
 
       test 'should not raise an exception when reruning failed has no hosts' do
-        @invocation.targeting.hosts.first.destroy
         JobInvocation.any_instance.expects(:generate_description)
         JobInvocationComposer.any_instance
                              .expects(:validate_job_category)
                              .with(@invocation.job_category)
                              .returns(@invocation.job_category)
-
         post :rerun, params: { :id => @invocation.id, :failed_only => true }
         assert_response :success
         result = ActiveSupport::JSON.decode(@response.body)

data/test/models/orchestration/ssh_test.rb

@@ -15,42 +15,10 @@ class SSHOrchestrationTest < ActiveSupport::TestCase
   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
-    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).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

data/test/unit/concerns/host_extensions_test.rb

@@ -48,13 +48,6 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
       _(host.host_param('remote_execution_ssh_keys')).must_include sshkey
     end
 
-    it 'merges ssh key as a string from host parameters and proxies' do
-      key = 'ssh-rsa not-even-a-key something@somewhere.com'
-      host.host_parameters << FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_keys', :value => key)
-      _(host.host_param('remote_execution_ssh_keys')).must_include key
-      _(host.host_param('remote_execution_ssh_keys')).must_include sshkey
-    end
-
     it 'has ssh keys in the parameters even when no user specified' do
       # this is a case, when using the helper in provisioning templates
       FactoryBot.create(:smart_proxy, :ssh)

data/webpack/index.js

@@ -1,6 +1,5 @@
-import URI from 'urijs';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { mount, registerReducer } from 'foremanReact/common/MountingService';
+import { registerReducer } from 'foremanReact/common/MountingService';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import JobInvocationContainer from './react_app/components/jobInvocations';

data/webpack/react_app/components/jobInvocations/AggregateStatus/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 const AggregateStatus = ({ statuses }) => (
   <div id="aggregate_statuses">
@@ -31,4 +32,13 @@ const AggregateStatus = ({ statuses }) => (
   </div>
 );
 
+AggregateStatus.propTypes = {
+  statuses: PropTypes.shape({
+    cancelled: PropTypes.number,
+    failed: PropTypes.number,
+    pending: PropTypes.number,
+    success: PropTypes.number,
+  }).isRequired,
+};
+
 export default AggregateStatus;

data/webpack/react_app/components/jobInvocations/AggregateStatus/index.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import AggregateStatus from './index.js';
+import { shallow } from '@theforeman/test';
+import AggregateStatus from './index';
 
 jest.unmock('./index.js');
 
@@ -20,7 +20,10 @@ describe('AggregateStatus', () => {
 
     it('renders cards with props passed', () => {
       const statuses = {
-        success: 19, failed: 20, cancelled: 31, pending: 3,
+        success: 19,
+        failed: 20,
+        cancelled: 31,
+        pending: 3,
       };
       const chartNumbers = shallow(<AggregateStatus statuses={statuses} />);
       const success = chartNumbers.find('#success_count').text();

data/webpack/react_app/components/jobInvocations/index.js

@@ -4,14 +4,18 @@ import Immutable from 'seamless-immutable';
 import PropTypes from 'prop-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import DonutChart from 'foremanReact/components/common/charts/DonutChart';
-import AggregateStatus from './AggregateStatus/index.js';
+import AggregateStatus from './AggregateStatus';
 import * as JobInvocationActions from '../../redux/actions/jobInvocations';
 
-const colIndexOfMaxValue = columns => columns.reduce((iMax, x, i, arr) => (x[1] > arr[iMax][1] ? i : iMax), 0);
+const colIndexOfMaxValue = columns =>
+  columns.reduce((iMax, x, i, arr) => (x[1] > arr[iMax][1] ? i : iMax), 0);
 
 class JobInvocationContainer extends React.Component {
   componentDidMount() {
-    const { startJobInvocationsPolling, data: { url } } = this.props;
+    const {
+      startJobInvocationsPolling,
+      data: { url },
+    } = this.props;
 
     startJobInvocationsPolling(url);
   }
@@ -22,15 +26,20 @@ class JobInvocationContainer extends React.Component {
 
     return (
       <div id="job_invocations_chart_container">
-        <DonutChart data={Immutable.asMutable(jobInvocations)}
-                    title={{type: 'percent', secondary: (jobInvocations[iMax] || [])[0]}}/>
+        <DonutChart
+          data={Immutable.asMutable(jobInvocations)}
+          title={{
+            type: 'percent',
+            secondary: (jobInvocations[iMax] || [])[0],
+          }}
+        />
         <AggregateStatus statuses={statuses} />
       </div>
     );
   }
 }
 
-const mapStateToProps = (state) => {
+const mapStateToProps = state => {
   const {
     jobInvocations,
     statuses,
@@ -62,4 +71,7 @@ JobInvocationContainer.defaultProps = {
   jobInvocations: [['property', 3, 'color']],
   statuses: {},
 };
-export default connect(mapStateToProps, JobInvocationActions)(JobInvocationContainer);
+export default connect(
+  mapStateToProps,
+  JobInvocationActions
+)(JobInvocationContainer);

data/webpack/react_app/redux/actions/jobInvocations/index.js

@@ -8,10 +8,10 @@ import {
 } from '../../consts';
 
 const defaultJobInvocationsPollingInterval = 1000;
-const jobInvocationsInterval = process.env.JOB_INVOCATIONS_POLLING ||
-  defaultJobInvocationsPollingInterval;
+const jobInvocationsInterval =
+  process.env.JOB_INVOCATIONS_POLLING || defaultJobInvocationsPollingInterval;
 
-const getJobInvocations = url => (dispatch, getState) => {
+const getJobInvocations = url => async (dispatch, getState) => {
   function onGetJobInvocationsSuccess({ data }) {
     // If the job has finished, stop polling
     if (data.finished) {
@@ -41,7 +41,7 @@ const getJobInvocations = url => (dispatch, getState) => {
     if (jobInvocationsInterval) {
       setTimeout(
         () => dispatch(getJobInvocations(url)),
-        jobInvocationsInterval,
+        jobInvocationsInterval
       );
     }
   }
@@ -52,10 +52,14 @@ const getJobInvocations = url => (dispatch, getState) => {
 
   if (getState().foremanRemoteExecutionReducers.jobInvocations.isPolling) {
     if (isDocumentVisible) {
-      API.get(url)
-        .then(onGetJobInvocationsSuccess)
-        .catch(onGetJobInvocationsFailed)
-        .then(triggerPolling);
+      try {
+        const data = await API.get(url);
+        onGetJobInvocationsSuccess(data);
+      } catch (error) {
+        onGetJobInvocationsFailed(error);
+      } finally {
+        triggerPolling();
+      }
     } else {
       // document is not visible, keep polling without api call
       triggerPolling();

data/webpack/react_app/redux/consts.js

@@ -2,5 +2,4 @@ export const JOB_INVOCATIONS_POLLING_STARTED =
   'JOB_INVOCATIONS_POLLING_STARTED';
 export const JOB_INVOCATIONS_GET_JOB_INVOCATIONS =
   'JOB_INVOCATIONS_GET_JOB_INVOCATIONS';
-export const JOB_INVOCATIONS_JOB_FINISHED =
-  'JOB_INVOCATIONS_JOB_FINISHED';
+export const JOB_INVOCATIONS_JOB_FINISHED = 'JOB_INVOCATIONS_JOB_FINISHED';

data/webpack/react_app/redux/reducers/jobInvocations/index.fixtures.js

@@ -15,26 +15,10 @@ export const pollingStarted = Immutable({
 export const jobInvocationsPayload = Immutable({
   jobInvocations: {
     job_invocations: [
-      [
-        'Success',
-        100,
-        '#B7312D',
-      ],
-      [
-        'Failed',
-        20,
-        '#B7312D',
-      ],
-      [
-        'Pending',
-        40,
-        '#B7312D',
-      ],
-      [
-        'Cancelled',
-        0,
-        '#B7312D',
-      ],
+      ['Success', 100, '#B7312D'],
+      ['Failed', 20, '#B7312D'],
+      ['Pending', 40, '#B7312D'],
+      ['Cancelled', 0, '#B7312D'],
     ],
     statuses: {
       cancelled: 0,
@@ -48,26 +32,10 @@ export const jobInvocationsPayload = Immutable({
 export const jobInvocationsReceived = Immutable({
   isPolling: true,
   jobInvocations: [
-    [
-      'Success',
-      100,
-      '#B7312D',
-    ],
-    [
-      'Failed',
-      20,
-      '#B7312D',
-    ],
-    [
-      'Pending',
-      40,
-      '#B7312D',
-    ],
-    [
-      'Cancelled',
-      0,
-      '#B7312D',
-    ],
+    ['Success', 100, '#B7312D'],
+    ['Failed', 20, '#B7312D'],
+    ['Pending', 40, '#B7312D'],
+    ['Cancelled', 0, '#B7312D'],
   ],
   statuses: {
     cancelled: 0,

data/webpack/react_app/redux/reducers/jobInvocations/index.test.js

@@ -18,20 +18,26 @@ describe('job invocations chart reducer', () => {
     expect(reducer(undefined, {})).toEqual(initialState);
   });
   it('should start polling given POLLING_STARTED', () => {
-    expect(reducer(initialState, {
-      type: JOB_INVOCATIONS_POLLING_STARTED,
-    })).toEqual(pollingStarted);
+    expect(
+      reducer(initialState, {
+        type: JOB_INVOCATIONS_POLLING_STARTED,
+      })
+    ).toEqual(pollingStarted);
   });
   it('should stop polling given JOB_FINISHED', () => {
-    expect(reducer(pollingStarted, {
-      type: JOB_INVOCATIONS_JOB_FINISHED,
-      payload: { jobInvocations: { job_invocations: [], statuses: {} } },
-    })).toEqual(initialState);
+    expect(
+      reducer(pollingStarted, {
+        type: JOB_INVOCATIONS_JOB_FINISHED,
+        payload: { jobInvocations: { job_invocations: [], statuses: {} } },
+      })
+    ).toEqual(initialState);
   });
   it('should receive job invocations given GET_JOB_INVOCATIONS', () => {
-    expect(reducer(pollingStarted, {
-      type: JOB_INVOCATIONS_GET_JOB_INVOCATIONS,
-      payload: jobInvocationsPayload,
-    })).toEqual(jobInvocationsReceived);
+    expect(
+      reducer(pollingStarted, {
+        type: JOB_INVOCATIONS_GET_JOB_INVOCATIONS,
+        payload: jobInvocationsPayload,
+      })
+    ).toEqual(jobInvocationsReceived);
   });
 });

data/webpack/test_setup.js

@@ -1,7 +1,8 @@
 import 'core-js/shim';
 import 'regenerator-runtime/runtime';
 
-import { configure } from 'enzyme';
+import { configure } from '@theforeman/test';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import Adapter from 'enzyme-adapter-react-16';
 
 configure({ adapter: new Adapter() });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -205,6 +205,7 @@ files:
 - app/models/template_invocation_input_value.rb
 - app/overrides/execution_interface.rb
 - app/overrides/subnet_proxies.rb
+- app/services/default_proxy_proxy_selector.rb
 - app/services/remote_execution_proxy_selector.rb
 - app/services/ui_notifications/remote_execution_jobs/base_job_finish.rb
 - app/views/api/v2/foreign_input_sets/base.json.rabl
@@ -426,7 +427,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config