smart_proxy_dynflow 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2013a41681b30175177e9bcdb2bdc24186e6b6edccf3dcbdadcb5ca006f49b
-  data.tar.gz: 7c54a27ae6b0055cdd5b1189a8c89a1c644626fbe0386a9e48e3a48da3ebf71e
+  metadata.gz: 3f3493966a6909232bc66c339f43bbf92a5fe816a12fa2ecd3f2a619b6ada735
+  data.tar.gz: e5c8ef258353c72e1d453c1dce1f97e12e25c2e12a59b2fdb3a317067c179ab9
 SHA512:
-  metadata.gz: 6fb8325c06bdac95fbc2b8b3e8b59cb9cf75f43ba71a944dc1cf423a36ea7cfe7a02be1b928f6f2f21728c7de90011cc5c24867dcce58ba90e66bda6396922cc
-  data.tar.gz: 913260f459727549e5559938558f09f398dce1d78e0c7cd42ad596e9da58394d92b2f9ba9dc5dd421371cffa71ae9f4c2038db15d0ce1e6ca4290627910a61ef
+  metadata.gz: 25b9acceec9b4ba73f1e93cb8f9e0ad24fdb04d1f404304fa417c3ad84d81904f9cca562350031fbbce964bee076d5451ccde9c4a132546cc3fb7f2c9621737b
+  data.tar.gz: 6f02401a1eb65179772b0592856acb125cb53197e067d6fcabdcad98581d221052390b0bdb42fa39f1dae1e14de4d8be5b9c6aab28272423756ffeb1f72a82ac

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
 
@@ -19,11 +21,6 @@ gem 'logging-journald', '~> 2.0', :platforms => [:ruby], :require => false
 gem 'rack', '>= 1.1'
 gem 'sinatra'
 
-# load bundler.d
-Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle|
-  self.instance_eval(Bundler.read_file(bundle))
-end
-
 # load local gemfile
 local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local.rb')
 self.instance_eval(Bundler.read_file(local_gemfile)) if File.exist?(local_gemfile)

data/bundler.d/inspect_anything.rb

@@ -0,0 +1 @@
+# gem 'inspect_anything'

data/bundler.d/x.local.rb

@@ -0,0 +1 @@
+# gem 'dynflow', :path => '../dynflow'

data/lib/smart_proxy_dynflow/action/batch_callback.rb

@@ -6,7 +6,7 @@ module Proxy::Dynflow::Action
 
     def run
       payload = format_payload(input['targets'], input['results'])
-      SmartProxyDynflowCore::Callback::Request.new.callback({ :callbacks => payload }.to_json)
+      Proxy::Dynflow::Callback::Request.new.callback({ :callbacks => payload }.to_json)
     end
 
     private

data/lib/smart_proxy_dynflow/action/batch_runner.rb

@@ -7,7 +7,7 @@ module Proxy::Dynflow::Action
     end
 
     def initiate_runner
-      launcher = SmartProxyDynflowCore::TaskLauncherRegistry.fetch(input[:operation])
+      launcher = Proxy::Dynflow::TaskLauncherRegistry.fetch(input[:operation])
       launcher.runner_class.new(input[:targets], suspended_action: suspended_action)
     end
   end

data/lib/smart_proxy_dynflow/action/output_collector.rb

@@ -1,5 +1,5 @@
 module Proxy::Dynflow::Action
-  class OutputCollector < ::Proxy::Dynflow::Runner::Action
+  class OutputCollector < ::Proxy::Dynflow::Action::Runner
     def init_run
       output[:result] = []
       suspend

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/action/shareable.rb

@@ -12,14 +12,14 @@ module Proxy::Dynflow::Action
       planned_action = plan_self(input)
       # code only applicable, when run with SmartProxyDynflowCore in place
       if on_proxy? && callback
-        plan_action(SmartProxyDynflowCore::Callback::Action, callback, planned_action.output)
+        plan_action(Proxy::Dynflow::Callback::Action, callback, planned_action.output)
       end
     end
 
     private
 
     def on_proxy?
-      defined?(SmartProxyDynflowCore::Callback)
+      true
     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.0'.freeze
+    VERSION = '0.6.1'.freeze
   end
 end

metadata

@@ -1,17 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logging
+  name: dynflow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,7 +145,9 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
-- bundler.plugins.d/dynflow.rb
+- bundler.d/dynflow.rb
+- bundler.d/inspect_anything.rb
+- bundler.d/x.local.rb
 - lib/smart_proxy_dynflow.rb
 - lib/smart_proxy_dynflow/action.rb
 - lib/smart_proxy_dynflow/action/batch.rb
@@ -167,7 +197,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