smart_proxy_dynflow 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7f3e5a2de559c96dab48e0da3b064a2339a902af0bb23935f2c5eb90a4f61a
-  data.tar.gz: '08b7073408bef24c3b0d6d358e1b5b23da954056c9fdb30740c376b05c7dc088'
+  metadata.gz: b904806b1f4b0084f948d91f800d255ecf7bca92b1ed6d78fee49761a29affc9
+  data.tar.gz: 1eb7b63daaac6fbc3bdcb24d2938a93d2bd5728bcdb934f8384f41709a072cbe
 SHA512:
-  metadata.gz: 8bd8529c02290846b47bd745920293fda07efe134b410455dee796f8e99a94d9a8a56478d313824a0659dbaee6e208f6d0dbea6392000b1f81a30a3fd10a4075
-  data.tar.gz: 231132ad10b549c2e2c5b7262f261726ec4b4d4780fa73390b18a17d1715243e50709a4416a9590edd32375ae23c5a13e41c454e8fe9524cc093714e58ea9a12
+  metadata.gz: 887d7788a14a93d693c3ec2a7ddc110fc5fd6fe62619da946f6e0d68f2ec8542b69670769d0cf9e7eafccee3af04b9bf89fef3565346d69bfa1eb4f71492b119
+  data.tar.gz: e1c2f822a02805f2136ba363d13028699dea85e05ed41ba988853c5aadf3358d5f59f65006e5404321c087aea7a96699582ba8dd1fbc8f1a67a5e09943509d2d

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gemspec :name => 'smart_proxy_dynflow_core'
+gemspec :name => 'smart_proxy_dynflow'
 
 group :development do
   gem 'pry'
@@ -8,10 +8,12 @@ end
 
 group :test do
   gem 'smart_proxy', :git => "https://github.com/theforeman/smart-proxy", :branch => "develop"
-  gem 'smart_proxy_dynflow', :path => '.'
 
+  gem 'minitest'
+  gem 'mocha'
   gem 'public_suffix'
   gem 'rack-test'
+  gem 'rake'
   gem 'rubocop', '~> 0.52.1'
 end
 

data/lib/smart_proxy_dynflow/action/runner.rb

@@ -52,6 +52,7 @@ module Proxy::Dynflow
 
       def finish_run(update)
         output[:exit_status] = update.exit_status
+        output[:result] = output_result
       end
 
       def process_external_event(event)
@@ -60,7 +61,7 @@ module Proxy::Dynflow
       end
 
       def process_update(update)
-        output[:result].concat(update.continuous_output.raw_outputs)
+        output_chunk(update.continuous_output.raw_outputs) unless update.continuous_output.raw_outputs.empty?
         if update.exit_status
           finish_run(update)
         else
@@ -71,6 +72,10 @@ module Proxy::Dynflow
       def failed_run?
         output[:exit_status] != 0
       end
+
+      def output_result
+        stored_output_chunks.map { |c| c[:chunk] }.reduce(&:concat)
+      end
     end
   end
 end

data/lib/smart_proxy_dynflow/callback.rb

@@ -2,57 +2,21 @@ require 'rest-client'
 
 module Proxy::Dynflow
   module Callback
-    class Request
-      class << self
-        def send_to_foreman_tasks(callback_info, data)
-          self.new.callback(prepare_payload(callback_info, data))
-        end
-
-        def ssl_options
-          return @ssl_options if defined? @ssl_options
-          @ssl_options = {}
-          settings = Proxy::SETTINGS
-          return @ssl_options unless URI.parse(settings.foreman_url).scheme == 'https'
-
-          @ssl_options[:verify_ssl] = OpenSSL::SSL::VERIFY_PEER
-
-          private_key_file = settings.foreman_ssl_key || settings.ssl_private_key
-          if private_key_file
-            private_key = File.read(private_key_file)
-            @ssl_options[:ssl_client_key] = OpenSSL::PKey::RSA.new(private_key)
-          end
-          certificate_file = settings.foreman_ssl_cert || settings.ssl_certificate
-          if certificate_file
-            certificate = File.read(certificate_file)
-            @ssl_options[:ssl_client_cert] = OpenSSL::X509::Certificate.new(certificate)
-          end
-          ca_file = settings.foreman_ssl_ca || settings.ssl_ca_file
-          @ssl_options[:ssl_ca_file] = ca_file if ca_file
-          @ssl_options
-        end
-        # rubocop:enable Metrics/PerceivedComplexity
-
-        private
-
-        def prepare_payload(callback, data)
-          { :callback => callback, :data => data }.to_json
-        end
+    class Request < ::Proxy::HttpRequest::ForemanRequest
+      def self.send_to_foreman_tasks(callback_info, data)
+        self.new.callback({ :callback => callback_info, :data => data }.to_json)
       end
 
       def callback(payload)
-        response = callback_resource.post(payload, :content_type => :json)
+        request = request_factory.create_post '/foreman_tasks/api/tasks/callback',
+                                              payload
+        response = send_request(request)
+
         if response.code.to_s != "200"
           raise "Failed performing callback to Foreman server: #{response.code} #{response.body}"
         end
         response
       end
-
-      private
-
-      def callback_resource
-        @resource ||= RestClient::Resource.new(Proxy::SETTINGS.foreman_url + '/foreman_tasks/api/tasks/callback',
-                                               self.class.ssl_options)
-      end
     end
 
     class Action < ::Dynflow::Action

data/lib/smart_proxy_dynflow/helpers.rb

@@ -35,7 +35,12 @@ module Proxy
 
       def task_status(task_id)
         ep = world.persistence.load_execution_plan(task_id)
-        ep.to_hash.merge(:actions => ep.actions.map(&:to_hash))
+        actions = ep.actions.map do |action|
+          hash = action.to_hash
+          hash[:output][:result] = action.output_result if action.is_a?(Proxy::Dynflow::Action::Runner)
+          hash
+        end
+        ep.to_hash.merge(:actions => actions)
       rescue KeyError => _e
         status 404
         {}

data/lib/smart_proxy_dynflow/plugin.rb

@@ -20,6 +20,9 @@ module Proxy::Dynflow
       require 'smart_proxy_dynflow/action'
       require 'smart_proxy_dynflow/task_launcher'
 
+      Proxy::Dynflow::TaskLauncherRegistry.register('single',
+                                                    Proxy::Dynflow::TaskLauncher::Single)
+
       Proxy::Dynflow::Core.ensure_initialized
     end
   end

data/lib/smart_proxy_dynflow/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Dynflow
-    VERSION = '0.5.2'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement