foreman_remote_execution 3.1.0 → 3.3.2

data/test/unit/concerns/host_extensions_test.rb

@@ -48,6 +48,13 @@ 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/test/unit/remote_execution_provider_test.rb

@@ -149,7 +149,10 @@ class RemoteExecutionProviderTest < ActiveSupport::TestCase
         FactoryBot.create(:host) do |host|
           host.interfaces = [FactoryBot.build(:nic_managed, flags.merge(:ip => nil, :name => 'somehost.somedomain.org', :primary => true)),
                              FactoryBot.build(:nic_managed, flags.merge(:ip => '127.0.0.1'))]
-        end
+        end.reload
+        # Reassigning the interfaces triggers the on-deletion ssh key removal for the interface which is being replaced
+        # This has an undesired side effect of caching the original interface as execution one which made the tests
+        # give wrong results. Reloading the host wipes the cache
       end
 
       let(:flags) do

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -0,0 +1 @@
+export const translate = s => s;

data/webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js

@@ -0,0 +1,3 @@
+import React from 'react';
+
+export const ActionButtons = () => <div />;

data/webpack/__mocks__/foremanReact/constants.js

@@ -0,0 +1,3 @@
+export const STATUS = {
+  ERROR: 'ERROR',
+};

data/webpack/index.js

@@ -1,29 +1,16 @@
-import URI from 'urijs';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { mount, registerReducer } from 'foremanReact/common/MountingService';
-// eslint-disable-next-line import/no-extraneous-dependencies
+import { registerReducer } from 'foremanReact/common/MountingService';
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import JobInvocationContainer from './react_app/components/jobInvocations';
+import TargetingHosts from './react_app/components/TargetingHosts';
 import rootReducer from './react_app/redux/reducers';
 
-componentRegistry.register({
-  name: 'JobInvocationContainer',
-  type: JobInvocationContainer,
+const components = [
+  { name: 'JobInvocationContainer', type: JobInvocationContainer },
+  { name: 'TargetingHosts', type: TargetingHosts },
+];
+
+components.forEach(component => {
+  componentRegistry.register(component);
 });
 
 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/TargetingHosts/TargetingHosts.js

@@ -0,0 +1,52 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { LoadingState, Alert } from 'patternfly-react';
+import { STATUS } from 'foremanReact/constants';
+import HostItem from './components/HostItem';
+
+const TargetingHosts = ({ status, items }) => {
+  if (status === STATUS.ERROR) {
+    return (
+      <Alert type="error">
+        {__(
+          'There was an error while updating the status, try refreshing the page.'
+        )}
+      </Alert>
+    );
+  }
+
+  return (
+    <LoadingState loading={!items.length}>
+      <div>
+        <table className="table table-bordered table-striped table-hover">
+          <thead>
+            <tr>
+              <th>{__('Host')}</th>
+              <th>{__('Status')}</th>
+              <th>{__('Actions')}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {items.map(host => (
+              <HostItem
+                key={host.name}
+                name={host.name}
+                link={host.link}
+                status={host.status}
+                actions={host.actions}
+              />
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </LoadingState>
+  );
+};
+
+TargetingHosts.propTypes = {
+  status: PropTypes.string.isRequired,
+  items: PropTypes.array.isRequired,
+};
+
+export default TargetingHosts;

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

@@ -0,0 +1,8 @@
+import { getURI } from 'foremanReact/common/urlHelpers';
+import { get } from 'foremanReact/redux/API';
+import { withInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { TARGETING_HOSTS } from './TargetingHostsConsts';
+
+const url = getURI().addQuery('format', 'json');
+export const getData = () =>
+  withInterval(get({ key: TARGETING_HOSTS, url }), 1000);

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

@@ -0,0 +1 @@
+export const TARGETING_HOSTS = 'TARGETING_HOSTS';

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

@@ -0,0 +1,12 @@
+import {
+  selectAPIStatus,
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+import { TARGETING_HOSTS } from './TargetingHostsConsts';
+
+export const selectItems = state =>
+  selectAPIResponse(state, TARGETING_HOSTS).hosts || [];
+
+export const selectAutoRefresh = state =>
+  selectAPIResponse(state, TARGETING_HOSTS).autoRefresh;
+export const selectStatus = state => selectAPIStatus(state, TARGETING_HOSTS);

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

@@ -0,0 +1,6 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import HostItem from '../components/HostItem';
+import { HostItemFixtures } from './fixtures';
+
+describe('HostItem', () =>
+  testComponentSnapshotsWithFixtures(HostItem, HostItemFixtures));

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

@@ -0,0 +1,6 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import HostStatus from '../components/HostStatus';
+import { HostStatusFixtures } from './fixtures';
+
+describe('HostStatus', () =>
+  testComponentSnapshotsWithFixtures(HostStatus, HostStatusFixtures));

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

@@ -0,0 +1,6 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import TargetingHosts from '../TargetingHosts';
+import { TargetingHostsFixtures } from './fixtures';
+
+describe('TargetingHosts', () =>
+  testComponentSnapshotsWithFixtures(TargetingHosts, TargetingHostsFixtures));

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

@@ -0,0 +1,31 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`HostItem renders 1`] = `
+<tr
+  id="targeting-host-Host1"
+>
+  <td
+    className="host_name"
+  >
+    <a
+      href="/host1"
+    >
+      Host1
+    </a>
+  </td>
+  <td
+    className="host_status"
+  >
+    <HostStatus
+      status="success"
+    />
+  </td>
+  <td
+    className="host_actions"
+  >
+    <ActionButtons
+      buttons={Array []}
+    />
+  </td>
+</tr>
+`;

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

@@ -0,0 +1,12 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`HostStatus renders 1`] = `
+<div>
+  <Icon
+    name="ok"
+    type="pf"
+  />
+   
+  success
+</div>
+`;

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

@@ -0,0 +1,81 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TargetingHosts renders 1`] = `
+<LoadingState
+  additionalClasses=""
+  loading={false}
+  loadingText="Loading"
+  size="lg"
+  timeout={300}
+>
+  <div>
+    <table
+      className="table table-bordered table-striped table-hover"
+    >
+      <thead>
+        <tr>
+          <th>
+            Host
+          </th>
+          <th>
+            Status
+          </th>
+          <th>
+            Actions
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <HostItem
+          actions={Array []}
+          key="host"
+          link="/link"
+          name="host"
+          status="success"
+        />
+      </tbody>
+    </table>
+  </div>
+</LoadingState>
+`;
+
+exports[`TargetingHosts renders with error 1`] = `
+<Alert
+  className=""
+  onDismiss={null}
+  type="error"
+>
+  There was an error while updating the status, try refreshing the page.
+</Alert>
+`;
+
+exports[`TargetingHosts renders with loading 1`] = `
+<LoadingState
+  additionalClasses=""
+  loading={true}
+  loadingText="Loading"
+  size="lg"
+  timeout={300}
+>
+  <div>
+    <table
+      className="table table-bordered table-striped table-hover"
+    >
+      <thead>
+        <tr>
+          <th>
+            Host
+          </th>
+          <th>
+            Status
+          </th>
+          <th>
+            Actions
+          </th>
+        </tr>
+      </thead>
+      <tbody />
+    </table>
+  </div>
+</LoadingState>
+`;

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

@@ -0,0 +1,43 @@
+export const HostItemFixtures = {
+  renders: {
+    name: 'Host1',
+    link: '/host1',
+    status: 'success',
+    actions: [],
+  },
+};
+
+export const HostStatusFixtures = {
+  renders: {
+    status: 'success',
+  },
+};
+
+export const TargetingHostsFixtures = {
+  renders: {
+    status: '',
+    items: [
+      {
+        name: 'host',
+        link: '/link',
+        status: 'success',
+        actions: [],
+      },
+    ],
+  },
+  'renders with error': {
+    status: 'ERROR',
+    items: [
+      {
+        name: 'host',
+        link: '/link',
+        status: 'success',
+        actions: [],
+      },
+    ],
+  },
+  'renders with loading': {
+    status: '',
+    items: [],
+  },
+};

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

@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
+import HostStatus from './HostStatus';
+
+const HostItem = ({ name, link, status, actions }) => {
+  const hostLink = link ? (
+    <a href={link}>{name}</a>
+  ) : (
+    <a href="#" className="disabled">
+      {name}
+    </a>
+  );
+
+  return (
+    <tr id={`targeting-host-${name}`}>
+      <td className="host_name">{hostLink}</td>
+      <td className="host_status">
+        <HostStatus status={status} />
+      </td>
+      <td className="host_actions">
+        <ActionButtons buttons={[...actions]} />
+      </td>
+    </tr>
+  );
+};
+
+HostItem.propTypes = {
+  name: PropTypes.string.isRequired,
+  link: PropTypes.string.isRequired,
+  status: PropTypes.string.isRequired,
+  actions: PropTypes.array,
+};
+
+HostItem.defaultProps = {
+  actions: [],
+};
+
+export default HostItem;

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

@@ -0,0 +1,54 @@
+import React from 'react';
+import { Icon } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const HostStatus = ({ status }) => {
+  switch (status) {
+    case 'cancelled':
+      return (
+        <div>
+          <Icon type="pf" name="warning-triangle-o" /> {status}
+        </div>
+      );
+    case 'N/A':
+      return (
+        <div>
+          <Icon type="fa" name="question" /> {status}
+        </div>
+      );
+    case 'running':
+      return (
+        <div>
+          <Icon type="pf" name="running" /> {status}
+        </div>
+      );
+    case 'planned':
+      return (
+        <div>
+          <Icon type="pf" name="build" /> {status}
+        </div>
+      );
+    case 'warning':
+    case 'error':
+      return (
+        <div>
+          <Icon type="pf" name="error-circle-o" /> {__('failed')}
+        </div>
+      );
+    case 'success':
+      return (
+        <div>
+          <Icon type="pf" name="ok" /> {status}
+        </div>
+      );
+    default:
+      return <span>{status}</span>;
+  }
+};
+
+HostStatus.propTypes = {
+  status: PropTypes.string.isRequired,
+};
+
+export default HostStatus;