foreman_remote_execution 4.7.0 → 5.1.0

data/webpack/JobWizard/validation.js

@@ -0,0 +1,53 @@
+import { useState, useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import {
+  selectTemplateInputs,
+  selectAdvancedTemplateInputs,
+} from './JobWizardSelectors';
+import { isPositiveNumber, isValidDate } from './steps/form/FormHelpers';
+import './JobWizard.scss';
+
+export const useValidation = ({ advancedValues, templateValues }) => {
+  const [valid, setValid] = useState({});
+  const templateInputs = useSelector(selectTemplateInputs);
+  const advancedTemplateInputs = useSelector(selectAdvancedTemplateInputs);
+  useEffect(() => {
+    setValid({
+      hostsAndInputs: true,
+      advanced: true,
+      schedule: true,
+    });
+    const inputValidation = (inputs, values, setInvalid) => {
+      inputs.forEach(({ name, required, value_type: valueType }) => {
+        const value = values[name];
+        if (required && !value) {
+          setInvalid();
+        }
+        if (value && valueType === 'date') {
+          if (!isValidDate(value) && !isValidDate(new Date(value))) {
+            setInvalid();
+          }
+        }
+      });
+    };
+    inputValidation(templateInputs, templateValues, () =>
+      setValid(currValid => ({ ...currValid, hostsAndInputs: false }))
+    );
+
+    inputValidation(advancedTemplateInputs, advancedValues.templateValues, () =>
+      setValid(currValid => ({ ...currValid, advanced: false }))
+    );
+    [
+      advancedValues.timeoutToKill,
+      advancedValues.concurrencyLevel,
+      advancedValues.timeSpan,
+    ].forEach(value => {
+      if (value && !isPositiveNumber(value)) {
+        setValid(currValid => ({ ...currValid, advanced: false }));
+      }
+    });
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [advancedValues, templateValues]);
+  return [valid, setValid];
+};

data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext/index.js

@@ -0,0 +1,2 @@
+export const useForemanOrganization = () => ({ id: 1 });
+export const useForemanLocation = () => ({ id: 2 });

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

@@ -1 +1,3 @@
+export const sprintf = (string, ...args) => [string, ...args].join(' + ');
 export const translate = s => s;
+export const documentLocale = () => 'en';

data/webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteActions.js

@@ -0,0 +1 @@
+export const resetData = payload => ({ type: 'REST_DATA', payload });

data/webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteConstants.js

@@ -0,0 +1 @@
+export const TRIGGERS = { INPUT_CHANGE: 'INPUT_CHANGE' };

data/webpack/__mocks__/foremanReact/routes/RouterSelector.js

@@ -0,0 +1 @@
+export const selectRouterLocation = jest.fn(() => ({}));

data/webpack/helpers.js

@@ -0,0 +1 @@
+export const noop = Function.prototype;

data/webpack/react_app/components/RecentJobsCard/RecentJobsCard.js

@@ -21,7 +21,8 @@ const RecentJobsCard = ({ hostDetails: { name, id } }) => {
 
   return (
     <CardTemplate
-      header={__('Recent Jobs')}
+      overrideGridProps={{ xl2: 6, xl: 8, lg: 8, md: 12 }}
+      header={__('Recent jobs')}
       dropdownItems={[
         <DropdownItem
           href={foremanUrl(`${JOB_BASE_URL}${name}`)}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,12 @@ files:
 - app/controllers/remote_execution_features_controller.rb
 - app/controllers/template_invocations_controller.rb
 - app/controllers/ui_job_wizard_controller.rb
+- app/graphql/mutations/job_invocations/create.rb
 - app/graphql/types/job_invocation.rb
+- app/graphql/types/job_invocation_input.rb
+- app/graphql/types/recurrence_input.rb
+- app/graphql/types/scheduling_input.rb
+- app/graphql/types/targeting_enum.rb
 - app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb
 - app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb
 - app/helpers/job_invocation_output_helper.rb
@@ -150,6 +155,7 @@ files:
 - app/lib/foreman_remote_execution/renderer/scope/input.rb
 - app/lib/proxy_api/remote_execution_ssh.rb
 - app/mailers/.gitkeep
+- app/mailers/rex_job_mailer.rb
 - app/models/concerns/api/v2/interfaces_controller_extensions.rb
 - app/models/concerns/foreman_remote_execution/bookmark_extensions.rb
 - app/models/concerns/foreman_remote_execution/errors_flattener.rb
@@ -177,7 +183,7 @@ files:
 - app/models/job_template_effective_user.rb
 - app/models/remote_execution_feature.rb
 - app/models/remote_execution_provider.rb
-- app/models/setting/remote_execution.rb
+- app/models/rex_mail_notification.rb
 - app/models/ssh_execution_provider.rb
 - app/models/target_remote_execution_proxy.rb
 - app/models/targeting.rb
@@ -216,6 +222,7 @@ files:
 - app/views/api/v2/template_invocations/base.json.rabl
 - app/views/api/v2/template_invocations/template_invocations.json.rabl
 - app/views/dashboard/.gitkeep
+- app/views/dashboard/_latest-jobs.html.erb
 - app/views/job_invocation_task_groups/_job_invocation_task_groups.html.erb
 - app/views/job_invocations/_card_results.html.erb
 - app/views/job_invocations/_card_schedule.html.erb
@@ -249,6 +256,8 @@ files:
 - app/views/remote_execution_features/_form.html.erb
 - app/views/remote_execution_features/index.html.erb
 - app/views/remote_execution_features/show.html.erb
+- app/views/rex_job_mailer/job_finished.html.erb
+- app/views/rex_job_mailer/job_finished.text.erb
 - app/views/template_inputs/_foreign_input_set_form.html.erb
 - app/views/template_invocations/_output_line_set.html.erb
 - app/views/template_invocations/_refresh.js.erb
@@ -312,12 +321,14 @@ files:
 - 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/migrate/20210816100932_rex_setting_category_to_dsl.rb
 - db/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb
 - db/seeds.d/60-ssh_proxy_feature.rb
 - db/seeds.d/70-job_templates.rb
 - db/seeds.d/90-bookmarks.rb
+- db/seeds.d/95-mail_notifications.rb
 - extra/cockpit/cockpit.conf.example
 - extra/cockpit/foreman-cockpit-session
 - extra/cockpit/foreman-cockpit.service
@@ -367,6 +378,7 @@ files:
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
 - test/functional/ui_job_wizard_controller_test.rb
+- test/graphql/mutations/job_invocations/create.rb
 - test/graphql/queries/job_invocation_query_test.rb
 - test/graphql/queries/job_invocations_query_test.rb
 - test/helpers/remote_execution_helper_test.rb
@@ -396,30 +408,61 @@ files:
 - webpack/JobWizard/__tests__/__snapshots__/integration.test.js.snap
 - webpack/JobWizard/__tests__/fixtures.js
 - webpack/JobWizard/__tests__/integration.test.js
+- webpack/JobWizard/__tests__/validation.test.js
+- webpack/JobWizard/autofill.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/AdvancedFields/__tests__/__snapshots__/AdvancedFields.test.js.snap
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.js
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.test.js
 - webpack/JobWizard/steps/CategoryAndTemplate/index.js
+- webpack/JobWizard/steps/HostsAndInputs/HostPreviewModal.js
+- webpack/JobWizard/steps/HostsAndInputs/HostSearch.js
+- webpack/JobWizard/steps/HostsAndInputs/SelectAPI.js
+- webpack/JobWizard/steps/HostsAndInputs/SelectGQL.js
+- webpack/JobWizard/steps/HostsAndInputs/SelectedChips.js
+- webpack/JobWizard/steps/HostsAndInputs/TemplateInputs.js
+- webpack/JobWizard/steps/HostsAndInputs/__tests__/HostsAndInputs.test.js
+- webpack/JobWizard/steps/HostsAndInputs/__tests__/TemplateInputs.test.js
+- webpack/JobWizard/steps/HostsAndInputs/buildHostQuery.js
+- webpack/JobWizard/steps/HostsAndInputs/hostgroups.gql
+- webpack/JobWizard/steps/HostsAndInputs/hosts.gql
+- webpack/JobWizard/steps/HostsAndInputs/index.js
+- webpack/JobWizard/steps/ReviewDetails/index.js
+- webpack/JobWizard/steps/Schedule/PurposeField.js
 - webpack/JobWizard/steps/Schedule/QueryType.js
+- webpack/JobWizard/steps/Schedule/RepeatCron.js
+- webpack/JobWizard/steps/Schedule/RepeatDaily.js
+- webpack/JobWizard/steps/Schedule/RepeatHour.js
+- webpack/JobWizard/steps/Schedule/RepeatMonth.js
 - webpack/JobWizard/steps/Schedule/RepeatOn.js
+- webpack/JobWizard/steps/Schedule/RepeatWeek.js
 - webpack/JobWizard/steps/Schedule/ScheduleType.js
 - webpack/JobWizard/steps/Schedule/StartEndDates.js
+- webpack/JobWizard/steps/Schedule/__tests__/Schedule.test.js
 - webpack/JobWizard/steps/Schedule/__tests__/StartEndDates.test.js
 - webpack/JobWizard/steps/Schedule/index.js
+- webpack/JobWizard/steps/form/DateTimePicker.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/ResourceSelect.js
+- webpack/JobWizard/steps/form/SearchSelect.js
 - webpack/JobWizard/steps/form/SelectField.js
-- webpack/JobWizard/steps/form/__tests__/Formatter.test.js.example
+- webpack/JobWizard/steps/form/WizardTitle.js
+- webpack/JobWizard/steps/form/__tests__/SelectSearch.test.js
+- webpack/JobWizard/submit.js
+- webpack/JobWizard/validation.js
 - webpack/Routes/routes.js
+- webpack/__mocks__/foremanReact/Root/Context/ForemanContext/index.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteActions.js
+- webpack/__mocks__/foremanReact/components/AutoComplete/AutoCompleteConstants.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/SearchBar.js
 - webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
@@ -428,8 +471,10 @@ files:
 - 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/RouterSelector.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
 - webpack/global_index.js
+- webpack/helpers.js
 - webpack/index.js
 - webpack/react_app/components/RecentJobsCard/JobStatusIcon.js
 - webpack/react_app/components/RecentJobsCard/RecentJobsCard.js
@@ -511,6 +556,7 @@ test_files:
 - test/functional/job_invocations_controller_test.rb
 - test/functional/job_templates_controller_test.rb
 - test/functional/ui_job_wizard_controller_test.rb
+- test/graphql/mutations/job_invocations/create.rb
 - test/graphql/queries/job_invocation_query_test.rb
 - test/graphql/queries/job_invocations_query_test.rb
 - test/helpers/remote_execution_helper_test.rb

data/app/models/setting/remote_execution.rb

@@ -1,88 +0,0 @@
-class Setting::RemoteExecution < Setting
-
-  ::Setting::BLANK_ATTRS.concat %w{remote_execution_ssh_password remote_execution_ssh_key_passphrase remote_execution_sudo_password remote_execution_effective_user_password remote_execution_cockpit_url remote_execution_form_job_template}
-
-  def self.default_settings
-    [
-      self.set('remote_execution_fallback_proxy',
-        N_('Search the host for any proxy with Remote Execution, useful when the host has no subnet or the subnet does not have an execution proxy'),
-        false,
-        N_('Fallback to Any Proxy')),
-      self.set('remote_execution_global_proxy',
-        N_('Search for remote execution proxy outside of the proxies assigned to the host. ' +
-        "The search will be limited to the host's organization and location."),
-        true,
-        N_('Enable Global Proxy')),
-      self.set('remote_execution_ssh_user',
-        N_('Default user to use for SSH.  You may override per host by setting a parameter called remote_execution_ssh_user.'),
-        'root',
-        N_('SSH User')),
-      self.set('remote_execution_effective_user',
-        N_('Default user to use for executing the script. If the user differs from the SSH user, su or sudo is used to switch the user.'),
-        'root',
-        N_('Effective User')),
-      self.set('remote_execution_effective_user_method',
-        N_('What command should be used to switch to the effective user. One of %s') % SSHExecutionProvider::EFFECTIVE_USER_METHODS.inspect,
-        'sudo',
-        N_('Effective User Method'),
-        nil,
-        { :collection => proc { Hash[SSHExecutionProvider::EFFECTIVE_USER_METHODS.map { |method| [method, method] }] } }),
-      self.set('remote_execution_effective_user_password', N_("Effective user password"), '', N_("Effective user password"), nil, {:encrypted => true}),
-      self.set('remote_execution_sync_templates',
-        N_('Whether we should sync templates from disk when running db:seed.'),
-        true,
-        N_('Sync Job Templates')),
-      self.set('remote_execution_ssh_port',
-        N_('Port to use for SSH communication. Default port 22. You may override per host by setting a parameter called remote_execution_ssh_port.'),
-        '22',
-        N_('SSH Port')),
-      self.set('remote_execution_connect_by_ip',
-        N_('Should the ip addresses on host interfaces be preferred over the fqdn? '\
-        'It is useful when DNS not resolving the fqdns properly. You may override this per host by setting a parameter called remote_execution_connect_by_ip. '\
-        'This setting only applies to IPv4. When the host has only an IPv6 address on the interface used for remote execution, hostname will be used even if this setting is set to true.'),
-        false,
-        N_('Connect by IP')),
-      self.set('remote_execution_ssh_password',
-        N_('Default password to use for SSH. You may override per host by setting a parameter called remote_execution_ssh_password'),
-        nil,
-        N_('Default SSH password'),
-        nil,
-        { :encrypted => true }),
-      self.set('remote_execution_ssh_key_passphrase',
-        N_('Default key passphrase to use for SSH. You may override per host by setting a parameter called remote_execution_ssh_key_passphrase'),
-        nil,
-        N_('Default SSH key passphrase'),
-        nil,
-        { :encrypted => true }),
-      self.set('remote_execution_workers_pool_size',
-        N_('Amount of workers in the pool to handle the execution of the remote execution jobs. Restart of the dynflowd/foreman-tasks service is required.'),
-        5,
-        N_('Workers pool size')),
-      self.set('remote_execution_cleanup_working_dirs',
-        N_('When enabled, working directories will be removed after task completion. You may override this per host by setting a parameter called remote_execution_cleanup_working_dirs.'),
-        true,
-        N_('Cleanup working directories')),
-      self.set('remote_execution_cockpit_url',
-        N_('Where to find the Cockpit instance for the Web Console button.  By default, no button is shown.'),
-        nil,
-        N_('Cockpit URL'),
-        nil),
-      self.set('remote_execution_form_job_template',
-        N_('Choose a job template that is pre-selected in job invocation form'),
-        'Run Command - SSH Default',
-        N_('Form Job Template'),
-        nil,
-        { :collection => proc { Hash[JobTemplate.unscoped.map { |template| [template.name, template.name] }] } }),
-      self.set('remote_execution_job_invocation_report_template',
-        N_('Select a report template used for generating a report for a particular remote execution job'),
-        'Jobs - Invocation report template',
-        N_('Job Invocation Report Template'),
-        nil,
-        { :collection => proc { self.job_invocation_report_templates_select } }),
-    ]
-  end
-
-  def self.job_invocation_report_templates_select
-    Hash[ReportTemplate.unscoped.joins(:template_inputs).where(template_inputs: TemplateInput.where(name: 'job_id')).map { |template| [template.name, template.name] }]
-  end
-end

data/webpack/JobWizard/steps/AdvancedFields/__tests__/DescriptionField.test.js

@@ -1,23 +0,0 @@
-import React from 'react';
-import { mount } from '@theforeman/test';
-import { DescriptionField } from '../DescriptionField';
-
-describe('DescriptionField', () => {
-  it('rendring', () => {
-    const component = mount(
-      <DescriptionField
-        inputs={[{ name: 'command' }]}
-        value="Run %{command}"
-        setValue={jest.fn()}
-      />
-    );
-    const preview = component.find('#description-preview').hostNodes();
-    const findLink = () => component.find('.pf-m-link.pf-m-inline');
-    expect(findLink().text()).toEqual('Edit job description template');
-    expect(preview.props().value).toEqual('Run command');
-    findLink().simulate('click');
-    const description = component.find('#description').hostNodes();
-    expect(description.props().value).toEqual('Run %{command}');
-    expect(findLink().text()).toEqual('Preview job description');
-  });
-});

data/webpack/JobWizard/steps/form/__tests__/Formatter.test.js.example

@@ -1,76 +0,0 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-import configureMockStore from 'redux-mock-store';
-import * as patternfly from '@patternfly/react-core';
-import { mount, shallow } from '@theforeman/test';
-import { formatter } from '../Formatter';
-
-jest.spyOn(patternfly, 'Select');
-jest.spyOn(patternfly, 'SelectOption');
-jest.spyOn(patternfly, 'FormGroup');
-patternfly.Select.mockImplementation(props => <div props={props} />);
-patternfly.SelectOption.mockImplementation(props => <div props={props} />);
-patternfly.FormGroup.mockImplementation(props => <div props={props} />);
-const mockStore = configureMockStore([]);
-const store = mockStore({});
-
-describe('formatter', () => {
-  it('render date input', () => {
-    const props = {
-      name: 'date adv',
-      required: false,
-      options: '',
-      advanced: true,
-      value_type: 'date',
-      resource_type: 'ansible_roles',
-      default: '',
-      hidden_value: false,
-    };
-    expect(shallow(formatter(props, {}, jest.fn()))).toMatchSnapshot();
-  });
-  it('render text input', () => {
-    const props = {
-      name: 'plain adv hidden',
-      required: true,
-      description: 'some Description',
-      options: '',
-      advanced: true,
-      value_type: 'plain',
-      resource_type: 'ansible_roles',
-      default: 'Default val',
-      hidden_value: true,
-    };
-    expect(shallow(formatter(props, {}, jest.fn()))).toMatchSnapshot();
-  });
-  it('render select input', () => {
-    const props = {
-      name: 'adv plain search',
-      required: false,
-      input_type: 'user',
-      options: 'option 1\r\noption 2\r\noption 3\r\noption 4',
-      advanced: true,
-      value_type: 'plain',
-      resource_type: 'ansible_roles',
-      default: '',
-      hidden_value: false,
-    };
-    expect(shallow(formatter(props, {}, jest.fn()))).toMatchSnapshot();
-  });
-  it('render search input', () => {
-    const props = {
-      name: 'search adv',
-      required: false,
-      options: '',
-      advanced: true,
-      value_type: 'search',
-      resource_type: 'foreman_tasks/tasks',
-      default: '',
-      hidden_value: false,
-    };
-    expect(
-      mount(
-        <Provider store={store}>{formatter(props, {}, jest.fn())}</Provider>
-      )
-    ).toMatchSnapshot();
-  });
-});