smart_proxy_dynflow 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c9cd93e1cf950c5f7977d700a2d8b307faa98182af93063c55ced580617d054
-  data.tar.gz: 2de7767e855c5914d6db7678ef2c2302c414a20b04cb6dd4df7294263ee00f95
+  metadata.gz: 86c46197119a24e70fc65afe7698d99473b5aaaae0eb2b32aed48523a03de021
+  data.tar.gz: ea987bf5d6797680a8c37c9e03d4872ad714254624a98195749594febdaddb06
 SHA512:
-  metadata.gz: b03995ac1c1bf44c900926371d3b42c56f05dc8b994fb07f3c87613e788a990e9ec597d67bb24a97279ae4bc0557fca01dabfbaace26299553467f8173ff8f73
-  data.tar.gz: 0d4737d0298d940988c51ba62e04c45740530660ae76c492e706459965446e984f2ddeb319651a416864636dca407d4f281029bb75da9ad747da7f6b6d71ee42
+  metadata.gz: b1fdc2770779b35094098506a8178696708a8c207e083fd1c3cd1d148fc63eca35cefdad3698e86f2915919a935ae2c560f7c250251fb1eddf91dd27ebf7e339
+  data.tar.gz: fb649ed0bf1c2d7a56f30ff29c5cc718b93832700d109a92740fd43813c0fa73be424eaa0b9d363696e9e4faae45f9bb4d1a5aa2efa5c43ca35032332f13f3eb

data/lib/smart_proxy_dynflow/api.rb

@@ -36,7 +36,8 @@ module Proxy
 
       post "/tasks/launch/?" do
         params = MultiJson.load(request.body.read)
-        launcher = launcher_class(params).new(world, callback_host(params, request), params.fetch('options', {}))
+        first_params = params['input']&.values&.first || {}
+        launcher = launcher_class(params).new(world, callback_host(first_params, request), params.fetch('options', {}))
         launcher.launch!(params['input'])
         launcher.results.to_json
       end
@@ -59,6 +60,16 @@ module Proxy
         tasks_count(params['state']).to_json
       end
 
+      post "/tasks/statuses" do
+        params = MultiJson.load(request.body.read)
+        ids = params.fetch('task_ids', [])
+        if ids.empty?
+          status 422
+          return { error: "'task_ids' needs to be provided and be a non-empty array of task UUIDs" }
+        end
+        tasks_statuses(params['task_ids']).to_json
+      end
+
       # capturing post "/tasks/:task_id/(update|done)"
       post TASK_UPDATE_REGEXP_PATH do |task_id, _action|
         data = MultiJson.load(request.body.read)
@@ -72,8 +83,13 @@ module Proxy
       private
 
       def callback_host(params, request)
-        params.fetch('action_input', {})['proxy_url'] ||
-          request.env.values_at('HTTP_X_FORWARDED_FOR', 'HTTP_HOST').compact.first
+        params.fetch('action_input', {})['proxy_url'] || callback_host_from_env(request)
+      end
+
+      def callback_host_from_env(request)
+        protocol = %w[yes on 1].include?(request.env['HTTPS'].to_s) ? 'https' : 'http'
+        host = request.env.values_at('HTTP_X_FORWARDED_FOR', 'HTTP_HOST').compact.first
+        "#{protocol}://#{host}"
       end
 
       def launcher_class(params)

data/lib/smart_proxy_dynflow/core.rb

@@ -28,8 +28,8 @@ module Proxy::Dynflow
 
       db_file = Settings.instance.database
       if db_file.nil? || db_file.empty?
-        Log.instance.warn "Could not open DB for dynflow at '#{db_file}', " \
-                          "will keep data in memory. Restart will drop all dynflow data."
+        Log.instance.info "Using in-memory database (default behaviour). Restart will drop all dynflow data. " \
+                          "To change this behaviour configure setting 'database'."
       else
         FileUtils.mkdir_p(File.dirname(db_file))
         db_conn_string += "/#{db_file}"

data/lib/smart_proxy_dynflow/helpers.rb

@@ -1,3 +1,6 @@
+require 'smart_proxy_dynflow/action/external_polling'
+require 'smart_proxy_dynflow/action/runner'
+
 module Proxy
   module Dynflow
     module Helpers
@@ -35,16 +38,19 @@ module Proxy
 
       def task_status(task_id)
         ep = world.persistence.load_execution_plan(task_id)
-        actions = ep.actions.map do |action|
-          refresh_output(ep, action)
-          expand_output(action)
-        end
-        ep.to_hash.merge(:actions => actions)
+        execution_plan_status(ep)
       rescue KeyError => _e
         status 404
         {}
       end
 
+      def tasks_statuses(task_ids)
+        eps = world.persistence.find_execution_plans(filters: { uuid: task_ids })
+        eps.reduce({}) do |acc, ep|
+          acc.update(ep.id => execution_plan_status(ep))
+        end
+      end
+
       def tasks_count(state)
         state ||= 'all'
         filter = state != 'all' ? { :filters => { :state => [state] } } : {}
@@ -69,6 +75,14 @@ module Proxy
         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)
+        end
+        plan.to_hash.merge(:actions => actions)
+      end
     end
   end
 end

data/lib/smart_proxy_dynflow/process_manager.rb

@@ -125,9 +125,15 @@ module Proxy
           return
         end
 
+        # Even though the FDs are still open, the child might have exited already
+        pid, status = Process.waitpid2(@pid, Process::WNOHANG)
+        timeout = 1 if pid
+
         ready_readers, ready_writers = IO.select(readers, writers, nil, timeout)
         (ready_readers || []).each(&:read_available!)
         (ready_writers || []).each(&:write_available!)
+
+        finish(status) if pid
       end
 
       # Sets block to be executed each time data is read from child process' standard output
@@ -156,11 +162,13 @@ module Proxy
       # Makes the process manager finish its run, closing opened FDs and reaping the child process
       #
       # @return [void]
-      def finish
+      def finish(status = nil)
         close
-        unless @pid == -1
+        if status.nil? && @pid != -1 && !done?
           _pid, status = Process.wait2(@pid)
           @status = status.exitstatus
+        elsif status
+          @status = status.exitstatus
         end
       end
     end

data/lib/smart_proxy_dynflow/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Dynflow
-    VERSION = '0.8.1'.freeze
+    VERSION = '0.9.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy