foreman_remote_execution 4.5.6 → 4.6.0

data/webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.test.js

@@ -1,124 +1,52 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-import { fireEvent, screen, render, act } from '@testing-library/react';
-import * as api from 'foremanReact/redux/API';
-import { JobWizard } from '../../JobWizard';
-import * as selectors from '../../JobWizardSelectors';
-import { testSetup, mockApi } from '../../__tests__/fixtures';
-import { WIZARD_TITLES } from '../../JobWizardConstants';
-
-const store = testSetup(selectors, api);
-mockApi(api);
-jest.spyOn(selectors, 'selectCategoryError');
-jest.spyOn(selectors, 'selectAllTemplatesError');
-jest.spyOn(selectors, 'selectTemplateError');
-
-describe('Category And Template', () => {
-  it('should select ', async () => {
-    selectors.selectCategoryError.mockImplementation(() => null);
-    selectors.selectAllTemplatesError.mockImplementation(() => null);
-    selectors.selectTemplateError.mockImplementation(() => null);
-    render(
-      <Provider store={store}>
-        <JobWizard />
-      </Provider>
-    );
-
-    expect(screen.queryAllByLabelText('Error')).toHaveLength(0);
-    expect(screen.queryAllByLabelText('failed')).toHaveLength(0);
-    // Category
-    fireEvent.click(
-      screen.getByLabelText('Ansible Commands', { selector: 'button' })
-    );
-    await act(async () => {
-      await fireEvent.click(screen.getByText('Puppet'));
-    });
-    fireEvent.click(screen.getAllByText(WIZARD_TITLES.categoryAndTemplate)[0]); // to remove focus
-    expect(
-      screen.queryAllByLabelText('Ansible Commands', { selector: 'button' })
-    ).toHaveLength(0);
-    expect(
-      screen.queryAllByLabelText('Puppet', { selector: 'button' })
-    ).toHaveLength(1);
-
-    // Template
-    fireEvent.click(
-      screen.getByDisplayValue('template1', { selector: 'button' })
-    );
-    await act(async () => {
-      await fireEvent.click(screen.getByText('template2'));
-    });
-    fireEvent.click(screen.getAllByText(WIZARD_TITLES.categoryAndTemplate)[0]); // to remove focus
-    expect(
-      screen.queryAllByDisplayValue('template1', { selector: 'button' })
-    ).toHaveLength(0);
-    expect(
-      screen.queryAllByDisplayValue('template2', { selector: 'button' })
-    ).toHaveLength(1);
-  });
-  it('category error ', async () => {
-    selectors.selectCategoryError.mockImplementation(() => 'category error');
-    selectors.selectAllTemplatesError.mockImplementation(() => null);
-    selectors.selectTemplateError.mockImplementation(() => null);
-    render(
-      <Provider store={store}>
-        <JobWizard />
-      </Provider>
-    );
-
-    expect(
-      screen.queryAllByText('Categories list failed with:', { exact: false })
-    ).toHaveLength(1);
-
-    expect(
-      screen.queryAllByText('Templates list failed with:', { exact: false })
-    ).toHaveLength(0);
-    expect(
-      screen.queryAllByText('Template failed with:', { exact: false })
-    ).toHaveLength(0);
-  });
-  it('templates error ', async () => {
-    selectors.selectCategoryError.mockImplementation(() => null);
-    selectors.selectAllTemplatesError.mockImplementation(
-      () => 'templates error'
-    );
-    selectors.selectTemplateError.mockImplementation(() => null);
-    render(
-      <Provider store={store}>
-        <JobWizard />
-      </Provider>
-    );
-
-    expect(
-      screen.queryAllByText('Categories list failed with:', { exact: false })
-    ).toHaveLength(0);
-
-    expect(
-      screen.queryAllByText('Templates list failed with:', { exact: false })
-    ).toHaveLength(1);
-    expect(
-      screen.queryAllByText('Template failed with:', { exact: false })
-    ).toHaveLength(0);
-  });
-  it('template error ', async () => {
-    selectors.selectCategoryError.mockImplementation(() => null);
-    selectors.selectAllTemplatesError.mockImplementation(() => null);
-    selectors.selectTemplateError.mockImplementation(() => 'template error');
-    render(
-      <Provider store={store}>
-        <JobWizard />
-      </Provider>
-    );
-
-    expect(
-      screen.queryAllByText('Categories list failed with:', { exact: false })
-    ).toHaveLength(0);
-
-    expect(
-      screen.queryAllByText('Templates list failed with:', { exact: false })
-    ).toHaveLength(0);
-    expect(
-      screen.queryAllByText('Template failed with:', { exact: false })
-    ).toHaveLength(1);
-  });
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { CategoryAndTemplate } from './CategoryAndTemplate';
+
+const baseProps = {
+  setJobTemplate: jest.fn(),
+  selectedTemplateID: 190,
+  setCategory: jest.fn(),
+};
+const fixtures = {
+  'renders with props': {
+    ...baseProps,
+    jobCategories: [
+      'Commands',
+      'Ansible Playbook',
+      'Ansible Galaxy',
+      'Ansible Roles Installation',
+    ],
+    jobTemplates: [
+      {
+        id: 190,
+        name: 'ab Run Command - SSH Default clone',
+        job_category: 'Commands',
+        provider_type: 'SSH',
+        snippet: false,
+      },
+      {
+        id: 168,
+        name: 'Ansible Roles - Ansible Default',
+        job_category: 'Ansible Playbook',
+        provider_type: 'Ansible',
+        snippet: false,
+      },
+      {
+        id: 170,
+        name: 'Ansible Roles - Install from git',
+        job_category: 'Ansible Roles Installation',
+        provider_type: 'Ansible',
+        snippet: false,
+      },
+    ],
+    selectedCategory: 'I am a category',
+  },
+  'render with error': {
+    ...baseProps,
+    errors: { allTemplatesError: 'I have an error' },
+  },
+};
+
+describe('CategoryAndTemplate', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(CategoryAndTemplate, fixtures));
 });

data/webpack/JobWizard/steps/CategoryAndTemplate/__snapshots__/CategoryAndTemplate.test.js.snap

@@ -0,0 +1,113 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CategoryAndTemplate rendering render with error 1`] = `
+<Fragment>
+  <Title
+    headingLevel="h2"
+  >
+    Category and Template
+  </Title>
+  <Text
+    component="p"
+  >
+    All fields are required.
+  </Text>
+  <Form>
+    <SelectField
+      fieldId="job_category"
+      isDisabled={false}
+      label="Job category"
+      options={Array []}
+      placeholderText=""
+      setValue={[Function]}
+      value={null}
+    />
+    <GroupedSelectField
+      fieldId="job_template"
+      groups={Array []}
+      isDisabled={true}
+      label="Job template"
+      placeholderText="Error"
+      selected={null}
+      setSelected={[MockFunction]}
+    />
+    <Alert
+      title="Errors:"
+      variant="danger"
+    >
+      <span>
+        Templates list failed with:
+         
+        I have an error
+      </span>
+    </Alert>
+  </Form>
+</Fragment>
+`;
+
+exports[`CategoryAndTemplate rendering renders with props 1`] = `
+<Fragment>
+  <Title
+    headingLevel="h2"
+  >
+    Category and Template
+  </Title>
+  <Text
+    component="p"
+  >
+    All fields are required.
+  </Text>
+  <Form>
+    <SelectField
+      fieldId="job_category"
+      isDisabled={false}
+      label="Job category"
+      options={
+        Array [
+          "Commands",
+          "Ansible Playbook",
+          "Ansible Galaxy",
+          "Ansible Roles Installation",
+        ]
+      }
+      placeholderText=""
+      setValue={[Function]}
+      value="I am a category"
+    />
+    <GroupedSelectField
+      fieldId="job_template"
+      groups={
+        Array [
+          Object {
+            "groupLabel": "SSH",
+            "options": Array [
+              Object {
+                "label": "ab Run Command - SSH Default clone",
+                "value": 190,
+              },
+            ],
+          },
+          Object {
+            "groupLabel": "Ansible",
+            "options": Array [
+              Object {
+                "label": "Ansible Roles - Ansible Default",
+                "value": 168,
+              },
+              Object {
+                "label": "Ansible Roles - Install from git",
+                "value": 170,
+              },
+            ],
+          },
+        ]
+      }
+      isDisabled={false}
+      label="Job template"
+      placeholderText=""
+      selected="ab Run Command - SSH Default clone"
+      setSelected={[MockFunction]}
+    />
+  </Form>
+</Fragment>
+`;

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

@@ -8,7 +8,6 @@ export const helpLabel = (text, id) => {
   return (
     <Popover id={`${id}-help`} bodyContent={text} aria-label="help-text">
       <button
-        type="button"
         aria-label={__('open-help-tooltip-button')}
         onClick={e => e.preventDefault()}
         className="pf-c-form__group-label-help"

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

@@ -8,8 +8,6 @@ export const SelectField = ({
   options,
   value,
   setValue,
-  labelIcon,
-  isRequired,
   ...props
 }) => {
   const onSelect = (event, selection) => {
@@ -18,12 +16,7 @@ export const SelectField = ({
   };
   const [isOpen, setIsOpen] = useState(false);
   return (
-    <FormGroup
-      label={label}
-      fieldId={fieldId}
-      labelIcon={labelIcon}
-      isRequired={isRequired}
-    >
+    <FormGroup label={label} fieldId={fieldId}>
       <Select
         selections={value}
         onSelect={onSelect}
@@ -42,19 +35,14 @@ export const SelectField = ({
   );
 };
 SelectField.propTypes = {
-  label: PropTypes.string,
+  label: PropTypes.string.isRequired,
   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__/GroupedSelectField.test.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import * as patternfly from '@patternfly/react-core';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { GroupedSelectField } from '../GroupedSelectField';
+
+jest.spyOn(patternfly, 'Select');
+jest.spyOn(patternfly, 'SelectOption');
+patternfly.Select.mockImplementation(props => <div>{props}</div>);
+patternfly.SelectOption.mockImplementation(props => <div>{props}</div>);
+
+const fixtures = {
+  'renders with props': {
+    label: 'grouped select',
+    fieldId: 'field-id',
+    groups: [
+      {
+        groupLabel: 'Ansible',
+        options: [
+          {
+            label: 'Ansible Roles - Ansible Default',
+            value: 168,
+          },
+          {
+            label: 'Ansible Roles - Install from git',
+            value: 170,
+          },
+        ],
+      },
+    ],
+    selected: 170,
+    setSelected: jest.fn(),
+  },
+};
+
+describe('GroupedSelectField', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(GroupedSelectField, fixtures));
+});

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

@@ -0,0 +1,23 @@
+import React from 'react';
+import * as patternfly from '@patternfly/react-core';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { SelectField } from '../SelectField';
+
+jest.spyOn(patternfly, 'Select');
+jest.spyOn(patternfly, 'SelectOption');
+patternfly.Select.mockImplementation(props => <div>{props}</div>);
+patternfly.SelectOption.mockImplementation(props => <div>{props}</div>);
+const fixtures = {
+  'renders with props': {
+    label: 'grouped select',
+    fieldId: 'field-id',
+    options: ['Commands'],
+    value: 'Commands',
+    setValue: jest.fn(),
+  },
+};
+
+describe('SelectField', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(SelectField, fixtures));
+});

data/webpack/JobWizard/steps/form/__tests__/__snapshots__/GroupedSelectField.test.js.snap

@@ -0,0 +1,37 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GroupedSelectField rendering renders with props 1`] = `
+<FormGroup
+  fieldId="field-id"
+  label="grouped select"
+>
+  <mockConstructor
+    className="without_select2"
+    isGrouped={true}
+    isOpen={false}
+    menuAppendTo={[Function]}
+    onClear={[Function]}
+    onFilter={[Function]}
+    onSelect={[Function]}
+    onToggle={[Function]}
+    selections={170}
+    variant="typeahead"
+  >
+    <SelectGroup
+      key="0"
+      label="Ansible"
+    >
+      <mockConstructor
+        key="0"
+        onClick={[Function]}
+        value="Ansible Roles - Ansible Default"
+      />
+      <mockConstructor
+        key="1"
+        onClick={[Function]}
+        value="Ansible Roles - Install from git"
+      />
+    </SelectGroup>
+  </mockConstructor>
+</FormGroup>
+`;

data/webpack/JobWizard/steps/form/__tests__/__snapshots__/SelectField.test.js.snap

@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SelectField rendering renders with props 1`] = `
+<FormGroup
+  fieldId="field-id"
+  label="grouped select"
+>
+  <mockConstructor
+    className="without_select2"
+    isOpen={false}
+    maxHeight="45vh"
+    menuAppendTo={[Function]}
+    onSelect={[Function]}
+    onToggle={[Function]}
+    selections="Commands"
+  >
+    <mockConstructor
+      key="0"
+      value="Commands"
+    />
+  </mockConstructor>
+</FormGroup>
+`;

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

@@ -1,19 +1,2 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const SearchBar = ({ onChange }) => (
-  <input
-    className="foreman-search"
-    onChange={onChange}
-    placeholder="Filter..."
-  />
-);
+const SearchBar = () => jest.fn();
 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,7 +27,6 @@ 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.6
+  version: 4.6.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -44,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: foreman_remote_execution_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +157,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
@@ -179,7 +166,6 @@ 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,7 +310,6 @@ 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
@@ -381,6 +366,7 @@ 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,36 +390,27 @@ 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__/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/__snapshots__/CategoryAndTemplate.test.js.snap
 - webpack/JobWizard/steps/CategoryAndTemplate/index.js
-- webpack/JobWizard/steps/HostsAndInputs/SelectedChips.js
-- webpack/JobWizard/steps/HostsAndInputs/TemplateInputs.js
-- webpack/JobWizard/steps/HostsAndInputs/__tests__/SelectedChips.test.js
-- webpack/JobWizard/steps/HostsAndInputs/__tests__/TemplateInputs.test.js
-- webpack/JobWizard/steps/HostsAndInputs/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/WizardTitle.js
-- webpack/JobWizard/steps/form/__tests__/Formatter.test.js.example
+- 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/Routes/routes.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
@@ -527,6 +504,7 @@ 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/host_proxy_invocation.rb

@@ -1,4 +0,0 @@
-class HostProxyInvocation < ApplicationRecord
-  belongs_to :host, :class_name => 'Host::Managed', :inverse_of => :host_proxy_invocations
-  belongs_to :smart_proxy
-end

data/db/migrate/2021051713291621250977_add_host_proxy_invocations.rb

@@ -1,12 +0,0 @@
-class AddHostProxyInvocations < ActiveRecord::Migration[6.0]
-  def change
-    # rubocop:disable Rails/CreateTableWithTimestamps
-    create_table :host_proxy_invocations do |t|
-      t.references :host, :null => false
-      t.references :smart_proxy, :null => false
-    end
-    # rubocop:enable Rails/CreateTableWithTimestamps
-
-    add_index :host_proxy_invocations, [:host_id, :smart_proxy_id], unique: true
-  end
-end