smart_proxy_dynflow_core 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aedf4520542db023767dec95a15abf5f101e5ed4
-  data.tar.gz: 3c84a4333058d2190f1bacbf8c8613137f671614
+  metadata.gz: fe1b9027d6be956e15fb935a09a4c605af906509
+  data.tar.gz: 541d1bded54dc876f331dabcf44e89ae35996e15
 SHA512:
-  metadata.gz: 60b2d80e2f9db98f2e551685f2a3231539776f28f2b077a61b49c9ae19a63d2cc932d0486a4b7a6c3116a78d65fe66097b8615528eb1eef9332893908712ed6e
-  data.tar.gz: e44223fec0d48f399dd1dbc885334dea311c83797457a1d36e799cc2cb1852ef2aaab8c524a03427d32c4d832af9f00e7b2606786c0340ad8c9fda22187369f7
+  metadata.gz: 2f51f45104e278ce3c23f566018cd80bfb972cb6c62c58606d5c8926c7f738381e11f170b888339b582ad0274c6551de5e643bb749d29cd3b86c90940ef7f9cc
+  data.tar.gz: c860021c0d3a466a5dd630edfeedb1b1ed3e17844f591ad471426ee703e473a0adf2b93aaea0199f23e976f01fe5325fb83ddfb48607e8ab20eb67158169578e

data/lib/smart_proxy_dynflow_core/api.rb

@@ -1,6 +1,5 @@
 require 'sinatra/base'
 require 'multi_json'
-require 'dynflow'
 
 module SmartProxyDynflowCore
   class Api < ::Sinatra::Base

data/lib/smart_proxy_dynflow_core/callback.rb

@@ -1,5 +1,4 @@
 require 'rest-client'
-require 'dynflow'
 
 begin
   require 'smart_proxy_dynflow/callback'
@@ -8,6 +7,16 @@ end
 
 module SmartProxyDynflowCore
   module Callback
+    class Action < Dynflow::Action
+      def plan(callback, data)
+        plan_self(:callback => callback, :data => data)
+      end
+
+      def run
+        Request.send_to_foreman_tasks(input[:callback], input[:data])
+      end
+    end
+
     class Request
       def callback(payload)
         response = callback_resource.post(payload, :content_type => :json)

data/lib/smart_proxy_dynflow_core/core.rb

@@ -60,7 +60,7 @@ module SmartProxyDynflowCore
       def ensure_initialized
         return @instance if @instance
         @instance = Core.new
-        after_initialize_blocks.each(&:call)
+        after_initialize_blocks.each { |block| block.call(@instance) }
         @instance
       end
 

data/lib/smart_proxy_dynflow_core/helpers.rb

@@ -7,15 +7,13 @@ module SmartProxyDynflowCore
     def authorize_with_ssl_client
       if %w(yes on 1).include? request.env['HTTPS'].to_s
         if request.env['SSL_CLIENT_CERT'].to_s.empty?
-          status 403
           Log.instance.error "No client SSL certificate supplied"
-          halt MultiJson.dump(:error => "No client SSL certificate supplied")
+          halt 403, MultiJson.dump(:error => "No client SSL certificate supplied")
         else
           client_cert = OpenSSL::X509::Certificate.new(request.env['SSL_CLIENT_CERT'])
           unless SmartProxyDynflowCore::Core.instance.accepted_cert_serial == client_cert.serial
             Log.instance.error "SSL certificate with unexpected serial supplied"
-            halt MultiJson.dump(:error => "SSL certificate with unexpected serial supplied")
-            status 403
+            halt 403, MultiJson.dump(:error => "SSL certificate with unexpected serial supplied")
           end
         end
       else

data/lib/smart_proxy_dynflow_core/launcher.rb

@@ -117,6 +117,16 @@ module SmartProxyDynflowCore
         Dir[File.join(dir, 'settings.d', '*.yml')].each { |path| Settings.load_plugin_settings(path) }
         true
       end
+      ForemanTasksCore::SettingsLoader.settings_registry.keys.each do |settings_keys|
+        settings = settings_keys.inject({}) do |h, settings_key|
+          if SETTINGS.plugins.key?(settings_key.to_s)
+            h.merge(SETTINGS.plugins[settings_key.to_s].to_h)
+          else
+            h
+          end
+        end
+        ForemanTasksCore::SettingsLoader.setup_settings(settings_keys.first, settings)
+      end
     end
   end
 end

data/lib/smart_proxy_dynflow_core/log.rb

@@ -1,5 +1,4 @@
 require 'logger'
-require 'dynflow'
 
 module SmartProxyDynflowCore
   class Log < ::Logger

data/lib/smart_proxy_dynflow_core/settings.rb

@@ -69,12 +69,13 @@ module SmartProxyDynflowCore
       Log.reload!
     end
 
-    def self.load_from_proxy(settings)
+    def self.load_from_proxy(plugin)
+      settings = plugin[:class].settings.to_h
       PROXY_SETTINGS.each do |key|
         SETTINGS[key] = Proxy::SETTINGS[key]
       end
       PLUGIN_SETTINGS.each do |key|
-        SETTINGS[key] = settings[key]
+        SETTINGS[key] = settings[key] if settings.key?(key)
       end
       SETTINGS.plugins.values.each { |plugin| plugin.load_settings_from_proxy }
       Settings.loaded!

data/lib/smart_proxy_dynflow_core/version.rb

@@ -1,3 +1,3 @@
 module SmartProxyDynflowCore
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/smart_proxy_dynflow_core.rb

@@ -1,6 +1,12 @@
+require 'dynflow'
+require 'foreman_tasks_core'
 require 'smart_proxy_dynflow_core/log'
 require 'smart_proxy_dynflow_core/settings'
 require 'smart_proxy_dynflow_core/core'
 require 'smart_proxy_dynflow_core/helpers'
 require 'smart_proxy_dynflow_core/callback'
 require 'smart_proxy_dynflow_core/api'
+
+SmartProxyDynflowCore::Core.after_initialize do |dynflow_core|
+  ForemanTasksCore.dynflow_setup(dynflow_core.world)
+end

data/smart_proxy_dynflow_core.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rack-test', '~> 0')
   gem.add_development_dependency('rubocop', '0.32.1')
 
+  gem.add_runtime_dependency('foreman-tasks-core', '~> 0.1.0')
   gem.add_runtime_dependency('dynflow', "~> 0.8.4")
   gem.add_runtime_dependency('sequel')
   gem.add_runtime_dependency('sqlite3')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow_core
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.32.1
+- !ruby/object:Gem::Dependency
+  name: foreman-tasks-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement