smart_proxy_dynflow 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f221eefabe56231e87a47f714392de1ed7950a71
-  data.tar.gz: 28285f63711d4a1d09870fed5eb370f50c0018ed
+  metadata.gz: 70eb62fce2c543540e5d04d827b1ec194bfac33a
+  data.tar.gz: 14c6c306bba19a1cd0713d9dcc3e2a511cf7d939
 SHA512:
-  metadata.gz: 4576962a886a5796893d6aab6abe8c93880012bf1ddfb35f0d6054e74807ef43e050b05ca9b6239f5939a1f398834cb6fff17b4081eb175aeced8a2719f78f2d
-  data.tar.gz: a489339da001945d82eecbe42ab6293d60b19df310d8b672348b79e8fcd5a4fa69a53d45343c261b9fb2fbca88f7e5b5b5492ee4f3e618078f6b117b996b448d
+  metadata.gz: 34d9077cc156dc410786f2631036814e41e4994b2566f5e383fc989c80e47bfc94a9e57c4b846ab2418fc511fc225d10376e2708148af15f89ac9a8464cdbe5b
+  data.tar.gz: 4589e4d45eeddc1dd04740d419cd15ff47afd50b70934183c2477f93573e8816ed16333721e825881faadce4e0976a67cf1c7038d4c98e0b44b7989c5b8cb869

data/Gemfile

@@ -1,8 +1,16 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec :name => 'smart_proxy_dynflow_core'
 
 group :development do
-  gem 'smart_proxy', :git => "https://github.com/theforeman/smart-proxy", :branch => "develop"
   gem 'pry'
 end
+
+group :test do
+  gem 'smart_proxy_dynflow', :path => '.'
+  gem 'smart_proxy', :git => "https://github.com/theforeman/smart-proxy", :branch => "develop"
+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/Gemfile.local.rb

@@ -0,0 +1,2 @@
+gem 'pry'
+gem 'smart_proxy_remote_execution_ssh_core', :path => '../smart_proxy_remote_execution_ssh'

data/lib/smart_proxy_dynflow/api.rb

@@ -1,31 +1,34 @@
+require 'sinatra/base'
+require 'proxy/helpers'
+require 'sinatra/authorization'
 module Proxy
   class Dynflow
     class Api < ::Sinatra::Base
       helpers ::Proxy::Helpers
       helpers ::Proxy::Dynflow::Helpers
+      extend ::Sinatra::Authorization
 
       authorize_with_trusted_hosts
       authorize_with_ssl_client
 
       before do
+        logger = Proxy::LogBuffer::Decorator.instance
         content_type :json
       end
 
-      post "/tasks/?" do
-        params = parse_json_body
-        trigger_task(::Dynflow::Utils.constantize(params['action_name']), params['action_input']).to_json
+      post "/tasks/callback" do
+        response = Proxy::Dynflow::Callback::Request.send_to_foreman_tasks(request.body.read)
+        logger.info "Callback to foreman #{response.code} - #{response}"
+        status response.code
+        body response.body
       end
 
-      post "/tasks/:task_id/cancel" do |task_id|
-        cancel_task(task_id).to_json
+      post "/*" do
+        relay_request
       end
 
-      get "/tasks/:task_id/status" do |task_id|
-        task_status(task_id).to_json
-      end
-
-      get "/tasks/count" do
-        tasks_count(params['state']).to_json
+      get "/*" do
+        relay_request
       end
     end
   end

data/lib/smart_proxy_dynflow/callback.rb

@@ -4,8 +4,7 @@ module Proxy
   class Dynflow
     module Callback
       class Request < Proxy::HttpRequest::ForemanRequest
-        def callback(callback, data)
-          payload = { :callback => callback, :data => data }.to_json
+        def callback(payload)
           response = send_request(request_factory.create_post('foreman_tasks/api/tasks/callback', payload))
           if response.code != "200"
             raise "Failed performing callback to Foreman server: #{response.code} #{response.body}"
@@ -13,28 +12,32 @@ module Proxy
           response
         end
 
-        def self.send_to_foreman_tasks(callback, data)
-          self.new.callback(callback, data)
+        def self.send_to_foreman_tasks(payload)
+          self.new.callback(payload)
         end
       end
 
-      class Action < ::Dynflow::Action
-        def plan(callback, data)
-          plan_self(:callback => callback, :data => data)
+      class Core < Proxy::HttpRequest::ForemanRequest
+        def uri
+          @uri ||= URI.parse Proxy::Dynflow::Plugin.settings.core_url
         end
 
-        def run
-          Callback::Request.send_to_foreman_tasks(input[:callback], input[:data])
+        def relay(request, from, to)
+          path = request.path.gsub(from, to)
+          Proxy::LogBuffer::Decorator.instance.debug "Proxy request from #{request.host_with_port}#{request.path} to #{uri.to_s}#{path}"
+          req = case request.env['REQUEST_METHOD']
+                  when 'GET'
+                    request_factory.create_get path, request.env['rack.request.query_hash']
+                  when 'POST'
+                    request_factory.create_post path, request.body.read
+                end
+          response = send_request req
+          Proxy::LogBuffer::Decorator.instance.debug "Proxy request status #{response.code} - #{response}"
+          response
         end
-      end
-
-      module PlanHelper
-        def plan_with_callback(input)
-          input = input.dup
-          callback = input.delete('callback')
 
-          planned_action = plan_self(input)
-          plan_action(::Proxy::Dynflow::Callback::Action, callback, planned_action.output) if callback
+        def self.relay(request, from, to)
+          self.new.relay request, from, to
         end
       end
     end

data/lib/smart_proxy_dynflow/helpers.rb

@@ -1,34 +1,11 @@
 module Proxy
   class Dynflow
     module Helpers
-      def world
-        Proxy::Dynflow.world
-      end
-
-      def trigger_task(*args)
-        triggered = world.trigger(*args)
-        { :task_id => triggered.id }
-      end
-
-      def cancel_task(task_id)
-        execution_plan = world.persistence.load_execution_plan(task_id)
-        cancel_events = execution_plan.cancel
-        { :task_id => task_id, :canceled_steps_count => cancel_events.size }
-      end
-
-      def task_status(task_id)
-        ep = world.persistence.load_execution_plan(task_id)
-        ep.to_hash.merge(:actions => ep.actions.map(&:to_hash))
-      rescue KeyError => e
-        status 404
-        {}
-      end
-
-      def tasks_count(state)
-        state ||= 'all'
-        filter = state != 'all' ? { :filters => { :state => [state] } } : {}
-        tasks = world.persistence.find_execution_plans(filter)
-        { :count => tasks.count, :state => state }
+      def relay_request(from = /^\/dynflow/, to = '')
+        response = Proxy::Dynflow::Callback::Core.relay(request, from, to)
+        content_type response.content_type
+        status response.code
+        body response.body
       end
     end
   end

data/lib/smart_proxy_dynflow/http_config.ru

@@ -1,10 +1,6 @@
 require 'smart_proxy_dynflow/api'
 
 map "/dynflow" do
-  map '/console' do
-    run Proxy::Dynflow.web_console
-  end
-
   map '/'do
     run Proxy::Dynflow::Api
   end

data/lib/smart_proxy_dynflow/http_config_with_executor.ru

@@ -0,0 +1,8 @@
+require 'smart_proxy_dynflow_core/api'
+require 'smart_proxy_dynflow_core/launcher'
+
+SmartProxyDynflowCore::Settings.load_from_proxy(p)
+
+map "/dynflow" do
+  SmartProxyDynflowCore::Launcher.route_mapping(self)
+end

data/lib/smart_proxy_dynflow/plugin.rb

@@ -1,11 +1,21 @@
+require 'proxy/log'
+require 'proxy/pluggable'
+require 'proxy/plugin'
+
 class Proxy::Dynflow
   class Plugin < Proxy::Plugin
-    http_rackup_path File.expand_path("http_config.ru", File.expand_path("../", __FILE__))
-    https_rackup_path File.expand_path("http_config.ru", File.expand_path("../", __FILE__))
+    rackup_path = begin
+      require 'smart_proxy_dynflow_core'
+      'http_config_with_executor.ru'
+    rescue LoadError
+      'http_config.ru'
+    end
+    http_rackup_path File.expand_path(rackup_path, File.expand_path("../", __FILE__))
+    https_rackup_path File.expand_path(rackup_path, File.expand_path("../", __FILE__))
 
     settings_file "dynflow.yml"
-    default_settings :database => '/var/lib/foreman-proxy/dynflow/dynflow.sqlite'
     default_settings :console_auth => true
+    default_settings :core_url => 'http://localhost:8008'
     plugin :dynflow, Proxy::Dynflow::VERSION
   end
 end

data/lib/smart_proxy_dynflow/proxy_adapter.rb

@@ -0,0 +1,10 @@
+module Proxy
+  class Dynflow
+    class ProxyAdapter < ::Dynflow::LoggerAdapters::Simple
+      def initialize(logger, level = Logger::DEBUG, formatters = [Formatters::Exception])
+        super(nil, level, formatters)
+        @logger = logger
+      end
+    end
+  end
+end

data/lib/smart_proxy_dynflow/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   class Dynflow
-    VERSION = '0.0.7'
+    VERSION = '0.1.0'
   end
 end

data/lib/smart_proxy_dynflow.rb

@@ -1,94 +1,5 @@
-require 'dynflow'
-
 require 'smart_proxy_dynflow/version'
 require 'smart_proxy_dynflow/plugin'
 require 'smart_proxy_dynflow/callback'
 require 'smart_proxy_dynflow/helpers'
-
-class Proxy::Dynflow
-  attr_accessor :world
-
-  def initialize
-    @world = create_world
-  end
-
-  def create_world(&block)
-    config = default_world_config(&block)
-    ::Dynflow::World.new(config)
-  end
-
-  def persistence_conn_string
-    db_conn_string = 'sqlite:/'
-
-    db_file = Proxy::Dynflow::Plugin.settings.database
-    if db_file.nil? || db_file.empty?
-      Proxy::Log.logger.warn "Could not open DB for dynflow at '#{db_file}', will keep data in memory. Restart will drop all dynflow data."
-    else
-      db_conn_string += "/#{db_file}"
-    end
-
-    ENV['DYNFLOW_DB_CONN_STRING'] || db_conn_string
-  end
-
-  def persistence_adapter
-    ::Dynflow::PersistenceAdapters::Sequel.new persistence_conn_string
-  end
-
-  def default_world_config
-    ::Dynflow::Config.new.tap do |config|
-      config.auto_rescue = true
-      config.logger_adapter = logger_adapter
-      config.persistence_adapter = persistence_adapter
-      yield config if block_given?
-    end
-  end
-
-  def logger_adapter
-    ::Dynflow::LoggerAdapters::Simple.new $stderr, 0
-  end
-
-  class << self
-    attr_reader :instance
-
-    def ensure_initialized
-      return @instance if @instance
-      @instance = Proxy::Dynflow.new
-      after_initialize_blocks.each(&:call)
-      @instance
-    end
-
-    def web_console
-      require 'dynflow/web'
-      dynflow_console = ::Dynflow::Web.setup do
-        # we can't use the proxy's after_actionvation hook, as
-        # it happens before the Daemon forks the process (including
-        # closing opened file descriptors)
-        # TODO: extend smart proxy to enable hooks that happen after
-        # the forking
-
-        if Proxy::Dynflow::Plugin.settings.console_auth
-          authorize_with_trusted_hosts
-          authorize_with_ssl_client
-        end
-
-        Proxy::Dynflow.ensure_initialized
-        set :world, Proxy::Dynflow.world
-      end
-      dynflow_console
-    end
-
-    def world
-      instance.world
-    end
-
-    def after_initialize(&block)
-      after_initialize_blocks << block
-    end
-
-    private
-
-    def after_initialize_blocks
-      @after_initialize_blocks ||= []
-    end
-  end
-end
+require 'smart_proxy_dynflow/api'

data/settings.d/dynflow.yml.example

@@ -2,3 +2,4 @@
 :enabled: true
 :database: /var/lib/foreman-proxy/dynflow/dynflow.sqlite
 :console_auth: true
+:core_url: 'http://127.0.0.1:8008'

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -108,48 +108,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.32.1
-- !ruby/object:Gem::Dependency
-  name: dynflow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.4
-- !ruby/object:Gem::Dependency
-  name: sequel
-  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:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |2
       Use the Dynflow inside Foreman smart proxy
 email:
@@ -160,14 +118,16 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
+- bundler.d/Gemfile.local.rb
 - bundler.d/dynflow.rb
 - lib/smart_proxy_dynflow.rb
 - lib/smart_proxy_dynflow/api.rb
 - lib/smart_proxy_dynflow/callback.rb
 - lib/smart_proxy_dynflow/helpers.rb
 - lib/smart_proxy_dynflow/http_config.ru
+- lib/smart_proxy_dynflow/http_config_with_executor.ru
 - lib/smart_proxy_dynflow/plugin.rb
-- lib/smart_proxy_dynflow/testing.rb
+- lib/smart_proxy_dynflow/proxy_adapter.rb
 - lib/smart_proxy_dynflow/version.rb
 - settings.d/dynflow.yml.example
 homepage: https://github.com/theforeman/smart_proxy_dynflow
@@ -180,17 +140,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy

data/lib/smart_proxy_dynflow/testing.rb

@@ -1,28 +0,0 @@
-require 'dynflow/testing'
-
-unless defined? DYNFLOW_TESTING_LOG_LEVEL
-  DYNFLOW_TESTING_LOG_LEVEL = 4
-end
-
-module Proxy
-  class Dynflow
-    # Helper for usage in other dependent plugins that need Dynflow
-    # related things, such as testing instance of world etc.
-    module Testing
-      class << self
-        def create_world(&block)
-          Proxy::Dynflow::Plugin.settings.database = nil
-          Proxy::Dynflow.ensure_initialized
-          Proxy::Dynflow.instance.create_world do |config|
-            config.exit_on_terminate = false
-            config.auto_terminate    = false
-            config.logger_adapter    = ::Dynflow::LoggerAdapters::Simple.new $stderr, DYNFLOW_TESTING_LOG_LEVEL
-            block.call(config) if block
-          end
-        end
-      end
-    end
-  end
-end
-
-Concurrent.disable_at_exit_handlers!