foreman_remote_execution 8.1.0 → 8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a4cbf1cdf74f0bd20c4729a8bc05a7a3bb2a958bace18d30755fb600d0a999c
-  data.tar.gz: 7eac3c732b1c9b05e9c0909d952b859010cdeef677324353901859232d8ab3b0
+  metadata.gz: 13f80e6dffc1166fb7f5e423ea6543b6d89a5f8f45930c29073bf28e232bde0b
+  data.tar.gz: 0f489c08c07a1eb217feec2d1b9325f3e5c9ce248becbaf68562471aac889cd0
 SHA512:
-  metadata.gz: 42280d6aadec2d5ede443a1c81f688ce838bf388a65b4abdd30ab3d03953c33986023f0aee445e06cf908b5d6040e716a7bc8582b6059f553f400a4328ace60a
-  data.tar.gz: 3248ccc1bc2f48d61d3538f171d8f6c005b241c654ca2949833993896489bbc4d2ca2c2e0f7f0776dbd6d352f63d0fc2a292edb29f1df3cf6d402ffc16feb1c8
+  metadata.gz: 88032e02e3375cb7d19992efaad18932e7eef3948e8822dc8ad573a790ce4077273012f861b49a8351cda44f4b272b84ef0bc8e8a7124a2d2a71c759026a1d87
+  data.tar.gz: 8d0aec0264bdae9ba1530940088daeef369546a2ad9102d7d4eb1b7527f2cd1402d37915d4e9f659d845706938cd0dc7fc8299d1559c21b17cd404cdf91a22df

data/app/lib/actions/remote_execution/proxy_action.rb

@@ -21,8 +21,11 @@ module Actions
       end
 
       def process_proxy_data(data)
-        events = data['result'].map do |update|
+        events = data['result'].each_with_index.map do |update, seq_id|
           {
+            # For N-1 compatibility, we assume that the output provided here is
+            # complete
+            sequence_id: update['sequence_id'] || seq_id,
             template_invocation_id: template_invocation.id,
             event: update['output'],
             timestamp: Time.at(update['timestamp']).getlocal,
@@ -31,14 +34,15 @@ module Actions
         end
         if data['exit_status']
           events << {
+            sequence_id: events.last[:sequence_id] + 1,
             template_invocation_id: template_invocation.id,
             event: data['exit_status'],
-            timestamp: events.last[:timestamp] + 0.0001,
+            timestamp: events.last[:timestamp],
             event_type: 'exit',
           }
         end
         events.each_slice(1000) do |batch|
-          TemplateInvocationEvent.upsert_all(batch, unique_by: [:template_invocation_id, :timestamp, :event_type]) # rubocop:disable Rails/SkipsModelValidations
+          TemplateInvocationEvent.upsert_all(batch, unique_by: [:template_invocation_id, :sequence_id]) # rubocop:disable Rails/SkipsModelValidations
         end
       end
     end

data/app/lib/actions/remote_execution/run_host_job.rb

@@ -169,7 +169,7 @@ module Actions
           # This is enough, the error will get shown using add_exception at the end of the method
         end
 
-        task.template_invocation.template_invocation_events.find_each do |output|
+        task.template_invocation.template_invocation_events.order(:sequence_id).find_each do |output|
           if output.event_type == 'exit'
             continuous_output.add_output(_('Exit status: %s') % output.event, 'stdout', output.timestamp)
           else

data/db/migrate/20221129170145_redefine_template_invocation_events_index.rb

@@ -0,0 +1,36 @@
+class RedefineTemplateInvocationEventsIndex < ActiveRecord::Migration[6.0]
+  def up
+    change_table :template_invocation_events do |t|
+      t.remove_index name: :unique_template_invocation_events_index
+      t.integer :sequence_id
+    end
+
+    execute <<~SQL
+      WITH extended_t AS
+      (
+          SELECT id, row_number() over (PARTITION BY template_invocation_id ORDER BY timestamp ASC) AS rn
+          FROM template_invocation_events
+      )
+      UPDATE template_invocation_events SET sequence_id = extended_t.rn
+      FROM extended_t
+      WHERE template_invocation_events.id = extended_t.id;
+    SQL
+
+    change_table :template_invocation_events do |t|
+      t.index [:template_invocation_id, :sequence_id],
+        unique: true,
+        name: 'unique_template_invocation_events_index'
+      t.change :sequence_id, :integer, null: false
+    end
+  end
+
+  def down
+    change_table :template_invocation_events do |t|
+      t.remove_index name: :unique_template_invocation_events_index
+      t.remove :sequence_id
+      t.index [:template_invocation_id, :timestamp, :event_type],
+        unique: true,
+        name: 'unique_template_invocation_events_index'
+    end
+  end
+end

data/lib/foreman_remote_execution/engine.rb

@@ -79,7 +79,7 @@ module ForemanRemoteExecution
               type: :string,
               description: 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.'),
               default: 'root',
-              full_name: N_('Efffective User')
+              full_name: N_('Effective User')
             setting 'remote_execution_effective_user_method',
               type: :string,
               description: N_('What command should be used to switch to the effective user. One of %s') % SSHExecutionProvider::EFFECTIVE_USER_METHODS.inspect,

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '8.1.0'.freeze
+  VERSION = '8.1.1'.freeze
 end

data/webpack/JobWizard/JobWizard.js

@@ -48,7 +48,7 @@ export const JobWizard = ({ rerunData }) => {
     rerunData?.job_category || jobCategoriesResponse?.default_category || ''
   );
   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 [templateValues, setTemplateValues] = useState({});
   const [scheduleValue, setScheduleValue] = useState(initialScheduleState);
   const [selectedTargets, setSelectedTargets] = useState({
     hosts: [],
@@ -378,6 +378,7 @@ export const JobWizard = ({ rerunData }) => {
           hostsSearchQuery,
           location,
           organization,
+          feature: routerSearch?.feature,
         });
       }}
     />

data/webpack/JobWizard/JobWizard.scss

@@ -57,9 +57,6 @@
     margin: 0;
   }
   .schedule-tab {
-    .advanced-scheduling-button {
-      text-align: start;
-    }
     #repeat-on-weekly {
       display: grid;
       grid-template-columns: repeat(7, 1fr);
@@ -92,7 +89,7 @@
       display: inline-block;
       align-self: center;
     }
-    .scheudle-radio-wrapper {
+    .schedule-radio-wrapper {
       display: flex;
     }
   }

data/webpack/JobWizard/steps/Schedule/ScheduleRecurring.js

@@ -117,7 +117,7 @@ export const ScheduleRecurring = ({
                 id="start-at"
                 className="schedule-radio"
                 label={
-                  <div className="scheudle-radio-wrapper">
+                  <div className="schedule-radio-wrapper">
                     <div className="schedule-radio-title">{__('At')}</div>
                     <DateTimePicker
                       ariaLabel="starts at"
@@ -197,7 +197,7 @@ export const ScheduleRecurring = ({
                 id="ends-on"
                 className="schedule-radio"
                 label={
-                  <div className="scheudle-radio-wrapper">
+                  <div className="schedule-radio-wrapper">
                     <div className="schedule-radio-title">{__('On')}</div>
                     <DateTimePicker
                       ariaLabel="ends on"
@@ -229,7 +229,7 @@ export const ScheduleRecurring = ({
                 id="ends-after"
                 className="schedule-radio"
                 label={
-                  <div className="scheudle-radio-wrapper">
+                  <div className="schedule-radio-wrapper">
                     <div className="schedule-radio-title">{__('After')}</div>
                     <FormGroup
                       helperTextInvalid={__(

data/webpack/JobWizard/submit.js

@@ -11,6 +11,7 @@ export const submit = ({
   hostsSearchQuery,
   location,
   organization,
+  feature,
   dispatch,
 }) => {
   const {
@@ -65,7 +66,7 @@ export const submit = ({
     location,
     organization,
     job_invocation: {
-      job_template_id: jobTemplateID,
+      job_template_id: feature ? null : jobTemplateID,
       targeting_type: scheduleValue?.isTypeStatic
         ? 'static_query'
         : 'dynamic_query',
@@ -107,7 +108,7 @@ export const submit = ({
         buildHostQuery(selectedTargets, hostsSearchQuery) || 'name ~ *',
       description_format: description,
       execution_timeout_interval: timeoutToKill,
-      feature: '', // TODO add value after https://github.com/theforeman/foreman_remote_execution/pull/629
+      feature,
       time_to_pickup: timeToPickup,
     },
   };

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

@@ -6,9 +6,10 @@ export const runFeature = (hostId, feature, label) => dispatch => {
   const url = foremanUrl(
     `/job_invocations?feature=${feature}&host_ids%5B%5D=${hostId}`
   );
+  const redirectUrl = 'job_invocations/new';
 
   const successToast = ({ request }) => {
-    if (request.responseURL.includes('job_invocations?')) {
+    if (request.responseURL.includes(redirectUrl)) {
       return __('Opening job invocation form');
     }
     return sprintf(__('%s job has been invoked'), label);
@@ -21,12 +22,9 @@ export const runFeature = (hostId, feature, label) => dispatch => {
       successToast,
       errorToast,
       handleSuccess: ({ request }) => {
-        if (request.responseURL.includes('job_invocations?')) {
+        if (request.responseURL.includes(redirectUrl)) {
           // checking if user should be redicted to finish setting up the job
-          window.location.href = request.responseURL.replace(
-            'job_invocations?',
-            'job_invocations/new?'
-          );
+          window.location.href = request.responseURL;
         }
       },
     })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.1.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -329,6 +329,7 @@ files:
 - db/migrate/20220331112719_add_ssh_user_to_job_invocation.rb
 - db/migrate/20220713095705_create_template_invocation_events.rb
 - db/migrate/20220822155946_add_time_to_pickup_to_job_invocation.rb
+- db/migrate/20221129170145_redefine_template_invocation_events_index.rb
 - db/seeds.d/100-assign_features_with_templates.rb
 - db/seeds.d/20-permissions.rb
 - db/seeds.d/50-notification_blueprints.rb