foreman_remote_execution 4.5.0 → 4.5.4

data/webpack/JobWizard/steps/form/SelectField.js

@@ -8,6 +8,8 @@ export const SelectField = ({
   options,
   value,
   setValue,
+  labelIcon,
+  isRequired,
   ...props
 }) => {
   const onSelect = (event, selection) => {
@@ -16,7 +18,12 @@ export const SelectField = ({
   };
   const [isOpen, setIsOpen] = useState(false);
   return (
-    <FormGroup label={label} fieldId={fieldId}>
+    <FormGroup
+      label={label}
+      fieldId={fieldId}
+      labelIcon={labelIcon}
+      isRequired={isRequired}
+    >
       <Select
         selections={value}
         onSelect={onSelect}
@@ -35,14 +42,19 @@ export const SelectField = ({
   );
 };
 SelectField.propTypes = {
-  label: PropTypes.string.isRequired,
+  label: PropTypes.string,
   fieldId: PropTypes.string.isRequired,
   options: PropTypes.array,
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   setValue: PropTypes.func.isRequired,
+  labelIcon: PropTypes.node,
+  isRequired: PropTypes.bool,
 };
 
 SelectField.defaultProps = {
+  label: null,
   options: [],
+  labelIcon: null,
   value: null,
+  isRequired: false,
 };

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

@@ -0,0 +1,76 @@
+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();
+  });
+});

data/webpack/__mocks__/foremanReact/components/SearchBar.js

@@ -1,2 +1,19 @@
-const SearchBar = () => jest.fn();
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const SearchBar = ({ onChange }) => (
+  <input
+    className="foreman-search"
+    onChange={onChange}
+    placeholder="Filter..."
+  />
+);
 export default SearchBar;
+
+SearchBar.propTypes = {
+  onChange: PropTypes.func,
+};
+
+SearchBar.defaultProps = {
+  onChange: () => null,
+};

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

@@ -27,6 +27,7 @@ exports[`TargetingHostsPage renders 1`] = `
             "controller": "hosts",
           }
         }
+        onChange={[Function]}
         onSearch={[Function]}
       />
     </Col>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.4
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -171,7 +171,6 @@ 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
@@ -180,6 +179,7 @@ files:
 - app/models/concerns/foreman_remote_execution/template_overrides.rb
 - app/models/concerns/foreman_remote_execution/user_extensions.rb
 - app/models/foreign_input_set.rb
+- app/models/host_proxy_invocation.rb
 - app/models/host_status/execution_status.rb
 - app/models/input_template_renderer.rb
 - app/models/invocation_provider_input_value.rb
@@ -324,6 +324,7 @@ files:
 - db/migrate/20200623073022_rename_sudo_password_to_effective_user_password.rb
 - 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/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb
@@ -380,7 +381,6 @@ files:
 - test/functional/job_templates_controller_test.rb
 - test/functional/ui_job_wizard_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
-- test/models/orchestration/ssh_test.rb
 - test/support/remote_execution_helper.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
@@ -404,27 +404,30 @@ files:
 - webpack/JobWizard/JobWizard.scss
 - webpack/JobWizard/JobWizardConstants.js
 - webpack/JobWizard/JobWizardSelectors.js
-- webpack/JobWizard/__tests__/JobWizard.test.js
-- webpack/JobWizard/__tests__/__snapshots__/JobWizard.test.js.snap
 - webpack/JobWizard/__tests__/__snapshots__/integration.test.js.snap
 - webpack/JobWizard/__tests__/fixtures.js
 - webpack/JobWizard/__tests__/integration.test.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__/__snapshots__/AdvancedFields.test.js.snap
+- webpack/JobWizard/steps/AdvancedFields/__tests__/DescriptionField.test.js
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.js
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.test.js
-- webpack/JobWizard/steps/CategoryAndTemplate/__snapshots__/CategoryAndTemplate.test.js.snap
 - webpack/JobWizard/steps/CategoryAndTemplate/index.js
+- webpack/JobWizard/steps/Schedule/QueryType.js
+- webpack/JobWizard/steps/Schedule/RepeatOn.js
+- webpack/JobWizard/steps/Schedule/ScheduleType.js
+- webpack/JobWizard/steps/Schedule/StartEndDates.js
+- webpack/JobWizard/steps/Schedule/__tests__/StartEndDates.test.js
+- webpack/JobWizard/steps/Schedule/index.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/SelectField.js
-- webpack/JobWizard/steps/form/__tests__/GroupedSelectField.test.js
-- webpack/JobWizard/steps/form/__tests__/SelectField.test.js
-- webpack/JobWizard/steps/form/__tests__/__snapshots__/GroupedSelectField.test.js.snap
-- webpack/JobWizard/steps/form/__tests__/__snapshots__/SelectField.test.js.snap
+- webpack/JobWizard/steps/form/__tests__/Formatter.test.js.example
 - webpack/Routes/routes.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
@@ -518,7 +521,6 @@ test_files:
 - test/functional/job_templates_controller_test.rb
 - test/functional/ui_job_wizard_controller_test.rb
 - test/helpers/remote_execution_helper_test.rb
-- test/models/orchestration/ssh_test.rb
 - test/support/remote_execution_helper.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb

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

@@ -1,70 +0,0 @@
-module ForemanRemoteExecution
-  module Orchestration::SSH
-    extend ActiveSupport::Concern
-
-    included do
-      before_destroy :ssh_destroy
-      after_validation :queue_ssh_destroy
-      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?
-
-      proxy = ::SmartProxy.find(proxy_id)
-      begin
-        proxy.drop_host_from_known_hosts(target)
-      rescue ::ProxyAPI::ProxyException => e
-        if e.wrapped_exception.is_a?(RestClient::NotFound)
-          # ignore 404 when known_hosts entry is missing or the module was not enabled
-          Foreman::Logging.exception "Proxy failed to delete SSH known_hosts for #{name}, #{ip}", e, :level => :error
-        else
-          raise e
-        end
-      rescue => e
-        Rails.logger.warn e.message
-        return false
-      end
-      true
-    end
-
-    def ssh_destroy
-      logger.debug "Scheduling SSH known_hosts cleanup"
-
-      host, _kind, _target = host_kind_target
-      # #remote_execution_proxies may not be defined on the host object in some case
-      # for example Host::Discovered does not have it defined, even though these hosts
-      # have Nic::Managed interfaces associated with them
-      proxies = (host.try(: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])
-      end
-    end
-
-    def queue_ssh_destroy
-      should_drop_from_known_hosts? && ssh_destroy
-    end
-
-    def should_drop_from_known_hosts?
-      host, = host_kind_target
-      host && !host.new_record? && host.build && host.changes.key?('build')
-    end
-
-    private
-
-    def host_kind_target
-      if self.is_a?(::Host::Base)
-        [self, 'host', name]
-      else
-        [self.host, 'interface', ip]
-      end
-    end
-
-    def queue_id(proxy_id)
-      _, kind, id = host_kind_target
-      "ssh_remove_known_hosts_#{kind}_#{id}_#{proxy_id}"
-    end
-  end
-end

data/test/models/orchestration/ssh_test.rb

@@ -1,56 +0,0 @@
-require 'test_plugin_helper'
-
-class SSHOrchestrationTest < ActiveSupport::TestCase
-  let(:host) { FactoryBot.create(:host, :managed, :with_subnet) }
-  let(:proxy) { FactoryBot.create(:smart_proxy, :ssh) }
-  let(:interface) { host.interfaces.first }
-
-  before { interface.subnet.remote_execution_proxies = [proxy] }
-
-  it 'attempts to drop IP address and hostname from smart proxies on destroy' 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.destroy
-  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
-    ::ProxyAPI::RemoteExecutionSSH.any_instance.expects(:delete).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/webpack/JobWizard/__tests__/JobWizard.test.js

@@ -1,13 +0,0 @@
-import React from 'react';
-import * as patternfly from '@patternfly/react-core';
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-import JobWizardPage from '../index';
-
-jest.spyOn(patternfly, 'Wizard');
-patternfly.Wizard.mockImplementation(props => <div>{props.navAriaLabel}</div>);
-
-const fixtures = {
-  'renders ': {},
-};
-describe('JobWizardPage rendering', () =>
-  testComponentSnapshotsWithFixtures(JobWizardPage, fixtures));

data/webpack/JobWizard/__tests__/__snapshots__/JobWizard.test.js.snap

@@ -1,32 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`JobWizardPage rendering renders  1`] = `
-<PageLayout
-  breadcrumbOptions={
-    Object {
-      "breadcrumbItems": Array [
-        Object {
-          "caption": "Jobs",
-          "url": "/jobs",
-        },
-        Object {
-          "caption": "Run job",
-        },
-      ],
-    }
-  }
-  header="Run job"
-  searchable={false}
->
-  <Title
-    headingLevel="h2"
-    size="2xl"
-  >
-    Run job
-  </Title>
-  <Divider
-    component="div"
-  />
-  <JobWizard />
-</PageLayout>
-`;

data/webpack/JobWizard/steps/AdvancedFields/__tests__/__snapshots__/AdvancedFields.test.js.snap

@@ -1,249 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AdvancedFields rendring 1`] = `
-<Provider
-  store={
-    Object {
-      "clearActions": [Function],
-      "dispatch": [Function],
-      "getActions": [Function],
-      "getState": [Function],
-      "replaceReducer": [Function],
-      "subscribe": [Function],
-    }
-  }
->
-  <AdvancedFields
-    advancedValues={Object {}}
-    setAdvancedValues={[MockFunction]}
-  >
-    <Title
-      className="advanced-fields-title"
-      headingLevel="h2"
-    >
-      <h2
-        className="pf-c-title pf-m-xl advanced-fields-title"
-      >
-        Advanced Fields
-      </h2>
-    </Title>
-    <Form>
-      <form
-        className="pf-c-form"
-        noValidate={true}
-      >
-        <EffectiveUserField
-          setValue={[Function]}
-          value=""
-        >
-          <mockConstructor
-            fieldId="effective-user"
-            label="Effective user"
-            labelIcon={
-              <Popover
-                aria-label="help-text"
-                bodyContent="A user to be used for executing the script. If it differs from the SSH user, su or sudo is used to switch the accounts."
-                id="effective-user-help"
-              >
-                <button
-                  aria-label="open-help-tooltip-button"
-                  className="pf-c-form__group-label-help"
-                  onClick={[Function]}
-                >
-                  <HelpIcon
-                    color="currentColor"
-                    noVerticalAlign={true}
-                    size="sm"
-                  />
-                </button>
-              </Popover>
-            }
-          >
-            <div />
-          </mockConstructor>
-        </EffectiveUserField>
-        <TimeoutToKillField
-          setValue={[Function]}
-          value=""
-        >
-          <mockConstructor
-            fieldId="timeout-to-kill"
-            label="Timeout to kill"
-            labelIcon={
-              <Popover
-                aria-label="help-text"
-                bodyContent="Time in seconds from the start on the remote host after which the job should be killed."
-                id="timeout-to-kill-help"
-              >
-                <button
-                  aria-label="open-help-tooltip-button"
-                  className="pf-c-form__group-label-help"
-                  onClick={[Function]}
-                >
-                  <HelpIcon
-                    color="currentColor"
-                    noVerticalAlign={true}
-                    size="sm"
-                  />
-                </button>
-              </Popover>
-            }
-          >
-            <div />
-          </mockConstructor>
-        </TimeoutToKillField>
-        <PasswordField
-          setValue={[Function]}
-          value=""
-        >
-          <mockConstructor
-            fieldId="password"
-            label="Password"
-            labelIcon={
-              <Popover
-                aria-label="help-text"
-                bodyContent="Password is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution."
-                id="password-help"
-              >
-                <button
-                  aria-label="open-help-tooltip-button"
-                  className="pf-c-form__group-label-help"
-                  onClick={[Function]}
-                >
-                  <HelpIcon
-                    color="currentColor"
-                    noVerticalAlign={true}
-                    size="sm"
-                  />
-                </button>
-              </Popover>
-            }
-          >
-            <div />
-          </mockConstructor>
-        </PasswordField>
-        <KeyPassphraseField
-          setValue={[Function]}
-          value=""
-        >
-          <mockConstructor
-            fieldId="key-passphrase"
-            label="Private key passphrase"
-            labelIcon={
-              <Popover
-                aria-label="help-text"
-                bodyContent="Key passphrase is only applicable for SSH provider. Other providers ignore this field. Passphrase is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution."
-                id="key-passphrase-help"
-              >
-                <button
-                  aria-label="open-help-tooltip-button"
-                  className="pf-c-form__group-label-help"
-                  onClick={[Function]}
-                >
-                  <HelpIcon
-                    color="currentColor"
-                    noVerticalAlign={true}
-                    size="sm"
-                  />
-                </button>
-              </Popover>
-            }
-          >
-            <div />
-          </mockConstructor>
-        </KeyPassphraseField>
-        <EffectiveUserPasswordField
-          setValue={[Function]}
-          value=""
-        >
-          <mockConstructor
-            fieldId="effective-user-password"
-            label="Effective user password"
-            labelIcon={
-              <Popover
-                aria-label="help-text"
-                bodyContent="Effective user password is only applicable for SSH provider. Other providers ignore this field. Password is stored encrypted in DB until the job finishes. For future or recurring executions, it is removed after the last execution."
-                id="effective-user-password-help"
-              >
-                <button
-                  aria-label="open-help-tooltip-button"
-                  className="pf-c-form__group-label-help"
-                  onClick={[Function]}
-                >
-                  <HelpIcon
-                    color="currentColor"
-                    noVerticalAlign={true}
-                    size="sm"
-                  />
-                </button>
-              </Popover>
-            }
-          >
-            <div />
-          </mockConstructor>
-        </EffectiveUserPasswordField>
-        <ConcurrencyLevelField
-          setValue={[Function]}
-          value=""
-        >
-          <mockConstructor
-            fieldId="concurrency-level"
-            label="Concurrency level"
-            labelIcon={
-              <Popover
-                aria-label="help-text"
-                bodyContent="Run at most N tasks at a time. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
-                id="concurrency-level-help"
-              >
-                <button
-                  aria-label="open-help-tooltip-button"
-                  className="pf-c-form__group-label-help"
-                  onClick={[Function]}
-                >
-                  <HelpIcon
-                    color="currentColor"
-                    noVerticalAlign={true}
-                    size="sm"
-                  />
-                </button>
-              </Popover>
-            }
-          >
-            <div />
-          </mockConstructor>
-        </ConcurrencyLevelField>
-        <TimeSpanLevelField
-          setValue={[Function]}
-          value=""
-        >
-          <mockConstructor
-            fieldId="time-span"
-            label="Time span"
-            labelIcon={
-              <Popover
-                aria-label="help-text"
-                bodyContent="Distribute execution over N seconds. If this is set and proxy batch triggering is enabled, then tasks are triggered on the smart proxy in batches of size 1."
-                id="time-span-help"
-              >
-                <button
-                  aria-label="open-help-tooltip-button"
-                  className="pf-c-form__group-label-help"
-                  onClick={[Function]}
-                >
-                  <HelpIcon
-                    color="currentColor"
-                    noVerticalAlign={true}
-                    size="sm"
-                  />
-                </button>
-              </Popover>
-            }
-          >
-            <div />
-          </mockConstructor>
-        </TimeSpanLevelField>
-      </form>
-    </Form>
-  </AdvancedFields>
-</Provider>
-`;