foreman_remote_execution 3.2.2 → 3.3.4

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/app/views/templates/ssh/package_action.erb

@@ -97,6 +97,7 @@ handle_zypp_res_codes () {
       end
     end
   -%>
+  [ -x "$(command -v subscription-manager)" ] && subscription-manager refresh
   apt-get -y update
   apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y <%= action %> <%= input("package") %>
 <% elsif package_manager == 'zypper' -%>

data/app/views/templates/ssh/puppet_agent_disable.erb

@@ -13,4 +13,7 @@ template_inputs:
 provider_type: SSH
 kind: job_template
 -%>
+<% if @host.operatingsystem.family == 'Debian' -%>
+export PATH=/opt/puppetlabs/bin:$PATH
+<% end -%>
 puppet agent --disable "<%= input("comment").present? ? input("comment") : "Disabled using Foreman Remote Execution"  %> - <%= current_user %> - $(date "+%d/%m/%Y %H:%M")"

data/app/views/templates/ssh/puppet_agent_enable.erb

@@ -7,4 +7,7 @@ snippet: false
 provider_type: SSH
 kind: job_template
 -%>
+<% if @host.operatingsystem.family == 'Debian' -%>
+export PATH=/opt/puppetlabs/bin:$PATH
+<% end -%>
 puppet agent --enable

data/app/views/templates/ssh/puppet_install_modules_from_forge.erb

@@ -33,4 +33,7 @@ template_inputs:
 provider_type: SSH
 kind: job_template
 -%>
+<% if @host.operatingsystem.family == 'Debian' -%>
+export PATH=/opt/puppetlabs/bin:$PATH
+<% end -%>
 puppet module install <%= input('puppet_module') %> <%= "--target-dir #{input('target_dir')}" if input('target_dir').present? %> <%= "--version #{input('version')}" if input('version').present? %> <%= "--force" if input('force') == "true" %> <%= "--ignore-dependencies" if input('ignore_dependencies') == "true" %>

data/app/views/templates/ssh/puppet_run_once.erb

@@ -11,4 +11,7 @@ template_inputs:
   input_type: user
   required: false
 %>
+<% if @host.operatingsystem.family == 'Debian' -%>
+export PATH=/opt/puppetlabs/bin:$PATH
+<% end -%>
 puppet agent --onetime --no-usecacheonfailure --no-daemonize <%= input("puppet_options") %>

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,10 +15,9 @@ 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")
@@ -30,6 +29,6 @@ Gem::Specification.new do |s|
   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/version.rb

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

data/locale/action_names.rb

@@ -3,4 +3,3 @@ _("Action with sub plans")
 _("Import facts")
 _("Import Puppet classes")
 _("Remote action:")
-

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/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,14 +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);

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: [],
+  },
+};