jerakia 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e044be567c543e87edcfcae3edf755b9bde59529
-  data.tar.gz: 397821bbee4bd788ffa9d22955eec77c7ce6b0b9
+  metadata.gz: 720b8d35cb80a854ba236ca1c4d7bcf1b0c3f1c5
+  data.tar.gz: 8437f36c2f1e02dd0b0b6210ad5850055f7cc994
 SHA512:
-  metadata.gz: fefb5fce648917521da2d1a2b8e5ccf6f689bf4d5461e0c76898bb3eb16592fc960ec662d729dd4189ef0b35a22faff8d9a15ad40c44923b18d4cd92c5c0dc0f
-  data.tar.gz: a86be11fbff3b463f7bd73b7938f4bb8dc0420efabb56a775317ca23d34b78680fcfe33172fd15c83bbb22f00d8a4f9df9c95a912116ca29d0963a42950ef654
+  metadata.gz: 208410b58d4efadccbcf853d077d8594f9514d3bbfc6a3b2bb4c5a4037ceded7ed722856f145ef4f408bea614eaf311faa36c845be8fc03698b2808ac02e3f04
+  data.tar.gz: 358407a6611a4e2c05a1a6bb9a0500532523108ef4e69b59cd221b7901e14c62a67ab537cedb3841550a53dde0bb28cf4972ae455c12a8ef17432fa8b5066556

data/lib/jerakia/datasource.rb

@@ -50,6 +50,12 @@ class Jerakia
             raise Jerakia::DatasourceArgumentError, "Must specify #{name} parameter" if opt.nil?
           end
 
+          if arguments[:type]
+            unless opt.is_a?(arguments[:type]) || opt.nil?
+              raise Jerakia::DatasourceArgumentError, "#{name} must be a #{arguments[:type].to_s}, got #{opt.class.to_s}"
+            end
+          end
+
           if block_given?
             unless opt.nil?
               raise Jerakia::DatasourceArgumentError, "Validation failed for #{name}" unless yield opt

data/lib/jerakia/datasource/http.rb

@@ -1,70 +1,67 @@
 require 'lookup_http'
 
-class Jerakia::Datasource
-  module Http
-    def run
-      #
-      # Do the lookup
+class Jerakia::Datasource::Http < Jerakia::Datasource::Instance
+  option :host,                :type => String,  :required => true
+  option :port,                :type => Integer, :default => 80
+  option :output,              :type => String,  :default => 'json'
+  option :failure,             :type => String,  :default => 'graceful'
+  option :ignore_404,          :default => true
+  option :headers,             :type => Hash
+  option :http_read_timeout,   :type => Integer
+  option :use_ssl
+  option :ssl_ca_cert,         :type => String
+  option :ssl_cert,            :type => String
+  option :ssl_key,             :type => String
+  option :ssl_verify
+  option :use_auth
+  option :auth_user,           :type => String
+  option :auth_pass,           :type => String
+  option :http_connect_timeout, :type => Integer
+  option :paths, :type => Array, :required => true
 
-      Jerakia.log.debug("Searching key #{lookup.request.key} using the http datasource (#{whoami})")
+  def lookup
 
-      option :host,                :type => String,  :mandatory => true
-      option :port,                :type => Integer, :default => 80
-      option :output,              :type => String,  :default => 'json'
-      option :failure,             :type => String,  :default => 'graceful'
-      option :ignore_404,          :default => true
-      option :headers,             :type => Hash
-      option :http_read_timeout,   :type => Integer
-      option :use_ssl
-      option :ssl_ca_cert,         :type => String
-      option :ssl_cert,            :type => String
-      option :ssl_key,             :type => String
-      option :ssl_verify
-      option :use_auth
-      option :auth_user,           :type => String
-      option :auth_pass,           :type => String
-      option :http_connect_timeout, :type => Integer
-      option :paths, :type => Array, :mandatory => true
+    lookup_supported_params = [
+      :host,
+      :port,
+      :output,
+      :failure,
+      :ignore_404,
+      :headers,
+      :http_connect_timeout,
+      :http_read_timeout,
+      :use_ssl,
+      :ssl_ca_cert,
+      :ssl_cert,
+      :ssl_key,
+      :ssl_verify,
+      :use_auth,
+      :auth_user,
+      :auth_pass
+    ]
+    lookup_params = options.select { |p| lookup_supported_params.include?(p) }
+    http_lookup = LookupHttp.new(lookup_params)
 
-      lookup_supported_params = [
-        :host,
-        :port,
-        :output,
-        :failure,
-        :ignore_404,
-        :headers,
-        :http_connect_timeout,
-        :http_read_timeout,
-        :use_ssl,
-        :ssl_ca_cert,
-        :ssl_cert,
-        :ssl_key,
-        :ssl_verify,
-        :use_auth,
-        :auth_user,
-        :auth_pass
-      ]
-      lookup_params = options.select { |p| lookup_supported_params.include?(p) }
-      http_lookup = LookupHttp.new(lookup_params)
 
-      options[:paths].flatten.each do |path|
-        Jerakia.log.debug("Attempting to load data from #{path}")
-        return unless response.want?
+    paths = options[:paths].flatten
+    answer do |response|
+      path = paths.shift
+      break unless path
+      Jerakia.log.debug("Attempting to load data from #{path}")
 
-        data = http_lookup.get_parsed(path)
-        Jerakia.log.debug("Datasource provided #{data} (#{data.class}) looking for key #{lookup.request.key}")
+      data = http_lookup.get_parsed(path)
+      Jerakia.log.debug("Datasource provided #{data} (#{data.class}) looking for key #{request.key}")
 
-        if data.is_a?(Hash)
-          unless data[lookup.request.key].nil?
-            Jerakia.log.debug("Found data #{data[lookup.request.key]}")
-            response.submit data[lookup.request.key]
-          end
-        else
-          unless options[:output] == 'plain' || options[:failure] == 'graceful'
-            raise Jerakia::Error, "HTTP request did not return a hash for #{lookup.request.key} #{whoami}"
-          end
-          response.submit data
+      if data.is_a?(Hash)
+        unless data[request.key].nil?
+          Jerakia.log.debug("Found data #{data[request.key]}")
+          response.submit data[request.key]
         end
+      else
+        unless options[:output] == 'plain' || options[:failure] == 'graceful'
+          raise Jerakia::Error, "HTTP request did not return a hash for #{request.key}"
+        end
+        response.submit data
       end
     end
   end

data/lib/jerakia/policy.rb

@@ -32,7 +32,7 @@ class Jerakia
       response_entries = []
       lookups.each do |lookup|
         lookup_instance = lookup.call clone_request(request), scope
-        next unless lookup_instance.valid? && lookup_instance.proceed?
+        next unless lookup_instance.valid?
         register_datasource lookup_instance.datasource[:name]
         responses = Jerakia::Datasource.run(lookup_instance)
         lookup_instance.output_filters.each do |filter|
@@ -41,6 +41,7 @@ class Jerakia
         end
         lookup_answers = responses.entries.map { |r| r}
         response_entries << lookup_answers if lookup_answers
+        break unless lookup_instance.proceed?
       end
       answer.process_response(response_entries)
       return answer

data/lib/jerakia/version.rb

@@ -3,5 +3,5 @@ class Jerakia
   #
   # This should be updated when a new gem is released and it is read from the gemspec file
   #
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor