smart_proxy_dynflow 0.9.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4cbd5ee3715ae77a996375dad27d44ef2eba5bde98687c01852b63f018de384
-  data.tar.gz: f4852c006912c4d80e9ddd1f3aa846d17845dfc46a34ae047ec0dad6887d6c93
+  metadata.gz: 1d83b16dc061524ea6fd926d762b5c277ec04d67a343ee284fc07150288bc023
+  data.tar.gz: ebce0c873b7c456628669889581c4cddab8c534f81bdd4b60f36dd1de99bb9fe
 SHA512:
-  metadata.gz: af596d7d35ec2d1231864f0982f4af90944a723998e6666343ad0cda0fd5b1c470e3ece13e7d89b4940c3ae4c22099d3f31dbd46e58dd8c5a56f90e40e408995
-  data.tar.gz: be433c2faeaf439e79ef77b05c36bec2c42b44f98e524b216cc0419b2097b32481a75977aa9c34f248b21c944b5ae71a98a71e1f6b5cccf786e3d12ad14d697a
+  metadata.gz: 2f0fd0fb0fe9251accb11d7759bfd9ca1319325ac5244d5f17d53af9e887b29bbf45a95689d1cca47b218707a589d6b31e7d7b8b57bf3f92a7a7cfeb465aa2df
+  data.tar.gz: af76df1a492d8175052d8211955301390376941814c3780f70d9ade1fd9a1aaa82406f856012667d7c5dd0c9c1b08f6c90cb84c3468dcb50668c5b93e8f285c4

data/lib/smart_proxy_dynflow/action/runner.rb

@@ -63,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/api.rb

@@ -13,7 +13,7 @@ module Proxy
 
       include ::Sinatra::Authorization::Helpers
 
-      TASK_UPDATE_REGEXP_PATH = %r{/tasks/(\S+)/(update|done)}.freeze
+      TASK_UPDATE_REGEXP_PATH = %r{/tasks/(\S+)/(update|done)}
 
       before do
         if match = request.path_info.match(TASK_UPDATE_REGEXP_PATH)

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/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.3'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,29 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -108,10 +113,9 @@ 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:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,18 +123,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '4'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy
 test_files: []