foreman_remote_execution 7.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9183b3b81c3033d696f4aedf861cb5eed143fb9eacccb144a23d859e3ccae69
-  data.tar.gz: 4c7c6c09c84f3d4cbef2aaa8330b7bf048d42570e9319ad227c30abc5613770c
+  metadata.gz: b7c8e05850731a1f10e902deaa2e6797b869bb3363607af339e6a683225fa78a
+  data.tar.gz: b5a2001957310aeb3a7353efa65592bae1dbb3fcabb68677516220674cea94b2
 SHA512:
-  metadata.gz: b35e41908b57f97f80272070d84b8d2ceeb7e061e22ad673d07c694a643d057399e207af9c8f36d14d535a7ddb3eddefa013e04b3d63689796e66e6d9aeae88b
-  data.tar.gz: 5c0b0d79edaab4c28721ad26df27ad8ac14878e09349929d28175c2cc1714ebb1f81ceb9f4824215d781dc1b4b0662962a9043f4f56963fea4d0aaa3e2483f8d
+  metadata.gz: 03daea7eb15788a97f841d80fddeb3c40c89e79bba550ca7ef9a2eab5ad6646ec13de8d134490a5fb5171d8aeb937e792a88f62588a468613a71948cb0212ba3
+  data.tar.gz: e1ed8ff83ae15794ca4bcca7bdeb7cd7fef930f6c41394538e14fafa5fcb5f738535a3e1096bd6ee1856f3b95a4299ebdb6cf50aafa94ea233724599cea67395

data/.github/workflows/ruby_ci.yml

@@ -18,6 +18,8 @@ jobs:
         with:
           ruby-version: 2.5
           bundler-cache: true
+          cache-version: 1
+          rubygems: 3.0.0
       - name: Run rubocop
         if: github.event_name != 'push'
         run: bundle exec rubocop --format github

data/app/models/concerns/foreman_remote_execution/foreman_tasks_task_extensions.rb

@@ -4,6 +4,12 @@ module ForemanRemoteExecution
 
     included do
       has_many :job_invocations, :dependent => :destroy, :foreign_key => 'task_id'
+      has_one :template_invocation, :inverse_of => :run_host_job_task, :foreign_key => 'run_host_job_task_id', :dependent => :nullify
+      has_one :template, :through => :template_invocation
+      has_many :remote_execution_features, :through => :template
+
+      scoped_search :relation => :remote_execution_features, :on => :name, :rename => 'remote_execution_feature.name'
+      scoped_search :relation => :remote_execution_features, :on => :label, :rename => 'remote_execution_feature.label'
     end
   end
 end

data/app/models/job_template.rb

@@ -32,6 +32,8 @@ class JobTemplate < ::Template
   scoped_search :on => :snippet, :complete_value => {:true => true, :false => false}
   scoped_search :on => :provider_type, :complete_value => true
   scoped_search :on => :template
+  scoped_search :relation => :remote_execution_features, :on => :name, :rename => 'feature.name'
+  scoped_search :relation => :remote_execution_features, :on => :label, :rename => 'feature.label'
 
   # with proc support, default_scope can no longer be chained
   # include all default scoping here

data/app/models/template_invocation.rb

@@ -16,6 +16,7 @@ class TemplateInvocation < ApplicationRecord
   belongs_to :host, :class_name => 'Host::Managed', :foreign_key => :host_id
   has_one :host_group, :through => :host, :source => :hostgroup
   belongs_to :run_host_job_task, :class_name => 'ForemanTasks::Task'
+  has_many :remote_execution_features, :through => :template
 
   validates_associated :input_values
   validate :provides_required_input_values
@@ -25,6 +26,7 @@ class TemplateInvocation < ApplicationRecord
   scoped_search :relation => :host_group, :on => :name, :rename => 'host_group.name', :complete_value => true
   scoped_search :relation => :template, :on => :job_category, :complete_value => true
   scoped_search :relation => :template, :on => :name, :complete_value => true
+  scoped_search :relation => :remote_execution_features, :on => :name, :rename => 'feature'
 
   class TaskResultMap
     MAP = {

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '7.0.0'.freeze
+  VERSION = '7.1.0'.freeze
 end

data/webpack/JobWizard/steps/AdvancedFields/AdvancedFields.js

@@ -16,6 +16,7 @@ import {
   TimeSpanLevelField,
   TemplateInputsFields,
   ExecutionOrderingField,
+  SSHUserField,
 } from './Fields';
 import { DescriptionField } from './DescriptionField';
 import { WIZARD_TITLES } from '../../JobWizardConstants';
@@ -40,6 +41,14 @@ export const AdvancedFields = ({
           value={advancedValues.templateValues}
           setValue={newValue => setAdvancedValues({ templateValues: newValue })}
         />
+        <SSHUserField
+          value={advancedValues.sshUser}
+          setValue={newValue =>
+            setAdvancedValues({
+              sshUser: newValue,
+            })
+          }
+        />
         {effectiveUser?.overridable && (
           <EffectiveUserField
             value={advancedValues.effectiveUserValue}

data/webpack/JobWizard/steps/AdvancedFields/Fields.js

@@ -203,6 +203,24 @@ export const ExecutionOrderingField = ({ isRandomizedOrdering, setValue }) => (
 export const TemplateInputsFields = ({ inputs, value, setValue }) => (
   <>{inputs?.map(input => formatter(input, value, setValue))}</>
 );
+
+export const SSHUserField = ({ value, setValue }) => (
+  <FormGroup
+    label={__('SSH user')}
+    labelIcon={helpLabel(__('A user to be used for SSH.'), 'ssh-user')}
+    fieldId="ssh-user"
+  >
+    <TextInput
+      aria-label="ssh user"
+      autoComplete="ssh-user"
+      id="ssh-user"
+      type="text"
+      value={value}
+      onChange={newValue => setValue(newValue)}
+    />
+  </FormGroup>
+);
+
 EffectiveUserField.propTypes = {
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   setValue: PropTypes.func.isRequired,
@@ -240,3 +258,6 @@ TemplateInputsFields.propTypes = {
 TemplateInputsFields.defaultProps = {
   value: {},
 };
+
+SSHUserField.propTypes = EffectiveUserField.propTypes;
+SSHUserField.defaultProps = EffectiveUserField.defaultProps;

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

@@ -165,6 +165,11 @@ describe('AdvancedFields', () => {
       fireEvent.click(screen.getByText('Advanced fields'));
     });
 
+    expect(
+      screen.getByLabelText('ssh user', {
+        selector: 'input',
+      }).value
+    ).toBe('');
     expect(
       screen.getByLabelText('effective user', {
         selector: 'input',

data/webpack/JobWizard/steps/ReviewDetails/index.js

@@ -125,6 +125,7 @@ const ReviewDetails = ({
   ].filter(d => d);
 
   const advancedFields = [
+    { label: __('SSH user'), value: advancedValues.sshUser },
     { label: __('Effective user'), value: advancedValues.effectiveUserValue },
     { label: __('Description Template'), value: advancedValues.description },
     { label: __('Timeout to kill'), value: advancedValues.timeoutToKill },

data/webpack/JobWizard/submit.js

@@ -23,6 +23,7 @@ export const submit = ({
     purpose,
   } = scheduleValue;
   const {
+    sshUser,
     effectiveUserValue,
     effectiveUserPassword,
     description,
@@ -64,6 +65,7 @@ export const submit = ({
         : 'dynamic_query',
       randomized_ordering: isRandomizedOrdering,
       inputs: { ...templateValues, ...advancedTemplateValues },
+      ssh_user: sshUser,
       ssh: {
         effective_user: effectiveUserValue,
         effective_user_password: effectiveUserPassword,

data/webpack/react_app/components/FeaturesDropdown/index.js

@@ -52,7 +52,7 @@ const FeaturesDropdown = ({ hostId }) => {
       toggle={
         <DropdownToggle
           splitButtonItems={scheduleJob}
-          toggleVariant="primary"
+          toggleVariant="secondary"
           onToggle={() => setIsOpen(prev => !prev)}
           isDisabled={status === STATUS.PENDING}
           splitButtonVariant="action"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface