jerakia 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41114e6bd23299a7a2a24837a973638ed1f95d5
-  data.tar.gz: baa4ae57eb934247c0e261b1d92d036ac8eb5287
+  metadata.gz: f0eb1b22902463a7e61b100ad3df85c2be0e0962
+  data.tar.gz: 6687510aafa82767e994504a0b4f4085653770d9
 SHA512:
-  metadata.gz: 3398f530150e3a6b1274ff118c6afffee3948aeab02c59bfc3bb90be8f759d12976e6b5da7f9fe8de836c38fcdc1010cb4a80692f8eed2808c6eb5d56a6ed7d5
-  data.tar.gz: 592fc7e0890afc275c3bef12171dbb8edee4df2303955de7706812f9b8fc448b8c08877f8a9bce3a83a387672130ff0cdd50e9be16974ea136f31859e45d624a
+  metadata.gz: f04a1ad923250f2b9d962761ffd5d14da68aeca8f5eaffb3d0b5cedb1d18baf18fbb06218afb26666430c574a4767fd4c26bc0a3de7bb1a3fd5af85babc2a310
+  data.tar.gz: f65ca8e7b58e7d830911a03889a1973111a4a12d59ba2c77569045ba11127b7bd355fb05bfeb0058ec189577173c5fd7ca557bd5554fd58e091a51a36c53be72

data/lib/jerakia/answer.rb

@@ -1,5 +1,7 @@
 class Jerakia::Answer
 
+  require 'deep_merge'
+
   attr_accessor :payload
   attr_accessor :datatype
   attr_reader :lookup_type
@@ -18,11 +20,16 @@ class Jerakia::Answer
     @payload.flatten!
   end
 
-  def merge_payload!
+  def merge_payload!(method = :hash)
     payload_hash={}
     @payload.each do |p|
       if p.is_a?(Hash)
-        payload_hash.merge!(p)
+        case method
+        when :hash
+          payload_hash = p.merge(payload_hash)
+        when :deep_hash
+          payload_hash = p.deep_merge!(payload_hash)
+        end
       end
     end
     @payload=payload_hash

data/lib/jerakia/cli.rb

@@ -53,6 +53,11 @@ class Jerakia
            aliases: :d,
            type: :hash,
            desc: 'Key/value pairs to be used as metadata for the lookup'
+    option :schema,
+           aliases: :S,
+           type: :boolean,
+           desc: 'Enable/disable schema lookup, default true',
+           default: true
 
     def lookup(key)
 
@@ -70,7 +75,6 @@ class Jerakia
 
       jac = Jerakia.new({
         :config   => options[:config],
-        :loglevel => options[:log_level],
         :logfile  => logfile,
         :loglevel => loglevel,
       })
@@ -83,6 +87,7 @@ class Jerakia
         :metadata      => options[:metadata] || {},
         :scope         => options[:scope].to_sym,
         :scope_options => options[:scope_options],
+        :use_schema    => options[:schema],
       )
 
       answer = jac.lookup(req)

data/lib/jerakia/config.rb

@@ -5,14 +5,23 @@ class Jerakia::Config
   attr_reader :server_url
 
   def self.load_from_file(file = '/etc/jerakia/jerakia.yaml')
-    Jerakia.crit("Config file #{file} not found") unless File.exists?(file)
     new YAML.load_file(file)
   end
 
-  def initialize(config)
-    @policydir = config['policydir']
-    @server_url = config['server_url']
-    @configdata = config
+  def initialize(config = {})
+    config_with_defaults = defaults.merge(config)
+    @policydir = config_with_defaults['policydir']
+    @server_url = config_with_defaults['server_url']
+    @configdata = config_with_defaults
+  end
+
+  def defaults
+    {
+      'policydir'     => '/etc/jerakia/policy.d',
+      'logfile'       => '/var/log/jerakia.log',
+      'loglevel'      => 'info',
+      'enable_schema' => true,
+    }
   end
 
   def [](key)

data/lib/jerakia/datasource/file/json.rb

@@ -0,0 +1,17 @@
+class Jerakia::Datasource
+  module File
+    class Json
+
+      EXTENSION='json'
+
+      class << self
+        require 'json'
+        def convert(data)
+          return {} if data.empty?
+          JSON.load(data)
+        end
+      end
+    end
+  end
+end
+

data/lib/jerakia/launcher.rb

@@ -5,14 +5,14 @@ class Jerakia::Launcher
 
   attr_reader :request
   attr_reader :answer
-  def initialize(req)
-    @@request = req
-    invoke
+  def initialize(req, &block)
+    @request = req
+    instance_eval &block
   end
 
-  def invoke
+  def invoke_from_file
     policy_name=request.policy.to_s
-    Jerakia.log.debug "Invoked lookup for #{@@request.key} using policy #{policy_name}"
+    Jerakia.log.debug "Invoked lookup for #{@request.key} using policy #{policy_name}"
     filename=File.join(Jerakia.config.policydir, "#{policy_name}.rb")
     begin
       policydata=Jerakia.filecache(filename)
@@ -22,13 +22,8 @@ class Jerakia::Launcher
     instance_eval policydata
   end
 
-  def request
-    @@request
-  end
-
-
-  def policy(name, opts={},  &block)
-    policy = Jerakia::Policy.new(name, opts, &block)
+  def policy(name, opts={}, req=@request, &block)
+    policy = Jerakia::Policy.new(name, opts, req, &block)
     policy.fire!
     @answer = policy.answer
   end

data/lib/jerakia/lookup/plugin/hiera.rb

@@ -8,11 +8,16 @@
 #
 class Jerakia::Lookup::Plugin
   module Hiera
-    def rewrite_lookup
+
+    def autorun
       request.key.prepend("#{request.namespace.join('::')}::")
       request.namespace=[]
     end
 
+    def rewrite_lookup
+      Jerakia.log.debug("DEPRECATION NOTICE: The use of plugin.hiera.rewrite_lookup is now deprecated and is automatically executed when the plugin is loaded")
+    end
+
     def calling_module
       if request.namespace.length > 0
         request.namespace[0]

data/lib/jerakia/lookup/pluginfactory.rb

@@ -2,6 +2,7 @@ class Jerakia::Lookup::PluginFactory
 
    def initialize 
      Jerakia.log.debug("Loaded plugin handler")
+     @plugin_config = Jerakia.config[:plugins] || {}
    end
 
 
@@ -15,6 +16,15 @@ class Jerakia::Lookup::PluginFactory
      create_plugin_method(name) do
        plugin
      end
+     if plugin.respond_to?('autorun')
+       Jerakia.log.debug("Found autorun method for plugin #{name}, executing")
+
+       if plugin.method('autorun').arity == 1
+         plugin.autorun (@plugin_config[name.to_s] || {} )
+       else      
+         plugin.autorun
+       end
+     end
    end
 
 end

data/lib/jerakia/policy.rb

@@ -1,19 +1,27 @@
 require 'jerakia/launcher'
 
-class Jerakia::Policy < Jerakia::Launcher
+class Jerakia::Policy 
   require 'jerakia/answer'
+  require 'jerakia/schema'
 
   attr_accessor :lookups
   attr_reader   :routes
   attr_reader   :answer
   attr_reader   :scope
   attr_reader   :lookup_proceed
+  attr_reader   :schema
 
-  def initialize(name, opts, &block)
+  def initialize(name, opts={}, req, &block)
+
+    if req.use_schema and Jerakia.config[:enable_schema]
+      schema_config = Jerakia.config[:schema] || {}
+      @schema = Jerakia::Schema.new(req, schema_config)
+    end
     @lookups=[]
     @routes={}
-    @answer=Jerakia::Answer.new(request.lookup_type)
-    @scope=Jerakia::Scope.new
+    @request=req
+    @answer=Jerakia::Answer.new(req.lookup_type)
+    @scope=Jerakia::Scope.new(req)
     @lookup_proceed = true    
     begin
       instance_eval &block
@@ -22,6 +30,11 @@ class Jerakia::Policy < Jerakia::Launcher
     end
   end
 
+
+  def request
+    @request
+  end
+
   def clone_request
     Marshal.load(Marshal.dump(request))
   end
@@ -52,11 +65,13 @@ class Jerakia::Policy < Jerakia::Launcher
         end
       end
 
-      if request.lookup_type == :cascade && @answer.payload.is_a?(Array) && request.merge == :array
-        @answer.flatten_payload!
-      end
-      if request.lookup_type == :cascade && @answer.payload.is_a?(Array) && request.merge == :hash
-        @answer.merge_payload!
+      if request.lookup_type == :cascade && @answer.payload.is_a?(Array)
+        case request.merge
+        when :array
+          @answer.flatten_payload!
+        when :hash,:deep_hash
+          @answer.merge_payload!(request.merge)
+        end
       end
 
     end

data/lib/jerakia/request.rb

@@ -9,6 +9,7 @@ class Jerakia
     attr_accessor :lookup_type
     attr_accessor :scope
     attr_accessor :scope_options
+    attr_accessor :use_schema
 
     def initialize(opts={})
       options        = defaults.merge(opts)
@@ -20,6 +21,7 @@ class Jerakia
       @lookup_type   = options[:lookup_type]
       @scope         = options[:scope]
       @scope_options = options[:scope_options] || {}
+      @use_schema    = options[:use_schema]
 
       Jerakia.log.debug("Request initialized with #{options}")
     end
@@ -35,6 +37,7 @@ class Jerakia
         metadata: {},
         lookup_type: :first,
         scope: nil,
+        use_schema: true
       }
     end
   end

data/lib/jerakia/schema.rb

@@ -0,0 +1,55 @@
+class Jerakia::Schema
+
+  def initialize(request,opts)
+    schema_datasource=datasource(opts)
+    schema_request=Jerakia::Request.new(
+      :metadata   => request.metadata,
+      :key        => request.key,
+      :namespace  => request.namespace,
+      :use_schema => false,
+    )
+
+    schema_lookup = Jerakia::Launcher.new(schema_request) do
+      policy :schema do
+        lookup :schema do
+          datasource *schema_datasource
+        end
+      end
+    end
+
+    @schema_data = schema_lookup.answer.payload || {}
+    Jerakia.log.debug("Schema returned #{@schema_data}")
+
+    if salias = @schema_data["alias"]
+      Jerakia.log.debug("Schema alias found to #{@schema_data["alias"]}")
+      request.namespace=Array(salias["namespace"]) if salias["namespace"]
+      request.key = salias["key"] if salias["key"]
+    end
+
+
+    if @schema_data["cascade"]
+      Jerakia.log.debug("Overriding lookup_type from #{request.lookup_type} to :cascade")
+      request.lookup_type= :cascade
+    end
+
+    if ["array", "hash", "deep_hash"].include?(@schema_data["merge"])
+      request.merge = @schema_data["merge"].to_sym
+    end
+
+  end
+
+  def datasource(opts={})
+    [ 
+      :file, {
+        :docroot        => opts["docroot"] || "/var/lib/jerakia/schema",
+        :format         => opts["format"]  || :json,
+        :enable_caching => opts["enable_caching"] || true,
+        :searchpath     => [ '' ],
+      }
+    ] 
+  end
+
+
+end
+
+

data/lib/jerakia/scope.rb

@@ -1,11 +1,13 @@
-class Jerakia::Scope < Jerakia::Policy
+class Jerakia::Scope
 
   attr_reader :value
   attr_reader :handler
+  attr_reader :request
 
-  def initialize(handler=nil)
+  def initialize(req)
     @value = {}
-    @handler ||= request.scope || :metadata
+    @handler ||= req.scope || :metadata
+    @request = req
     Jerakia::Util.autoload('scope', @handler)
     instance_eval "extend Jerakia::Scope::#{@handler.to_s.capitalize}"
     create

data/lib/jerakia/version.rb

@@ -4,6 +4,6 @@ class Jerakia
   #
   # This should be updated when a new gem is released and it is read from the gemspec file
   #
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 
 end

data/lib/jerakia//302/261

@@ -0,0 +1,38 @@
+# Here we take a request object and read in the policy file
+# which is evalulated in this instance
+#
+class Jerakia::Launcher
+
+  attr_reader :request
+  attr_reader :answer
+  def initialize(req, &block)
+    @request = req
+    instance_eval &block
+  end
+
+  def invoke_from_file
+    policy_name=request.policy.to_s
+    Jerakia.log.debug "Invoked lookup for #{@request.key} using policy #{policy_name}"
+    filename=File.join(Jerakia.config.policydir, "#{policy_name}.rb")
+    begin
+      policydata=Jerakia.filecache(filename)
+    rescue Exception => e
+      Jerakia.crit("Problem loading policy from #{filename}")
+    end
+    instance_eval policydata
+  end
+
+  def request
+    @request
+  end
+
+
+  def policy(name, opts={},  &block)
+    policy = Jerakia::Policy.new(name, opts, &block)
+    policy.fire!
+    @answer = policy.answer
+  end
+end
+
+
+

data/lib/jerakia.rb

@@ -11,8 +11,8 @@ class Jerakia
   require 'jerakia/version'
 
   def initialize(options={})
-    configfile = options[:config] || ENV['JERAKIA_CONFIG'] ||  '/etc/jerakia/jerakia.yaml'
-    @@config = Jerakia::Config.load_from_file(configfile)
+    configfile = options[:config] || ENV['JERAKIA_CONFIG'] || '/etc/jerakia/jerakia.yaml'
+    @@config = File.exist?(configfile) ? Jerakia::Config.load_from_file(configfile) : Jerakia::Config.new
 
     if @@config[:plugindir]
       $LOAD_PATH << @@config[:plugindir] unless $LOAD_PATH.include?(@@config[:plugindir])
@@ -26,7 +26,7 @@ class Jerakia
   end
 
   def lookup(request)
-    Jerakia::Launcher.new(request).answer
+    Jerakia::Launcher.new(request) { invoke_from_file }.answer
   end
 
   def config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -58,6 +58,7 @@ files:
 - lib/jerakia/datasource.rb
 - lib/jerakia/datasource/dummy.rb
 - lib/jerakia/datasource/file.rb
+- lib/jerakia/datasource/file/json.rb
 - lib/jerakia/datasource/file/yaml.rb
 - lib/jerakia/datasource/http.rb
 - lib/jerakia/launcher.rb
@@ -73,12 +74,14 @@ files:
 - lib/jerakia/response/filter.rb
 - lib/jerakia/response/filter/encryption.rb
 - lib/jerakia/response/filter/strsub.rb
+- lib/jerakia/schema.rb
 - lib/jerakia/scope.rb
 - lib/jerakia/scope/metadata.rb
 - lib/jerakia/scope/yaml.rb
 - lib/jerakia/test.pp
 - lib/jerakia/util.rb
 - lib/jerakia/version.rb
+- lib/jerakia/±
 - lib/puppet/indirector/data_binding/jerakia.rb
 - lib/puppet/indirector/data_binding/jerakia_rest.rb
 homepage: http://jerakia.io