smart_proxy_dynflow 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2bb41902cd0541c6537d973025ab615df030b6f9edf9a1d7938234b0b8830f1
-  data.tar.gz: '06059e08fb8a8bfb9b5bc2bfea93c27ad9ed343ea5ae7fd0355893b8ddbcf664'
+  metadata.gz: e7e0e12ddc21b25d46fe7d1ea6c7af572f98d0fff69e19ebf4764059e41a6644
+  data.tar.gz: 2326988132e96960c1739c41b1b99f53452cf3684839f97e8cb4c050459b43df
 SHA512:
-  metadata.gz: bed67548c8a5b98708b02ca0b7c40a526662e57323bd28b41820b2eb15df2b0d6963f3ccfdc10e379507f4aaaa82b081d7eb4fc31804155cd52e8e9f316f93aa
-  data.tar.gz: a701930113e81e6e9a14dad07826b239f2f73265617b9666a3610d9d19750ca2817a129f86d8741ff835cbdb68e5c1e1bfd8c907ed796e4da0069482ffe7b6d0
+  metadata.gz: bc8c5012e01624d165f801e6de4f3d0707cbdcfa42437fc0887fe10ccc89d5606813fae0fc8761c73cee40bae0ae275d0115165521f903e7ee24f90a129423bb
+  data.tar.gz: a20e4eb660064c01d2ede0c5e38ccadaded5d0feac2768865e59295b2a3ba44a47be743a3bd074f68cdb11891930bbe08f8b554033f24907b64e0d0d09bd843b

data/lib/smart_proxy_dynflow/action/middleware/assemble_results.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Proxy::Dynflow::Action::Middleware
+  class AssembleResults < ::Dynflow::Middleware
+    def present
+      unless %i[error success skipped].include?(action.run_step&.state)
+        action.output[:result] = action.output_result
+      end
+      pass
+    end
+  end
+end

data/lib/smart_proxy_dynflow/action/runner.rb

@@ -2,12 +2,16 @@
 
 require 'smart_proxy_dynflow/action/shareable'
 require 'smart_proxy_dynflow/action/external_polling'
+require 'smart_proxy_dynflow/action/middleware/assemble_results'
+
 module Proxy::Dynflow
   module Action
     class Runner < Shareable
       include ::Dynflow::Action::Cancellable
       include ::Proxy::Dynflow::Action::WithExternalPolling
 
+      middleware.use ::Proxy::Dynflow::Action::Middleware::AssembleResults
+
       def run(event = nil)
         case event
         when nil
@@ -59,6 +63,7 @@ module Proxy::Dynflow
 
       def finish_run(update)
         output[:exit_status] = update.exit_status
+        output[:exit_status_timestamp] = update.exit_status_timestamp.to_f
         output[:result] = output_result
         drop_output_chunks!
       end

data/lib/smart_proxy_dynflow/continuous_output.rb

@@ -37,18 +37,20 @@ module Proxy::Dynflow
       raw_outputs.map { |output| output['output'] }.join("\n")
     end
 
-    def add_exception(context, exception, timestamp = Time.now.getlocal)
-      add_output(context + ": #{exception.class} - #{exception.message}", 'debug', timestamp)
+    def add_exception(context, exception, timestamp: Time.now.getlocal, id: nil)
+      add_output(context + ": #{exception.class} - #{exception.message}", 'debug', timestamp: timestamp, id: id)
     end
 
-    def add_output(*args)
-      add_raw_output(self.class.format_output(*args))
+    def add_output(...)
+      add_raw_output(self.class.format_output(...))
     end
 
-    def self.format_output(message, type = 'debug', timestamp = Time.now.getlocal)
-      { 'output_type' => type,
-        'output' => message,
-        'timestamp' => timestamp.to_f }
+    def self.format_output(message, type = 'debug', timestamp: Time.now.getlocal, id: nil)
+      base = { 'output_type' => type,
+               'output' => message,
+               'timestamp' => timestamp.to_f }
+      base['id'] = id if id
+      base
     end
   end
 end

data/lib/smart_proxy_dynflow/helpers.rb

@@ -72,16 +72,10 @@ module Proxy
         end
       end
 
-      def expand_output(action)
-        hash = action.to_hash
-        hash[:output][:result] = action.output_result if action.is_a?(Proxy::Dynflow::Action::Runner)
-        hash
-      end
-
       def execution_plan_status(plan)
         actions = plan.actions.map do |action|
           refresh_output(plan, action)
-          expand_output(action)
+          action.to_hash
         end
         plan.to_hash.merge(:actions => actions)
       end

data/lib/smart_proxy_dynflow/runner/base.rb

@@ -58,8 +58,8 @@ module Proxy::Dynflow
         #   or nil for no timeout
       end
 
-      def publish_data(data, type)
-        @continuous_output.add_output(data, type)
+      def publish_data(...)
+        @continuous_output.add_output(...)
       end
 
       def publish_exception(context, exception, fatal = true)
@@ -71,6 +71,7 @@ module Proxy::Dynflow
 
       def publish_exit_status(status)
         @exit_status = status
+        @exit_status_timestamp = Time.now.utc
       end
 
       def dispatch_exception(context, exception)
@@ -90,7 +91,7 @@ module Proxy::Dynflow
       end
 
       def new_update(data, exit_status)
-        { @suspended_action => Runner::Update.new(data, exit_status) }
+        { @suspended_action => Runner::Update.new(data, exit_status, exit_status_timestamp: @exit_status_timestamp) }
       end
 
       def initialize_continuous_outputs

data/lib/smart_proxy_dynflow/runner/parent.rb

@@ -13,13 +13,13 @@ module Proxy::Dynflow
 
       def generate_updates
         base = {}
-        base[@suspended_action] = Runner::Update.new(Proxy::Dynflow::ContinuousOutput.new, @exit_status) if @exit_status
+        base[@suspended_action] = Runner::Update.new(Proxy::Dynflow::ContinuousOutput.new, @exit_status, exit_status_timestamp: @exit_status_timestamp) if @exit_status
         # Operate on all hosts if the main process ended or only on hosts for which we have updates
         @outputs.reject { |_, output| @exit_status.nil? && output.empty? }
                 .reduce(base) do |acc, (identifier, output)|
                   @outputs[identifier] = Proxy::Dynflow::ContinuousOutput.new # Create a new ContinuousOutput for next round of updates
                   exit_status = @exit_statuses[identifier] || @exit_status if @exit_status
-                  acc.merge(host_action(identifier) => Runner::Update.new(output, exit_status))
+                  acc.merge(host_action(identifier) => Runner::Update.new(output, exit_status, exit_status_timestamp: @exit_status_timestamp))
                 end
       end
 
@@ -35,16 +35,16 @@ module Proxy::Dynflow
         Dynflow::Action::Suspended.new OpenStruct.new(options)
       end
 
-      def broadcast_data(data, type)
-        @outputs.each_value { |output| output.add_output(data, type) }
+      def broadcast_data(...)
+        @outputs.each_value { |output| output.add_output(...) }
       end
 
       def publish_data(_data, _type)
         true
       end
 
-      def publish_data_for(identifier, data, type)
-        @outputs[identifier].add_output(data, type)
+      def publish_data_for(identifier, data, type, **kwargs)
+        @outputs[identifier].add_output(data, type, **kwargs)
       end
 
       def dispatch_exception(context, exception)

data/lib/smart_proxy_dynflow/runner/update.rb

@@ -7,11 +7,12 @@ module Proxy::Dynflow
     # Runner::Update represents chunk of data produced by runner that
     # can be consumed by other components, such as RunnerAction
     class Update
-      attr_reader :continuous_output, :exit_status
+      attr_reader :continuous_output, :exit_status, :exit_status_timestamp
 
-      def initialize(continuous_output, exit_status)
+      def initialize(continuous_output, exit_status, exit_status_timestamp: nil)
         @continuous_output = continuous_output
         @exit_status = exit_status
+        @exit_status_timestamp = exit_status_timestamp || Time.now.utc if @exit_status
       end
 
       def self.encode_exception(context, exception, fatal = true)

data/lib/smart_proxy_dynflow/version.rb

@@ -2,6 +2,6 @@
 
 module Proxy
   module Dynflow
-    VERSION = '0.9.2'
+    VERSION = '0.9.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -68,6 +68,7 @@ files:
 - lib/smart_proxy_dynflow/action/batch_callback.rb
 - lib/smart_proxy_dynflow/action/batch_runner.rb
 - lib/smart_proxy_dynflow/action/external_polling.rb
+- lib/smart_proxy_dynflow/action/middleware/assemble_results.rb
 - lib/smart_proxy_dynflow/action/output_collector.rb
 - lib/smart_proxy_dynflow/action/runner.rb
 - lib/smart_proxy_dynflow/action/shareable.rb
@@ -107,7 +108,7 @@ files:
 - settings.d/dynflow.yml.example
 homepage: https://github.com/theforeman/smart_proxy_dynflow
 licenses:
-- GPL-3.0
+- GPL-3.0-only
 metadata:
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy