foreman_remote_execution 4.8.0 → 5.0.0

data/test/unit/job_template_effective_user_test.rb

@@ -4,10 +4,6 @@ class JobTemplateEffectiveUserTest < ActiveSupport::TestCase
   let(:job_template) { FactoryBot.build(:job_template, :job_category => '') }
   let(:effective_user) { job_template.effective_user }
 
-  before do
-    Setting::RemoteExecution.load_defaults
-  end
-
   describe 'by default' do
     it 'is overridable' do
       assert effective_user.overridable?

data/test/unit/remote_execution_provider_test.rb

@@ -66,10 +66,6 @@ class RemoteExecutionProviderTest < ActiveSupport::TestCase
     before { User.current = FactoryBot.build(:user, :admin) }
     after { User.current = nil }
 
-    before do
-      Setting::RemoteExecution.load_defaults
-    end
-
     let(:job_invocation) { FactoryBot.create(:job_invocation, :with_template) }
     let(:template_invocation) { job_invocation.pattern_template_invocations.first }
     let(:host) { FactoryBot.create(:host) }

data/test/unit/targeting_test.rb

@@ -77,24 +77,73 @@ class TargetingTest < ActiveSupport::TestCase
     it { _(targeting.reload.hosts).must_be_empty }
   end
 
+  describe '#resolve_hosts!' do
+    let(:second_host) { FactoryBot.create(:host) }
+    let(:infra_host) { FactoryBot.create(:host, :with_infrastructure_facet) }
+    let(:targeting) { FactoryBot.build(:targeting) }
+
+    before do
+      host
+      second_host
+      infra_host
+    end
+
+    context 'with infrastructure host permission' do
+      before do
+        setup_user('view', 'hosts')
+        setup_user('execute_jobs_on', 'infrastructure_hosts')
+      end
+
+      it 'resolves all hosts' do
+        hosts = [host, second_host, infra_host]
+        targeting.search_query = "name ^ (#{hosts.map(&:name).join(',')})"
+        targeting.user = User.current
+        targeting.resolve_hosts!
+
+        targeting.hosts.must_include host
+        targeting.hosts.must_include second_host
+        targeting.hosts.must_include infra_host
+      end
+    end
+
+    context 'without infrastructure host permission' do
+      before { setup_user('view', 'hosts') }
+
+      it 'ignores infrastructure hosts' do
+        hosts = [host, second_host, infra_host]
+        targeting.search_query = "name ^ (#{hosts.map(&:name).join(',')})"
+        targeting.user = User.current
+        targeting.resolve_hosts!
+
+        targeting.hosts.must_include host
+        targeting.hosts.must_include second_host
+        targeting.hosts.wont_include infra_host
+      end
+    end
+  end
+
   describe '#build_query_from_hosts(ids)' do
     let(:second_host) { FactoryBot.create(:host) }
+    let(:infra_host) { FactoryBot.create(:host, :with_infrastructure_facet) }
 
     before do
       host
       second_host
+      infra_host
     end
 
     context 'for two hosts' do
-      let(:query) { Targeting.build_query_from_hosts([ host.id, second_host.id ]) }
+      let(:query) { Targeting.build_query_from_hosts([ host.id, second_host.id, infra_host.id ]) }
 
       it 'builds query using host names joining inside ^' do
         _(query).must_include host.name
         _(query).must_include second_host.name
+        _(query).must_include infra_host.name
         _(query).must_include 'name ^'
 
         Host.search_for(query).must_include host
         Host.search_for(query).must_include second_host
+        Host.search_for(query).must_include infra_host
       end
     end
 
@@ -105,6 +154,7 @@ class TargetingTest < ActiveSupport::TestCase
         _(query).must_equal "name ^ (#{host.name})"
         Host.search_for(query).must_include host
         Host.search_for(query).wont_include second_host
+        Host.search_for(query).wont_include infra_host
       end
     end
 
@@ -114,6 +164,23 @@ class TargetingTest < ActiveSupport::TestCase
       it 'builds query to find all hosts' do
         Host.search_for(query).must_include host
         Host.search_for(query).must_include second_host
+        Host.search_for(query).must_include infra_host
+      end
+    end
+
+    context 'without infrastructure host permission' do
+      before { User.current = nil }
+
+      it 'ignores the infrastructure host' do
+        query = Targeting.build_query_from_hosts([host.id, second_host.id, infra_host.id])
+        _(query).must_include host.name
+        _(query).must_include second_host.name
+        _(query).wont_include infra_host.name
+        _(query).must_include 'name ^'
+
+        Host.search_for(query).must_include host
+        Host.search_for(query).must_include second_host
+        Host.search_for(query).wont_include infra_host
       end
     end
   end

data/webpack/JobWizard/JobWizard.js

@@ -4,6 +4,11 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Wizard } from '@patternfly/react-core';
 import { get } from 'foremanReact/redux/API';
 import history from 'foremanReact/history';
+
+import {
+  useForemanOrganization,
+  useForemanLocation,
+} from 'foremanReact/Root/Context/ForemanContext';
 import CategoryAndTemplate from './steps/CategoryAndTemplate/';
 import { AdvancedFields } from './steps/AdvancedFields/AdvancedFields';
 import {
@@ -11,18 +16,31 @@ import {
   WIZARD_TITLES,
   initialScheduleState,
 } from './JobWizardConstants';
-import { selectTemplateError } from './JobWizardSelectors';
+import {
+  selectTemplateError,
+  selectJobTemplate,
+  selectIsSubmitting,
+} from './JobWizardSelectors';
 import Schedule from './steps/Schedule/';
 import HostsAndInputs from './steps/HostsAndInputs/';
+import ReviewDetails from './steps/ReviewDetails/';
+import { useValidation } from './validation';
+import { useAutoFill } from './autofill';
+import { submit } from './submit';
 import './JobWizard.scss';
 
 export const JobWizard = () => {
   const [jobTemplateID, setJobTemplateID] = useState(null);
   const [category, setCategory] = useState('');
-  const [advancedValues, setAdvancedValues] = useState({});
+  const [advancedValues, setAdvancedValues] = useState({ templateValues: {} });
   const [templateValues, setTemplateValues] = useState({}); // TODO use templateValues in advanced fields - description https://github.com/theforeman/foreman_remote_execution/pull/605
-  const [selectedHosts, setSelectedHosts] = useState(['host1', 'host2']);
   const [scheduleValue, setScheduleValue] = useState(initialScheduleState);
+  const [selectedTargets, setSelectedTargets] = useState({
+    hosts: [],
+    hostCollections: [],
+    hostGroups: [],
+  });
+  const [hostsSearchQuery, setHostsSearchQuery] = useState('');
   const dispatch = useDispatch();
 
   const setDefaults = useCallback(
@@ -31,7 +49,7 @@ export const JobWizard = () => {
         template_inputs,
         advanced_template_inputs,
         effective_user,
-        job_template: { execution_timeout_interval, description_format },
+        job_template: { name, execution_timeout_interval, description_format },
       },
     }) => {
       const advancedTemplateValues = {};
@@ -52,12 +70,21 @@ export const JobWizard = () => {
             advancedTemplateValues[input.name] = input?.default || '';
           });
         }
+        const generateDefaultDescription = () => {
+          if (description_format) return description_format;
+          const allInputs = [...advancedInputs, ...inputs];
+          if (!allInputs.length) return name;
+          const inputsString = allInputs
+            .map(({ name: inputname }) => `${inputname}="%{${inputname}}"`)
+            .join(' ');
+          return `${name} with inputs ${inputsString}`;
+        };
         return {
           ...currentAdvancedValues,
           effectiveUserValue: effective_user?.value || '',
           timeoutToKill: execution_timeout_interval || '',
           templateValues: advancedTemplateValues,
-          description: description_format || '',
+          description: generateDefaultDescription() || '',
           isRandomizedOrdering: false,
         };
       });
@@ -76,8 +103,20 @@ export const JobWizard = () => {
     }
   }, [jobTemplateID, setDefaults, dispatch]);
 
+  const [valid, setValid] = useValidation({
+    advancedValues,
+    templateValues,
+  });
+  useAutoFill({
+    setSelectedTargets,
+    setHostsSearchQuery,
+  });
   const templateError = !!useSelector(selectTemplateError);
-  const isTemplate = !templateError && !!jobTemplateID;
+  const templateResponse = useSelector(selectJobTemplate);
+  const isSubmitting = useSelector(selectIsSubmitting);
+  const isTemplate =
+    !templateError && !!jobTemplateID && templateResponse.job_template;
+
   const steps = [
     {
       name: WIZARD_TITLES.categoryAndTemplate,
@@ -89,6 +128,7 @@ export const JobWizard = () => {
           setCategory={setCategory}
         />
       ),
+      enableNext: isTemplate,
     },
     {
       name: WIZARD_TITLES.hostsAndInputs,
@@ -96,11 +136,14 @@ export const JobWizard = () => {
         <HostsAndInputs
           templateValues={templateValues}
           setTemplateValues={setTemplateValues}
-          selectedHosts={selectedHosts}
-          setSelectedHosts={setSelectedHosts}
+          selected={selectedTargets}
+          setSelected={setSelectedTargets}
+          hostsSearchQuery={hostsSearchQuery}
+          setHostsSearchQuery={setHostsSearchQuery}
         />
       ),
       canJumpTo: isTemplate,
+      enableNext: isTemplate && valid.hostsAndInputs,
     },
     {
       name: WIZARD_TITLES.advanced,
@@ -113,10 +156,11 @@ export const JobWizard = () => {
               ...newValues,
             }));
           }}
-          jobTemplateID={jobTemplateID}
+          templateValues={templateValues}
         />
       ),
-      canJumpTo: isTemplate,
+      canJumpTo: isTemplate && valid.hostsAndInputs,
+      enableNext: isTemplate && valid.hostsAndInputs && valid.advanced,
     },
     {
       name: WIZARD_TITLES.schedule,
@@ -124,17 +168,41 @@ export const JobWizard = () => {
         <Schedule
           scheduleValue={scheduleValue}
           setScheduleValue={setScheduleValue}
+          setValid={newValue => {
+            setValid(currentValid => ({ ...currentValid, schedule: newValue }));
+          }}
         />
       ),
-      canJumpTo: isTemplate,
+      canJumpTo: isTemplate && valid.hostsAndInputs && valid.advanced,
+      enableNext:
+        isTemplate && valid.hostsAndInputs && valid.advanced && valid.schedule,
     },
     {
       name: WIZARD_TITLES.review,
-      component: <p>Review Details</p>,
+      component: (
+        <ReviewDetails
+          jobCategory={category}
+          jobTemplateID={jobTemplateID}
+          advancedValues={advancedValues}
+          scheduleValue={scheduleValue}
+          templateValues={templateValues}
+          selectedTargets={selectedTargets}
+          hostsSearchQuery={hostsSearchQuery}
+        />
+      ),
       nextButtonText: 'Run',
-      canJumpTo: isTemplate,
+      canJumpTo:
+        isTemplate && valid.hostsAndInputs && valid.advanced && valid.schedule,
+      enableNext:
+        isTemplate &&
+        valid.hostsAndInputs &&
+        valid.advanced &&
+        valid.schedule &&
+        !isSubmitting,
     },
   ];
+  const location = useForemanLocation();
+  const organization = useForemanOrganization();
   return (
     <Wizard
       onClose={() => history.goBack()}
@@ -142,6 +210,19 @@ export const JobWizard = () => {
       steps={steps}
       height="100%"
       className="job-wizard"
+      onSave={() => {
+        submit({
+          jobTemplateID,
+          templateValues,
+          advancedValues,
+          scheduleValue,
+          dispatch,
+          selectedTargets,
+          hostsSearchQuery,
+          location,
+          organization,
+        });
+      }}
     />
   );
 };

data/webpack/JobWizard/JobWizard.scss

@@ -3,54 +3,54 @@
     margin-bottom: 25px;
   }
 
+  .pf-c-wizard__nav.pf-m-expanded {
+    z-index: calc(
+      var(--pf-c-wizard__footer--ZIndex) + 2
+    ); // So the small screen navigation can be shown above the select box
+  }
+
   .pf-c-wizard__main {
     overflow: visible;
     z-index: calc(
       var(--pf-c-wizard__footer--ZIndex) + 1
     ); // So the select box can be shown above the wizard footer
   }
-
+  .pf-c-wizard__nav {
+    z-index: calc(
+      var(--pf-c-wizard__footer--ZIndex) + 2
+    ); // So the navigation box can be shown above the wizard body
+  }
   .pf-c-wizard__main-body {
     max-width: 500px;
     .advanced-fields-title {
       margin-bottom: 10px;
     }
-    #advanced-fields-job-template {
-      .foreman-search-field {
-        .rbt-input-hint input{
-          display: none;
-        }
-        // Giving pf3 search bar a pf4 look
-        .search-bar {
-          display: block;
-        }
-        .input-group-btn {
-          display: none;
-        }
-        li {
-          font-size: 16px;
-        }
-        input {
-          font-size: 16px;
-          height: 36px;
-        }
-        .foreman-autocomplete .autocomplete-focus-shortcut {
-          top: 8px;
-          font-size: 16px;
-        }
-        .foreman-autocomplete .autocomplete-aux {
-          top: 8px;
-          font-size: 16px;
-          .autocomplete-clear-button {
-            font-size: 16px;
-          }
-        }
-      }
-    }
+
+  }
+
+  .gray-text {
+    color: var(--pf-global--Color--dark-200);
   }
 
-  .hosts-chip-group {
-    margin-top: 8px;
+  .target-hosts-and-inputs {
+    .hosts-chip-group {
+      margin-top: 8px;
+      float: left;
+      clear: left;
+      display: block;
+    }
+    .clear-chips {
+      margin-top: 8px;
+    }
+    .pf-c-select__toggle-typeahead {
+      border: 0px;
+    }
+
+    .target-method-select {
+      .pf-c-select__toggle-wrapper {
+        flex-wrap: nowrap;
+      }
+    }
   }
   input[type='radio'],
   input[type='checkbox'] {
@@ -60,6 +60,17 @@
     .advanced-scheduling-button {
       text-align: start;
     }
+    #repeat-on-weekly {
+      display: grid;
+      grid-template-columns: repeat(7, 1fr);
+    }
+    .pf-l-grid {
+      gap: var(--pf-c-form--GridGap);
+    }
+    #repeat-on-hourly {
+      max-height: 300px;
+      overflow: scroll;
+    }
   }
 
   .pf-c-date-picker {
@@ -79,4 +90,17 @@
     min-height: 40px;
     min-width: 100px;
   }
+  #host-selection {
+    width: 500px;
+  }
+
+  .pf-c-modal-box {
+    width: auto;
+  }
+
+  .review-details {
+    .advanced-fields {
+      margin-left: 10px;
+    }
+  }
 }

data/webpack/JobWizard/JobWizardConstants.js

@@ -4,6 +4,7 @@ import { foremanUrl } from 'foremanReact/common/helpers';
 export const JOB_TEMPLATES = 'JOB_TEMPLATES';
 export const JOB_CATEGORIES = 'JOB_CATEGORIES';
 export const JOB_TEMPLATE = 'JOB_TEMPLATE';
+export const JOB_INVOCATION = 'JOB_INVOCATION';
 export const templatesUrl = foremanUrl('/api/v2/job_templates');
 
 export const repeatTypes = {
@@ -26,8 +27,34 @@ export const WIZARD_TITLES = {
 export const initialScheduleState = {
   repeatType: repeatTypes.noRepeat,
   repeatAmount: '',
-  starts: '',
+  repeatData: {},
+  startsAt: '',
+  startsBefore: '',
   ends: '',
   isFuture: false,
   isNeverEnds: false,
+  isTypeStatic: true,
+  purpose: '',
 };
+export const HOSTS_API = 'HOSTS_API';
+export const HOSTS = 'HOSTS';
+export const HOST_COLLECTIONS = 'HOST_COLLECTIONS';
+export const HOST_GROUPS = 'HOST_GROUPS';
+export const hostMethods = {
+  hosts: __('Hosts'),
+  hostCollections: __('Host collections'),
+  hostGroups: __('Host groups'),
+  searchQuery: __('Search query'),
+};
+
+export const hostQuerySearchID = 'searchBar'; // until https://projects.theforeman.org/issues/33737 is used
+export const hostsController = 'hosts';
+
+export const dataName = {
+  [HOSTS]: 'hosts',
+  [HOST_GROUPS]: 'hostgroups',
+};
+export const HOSTS_TO_PREVIEW_AMOUNT = 20;
+
+export const DEBOUNCE_HOST_COUNT = 700;
+export const HOST_IDS = 'HOST_IDS';

data/webpack/JobWizard/JobWizardSelectors.js

@@ -1,13 +1,18 @@
+import URI from 'urijs';
 import {
   selectAPIResponse,
   selectAPIStatus,
   selectAPIErrorMessage,
 } from 'foremanReact/redux/API/APISelectors';
+import { STATUS } from 'foremanReact/constants';
+import { selectRouterLocation } from 'foremanReact/routes/RouterSelector';
 
 import {
   JOB_TEMPLATES,
   JOB_CATEGORIES,
   JOB_TEMPLATE,
+  HOSTS_API,
+  JOB_INVOCATION,
 } from './JobWizardConstants';
 
 export const selectJobTemplatesStatus = state =>
@@ -22,6 +27,9 @@ export const selectJobTemplates = state =>
 export const selectJobCategories = state =>
   selectAPIResponse(state, JOB_CATEGORIES).job_categories || [];
 
+export const selectWithKatello = state =>
+  selectAPIResponse(state, JOB_CATEGORIES).with_katello || false;
+
 export const selectJobCategoriesStatus = state =>
   selectAPIStatus(state, JOB_CATEGORIES);
 
@@ -45,3 +53,27 @@ export const selectAdvancedTemplateInputs = state =>
 
 export const selectTemplateInputs = state =>
   selectAPIResponse(state, JOB_TEMPLATE).template_inputs || [];
+
+export const selectHostCount = state =>
+  selectAPIResponse(state, HOSTS_API).subtotal || 0;
+
+export const selectHosts = state =>
+  (selectAPIResponse(state, HOSTS_API).results || []).map(host => host.name);
+
+export const selectIsLoadingHosts = state =>
+  !selectAPIStatus(state, HOSTS_API) ||
+  selectAPIStatus(state, HOSTS_API) === STATUS.PENDING;
+
+export const selectResponse = selectAPIResponse;
+
+export const selectIsLoading = (state, key) =>
+  selectAPIStatus(state, key) === STATUS.PENDING;
+
+export const selectIsSubmitting = state =>
+  selectAPIStatus(state, JOB_INVOCATION) === STATUS.PENDING ||
+  selectAPIStatus(state, JOB_INVOCATION) === STATUS.RESOLVED;
+
+export const selectRouterSearch = state => {
+  const { search } = selectRouterLocation(state);
+  return URI.parseQuery(search);
+};

data/webpack/JobWizard/__tests__/fixtures.js

@@ -1,4 +1,6 @@
 import configureMockStore from 'redux-mock-store';
+import hostsQuery from '../steps/HostsAndInputs/hosts.gql';
+import hostgroupsQuery from '../steps/HostsAndInputs/hostgroups.gql';
 
 export const jobTemplate = {
   id: 178,
@@ -9,7 +11,6 @@ export const jobTemplate = {
   default: true,
   job_category: 'Ansible Commands',
   provider_type: 'Ansible',
-  description_format: 'Run %{command}',
   execution_timeout_interval: 2,
   description: null,
 };
@@ -48,6 +49,16 @@ export const jobTemplateResponse = {
       default: '',
       hidden_value: false,
     },
+    {
+      name: 'adv resource select',
+      required: false,
+      input_type: 'user',
+      value_type: 'resource',
+      advanced: true,
+      resource_type: 'ForemanTasks::Task',
+      default: '',
+      hidden_value: false,
+    },
     {
       name: 'adv search',
       required: false,
@@ -57,6 +68,7 @@ export const jobTemplateResponse = {
       resource_type: 'foreman_tasks/tasks',
       default: '',
       hidden_value: false,
+      url: 'foreman_tasks/tasks',
     },
     {
       name: 'adv date',
@@ -92,9 +104,11 @@ export const testSetup = (selectors, api) => {
   jest.spyOn(selectors, 'selectJobTemplates');
   jest.spyOn(selectors, 'selectJobCategories');
   jest.spyOn(selectors, 'selectJobCategoriesStatus');
+  jest.spyOn(selectors, 'selectWithKatello');
 
   jest.spyOn(selectors, 'selectTemplateInputs');
   jest.spyOn(selectors, 'selectAdvancedTemplateInputs');
+  selectors.selectWithKatello.mockImplementation(() => true);
   selectors.selectTemplateInputs.mockImplementation(
     () => jobTemplateResponse.template_inputs
   );
@@ -106,15 +120,31 @@ export const testSetup = (selectors, api) => {
     jobTemplate,
     { ...jobTemplate, id: 2, name: 'template2' },
   ]);
+  selectors.selectJobTemplate.mockImplementation(() => jobTemplateResponse);
   const mockStore = configureMockStore([]);
-  const store = mockStore({});
+  const store = mockStore({
+    ForemanTasksTask: {
+      response: {
+        subtotal: 10,
+        results: [
+          { id: '1', name: 'resource1' },
+          { id: '2', name: 'resource2' },
+        ],
+      },
+    },
+    HOST_COLLECTIONS: {
+      response: {
+        subtotal: 3,
+        results: [
+          { id: '74', name: 'host_collection1' },
+          { id: '43', name: 'host_collection2' },
+        ],
+      },
+    },
+  });
   return store;
 };
 
-export const mockTemplate = selectors => {
-  selectors.selectJobTemplate.mockImplementation(() => jobTemplate);
-  selectors.selectJobCategoriesStatus.mockImplementation(() => 'RESOLVED');
-};
 export const mockApi = api => {
   api.get.mockImplementation(({ handleSuccess, ...action }) => {
     if (action.key === 'JOB_CATEGORIES') {
@@ -130,7 +160,52 @@ export const mockApi = api => {
         handleSuccess({
           data: { results: [jobTemplate] },
         });
+    } else if (action.key === 'HOST_IDS') {
+      handleSuccess &&
+        handleSuccess({
+          data: { results: [{ name: 'host1' }, { name: 'host3' }] },
+        });
     }
     return { type: 'get', ...action };
   });
 };
+
+export const gqlMock = [
+  {
+    request: {
+      query: hostsQuery,
+      variables: {
+        search: 'name~"" and organization_id=1 and location_id=2',
+      },
+    },
+    result: {
+      data: {
+        hosts: {
+          totalCount: 3,
+          nodes: [{ name: 'host1' }, { name: 'host2' }, { name: 'host3' }],
+        },
+      },
+    },
+  },
+
+  {
+    request: {
+      query: hostgroupsQuery,
+      variables: {
+        search: 'name~"" and organization_id=1 and location_id=2',
+      },
+    },
+    result: {
+      data: {
+        hostgroups: {
+          totalCount: 3,
+          nodes: [
+            { name: 'host_group1' },
+            { name: 'host_group2' },
+            { name: 'host_group3' },
+          ],
+        },
+      },
+    },
+  },
+];