foreman_remote_execution 3.0.2 → 3.3.0

data/test/unit/renderer_scope_input.rb

@@ -13,15 +13,15 @@ class RendererScopeInputTest < ActiveSupport::TestCase
     it 'caches the value under given key' do
       i = 1
       result = input.cached('some_key') { i }
-      result.must_equal 1
+      _(result).must_equal 1
 
       i += 1
       result = input.cached('some_key') { i }
-      result.must_equal 1
+      _(result).must_equal 1
 
       i += 1
       result = input.cached('different_key') { i }
-      result.must_equal 3
+      _(result).must_equal 3
     end
   end
 
@@ -35,15 +35,15 @@ class RendererScopeInputTest < ActiveSupport::TestCase
     it 'does not cache the value' do
       i = 1
       result = input.cached('some_key') { i }
-      result.must_equal 1
+      _(result).must_equal 1
 
       i += 1
       result = input.cached('some_key') { i }
-      result.must_equal 2
+      _(result).must_equal 2
 
       i += 1
       result = input.cached('different_key') { i }
-      result.must_equal 3
+      _(result).must_equal 3
     end
   end
 end

data/test/unit/targeting_test.rb

@@ -51,7 +51,7 @@ class TargetingTest < ActiveSupport::TestCase
       targeting.resolve_hosts!
     end
 
-    it { targeting.hosts.must_include(host) }
+    it { _(targeting.hosts).must_include(host) }
   end
 
   context 'can delete a user' do
@@ -74,7 +74,7 @@ class TargetingTest < ActiveSupport::TestCase
       host.destroy
     end
 
-    it { targeting.reload.hosts.must_be_empty }
+    it { _(targeting.reload.hosts).must_be_empty }
   end
 
   describe '#build_query_from_hosts(ids)' do
@@ -89,9 +89,9 @@ class TargetingTest < ActiveSupport::TestCase
       let(:query) { Targeting.build_query_from_hosts([ host.id, second_host.id ]) }
 
       it 'builds query using host names joining inside ^' do
-        query.must_include host.name
-        query.must_include second_host.name
-        query.must_include 'name ^'
+        _(query).must_include host.name
+        _(query).must_include second_host.name
+        _(query).must_include 'name ^'
 
         Host.search_for(query).must_include host
         Host.search_for(query).must_include second_host
@@ -102,7 +102,7 @@ class TargetingTest < ActiveSupport::TestCase
       let(:query) { Targeting.build_query_from_hosts([ host.id ]) }
 
       it 'builds query using host name' do
-        query.must_equal "name ^ (#{host.name})"
+        _(query).must_equal "name ^ (#{host.name})"
         Host.search_for(query).must_include host
         Host.search_for(query).wont_include second_host
       end

data/test/unit/template_invocation_input_value_test.rb

@@ -31,8 +31,8 @@ class TemplateInvocationInputTest < ActiveSupport::TestCase
     template.template_inputs << FactoryBot.build(:template_input, :name => 'service_name',
                                                                   :input_type => 'user', :required => true)
     assert_valid FactoryBot.create(:template_invocation_input_value,
-                                   :template_invocation => template_invocation,
-                                   :template_input => template.template_inputs.first,
-                                   :value => 'foreman' * 1_000_000)
+      :template_invocation => template_invocation,
+      :template_input => template.template_inputs.first,
+      :value => 'foreman' * 1_000_000)
   end
 end

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';
@@ -12,18 +11,3 @@ componentRegistry.register({
 });
 
 registerReducer('foremanRemoteExecutionReducers', rootReducer);
-
-if (window.location.href.match(/job_invocations/)) {
-  const jobInvocationId = parseInt(
-    new URI(window.location.href).filename(),
-    10,
-  );
-
-  const mountJobInvocationContainer = () => {
-    mount('JobInvocationContainer', '#status_chart', {
-      url: `/job_invocations/chart?id=${jobInvocationId}`,
-    });
-  };
-
-  document.addEventListener('page:change', mountJobInvocationContainer);
-}

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.0.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -178,6 +178,7 @@ 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
@@ -204,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
@@ -242,6 +244,7 @@ files:
 - app/views/job_invocations/_host_status_td.html.erb
 - app/views/job_invocations/_preview_hosts_list.html.erb
 - app/views/job_invocations/_preview_hosts_modal.html.erb
+- app/views/job_invocations/_rerun_taxonomies.html.erb
 - app/views/job_invocations/_tab_hosts.html.erb
 - app/views/job_invocations/_tab_overview.html.erb
 - app/views/job_invocations/_tab_preview_templates.html.erb
@@ -376,6 +379,7 @@ files:
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
+- test/models/orchestration/ssh_test.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
 - test/unit/actions/run_hosts_job_test.rb
@@ -423,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
@@ -441,6 +445,7 @@ test_files:
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
+- test/models/orchestration/ssh_test.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
 - test/unit/actions/run_hosts_job_test.rb