hiera-http 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ab1df0ab23f968b79343ec215cffc367e0769d
-  data.tar.gz: 7da4074c7417b661010bb7986b9788dbf7b3fd3a
+  metadata.gz: a17fac1e7bb38106d49186388941c002cf549eab
+  data.tar.gz: e53899e4ecc6f521e9d034154c4db3335efe2093
 SHA512:
-  metadata.gz: 2a87f6180b5712df95d7d54a91c11ee50b90a5df488fc0840decd6a59de30d5886afb0ea2182335d6be53bbde17677c369eccdc13abb92ebae4f2d3d286f8081
-  data.tar.gz: ef924a36d8c2b836b656b1be962ff5ec360b2c1543609f08f9560da090776ad3f8a4f7cd72fac1305a1d9da712e5112687e4b482450c003eb47e49f1e3608eb1
+  metadata.gz: 6d556293426068e0e2fb7fcc9f685927650e6cda109f419cd3c907d3c76f7ae21681546841548832e997eae50b51b1e19163dca0e5d07d8b1b467dbd214f9d08
+  data.tar.gz: 953bd0e2c5a9f5ea625166e628f01cef2e8375983fccff37b845baf625fe4c82cfceea89e844cb08c9670b507d3a118fb0b6877b852c99e673aab418d6187aa3

data/lib/hiera/backend/http_backend.rb

@@ -3,46 +3,37 @@ class Hiera
     class Http_backend
 
       def initialize
-        require 'net/http'
-        require 'net/https'
+        require 'lookup_http'
         @config = Config[:http]
-
-        @http = Net::HTTP.new(@config[:host], @config[:port])
-        @http.read_timeout = @config[:http_read_timeout] || 10
-        @http.open_timeout = @config[:http_connect_timeout] || 10
+      
+        lookup_supported_params = [
+          :host,
+          :port,
+          :output,
+          :failure,
+          :ignore_404,
+          :headers,
+          :http_connect_timeout,
+          :http_read_timeout,
+          :paths,
+          :use_ssl,
+          :ssl_ca_cert,
+          :ssl_cert,
+          :ssl_key,
+          :ssl_verify,
+          :use_auth,
+          :auth_user,
+          :auth_pass,
+        ]
+        lookup_params = @config.select { |p| lookup_supported_params.include?(p) }
+        
+        @lookup = LookupHttp.new(lookup_params.merge( { :debug_log => "Hiera.debug" } ))
+          
 
         @cache = {}
         @cache_timeout = @config[:cache_timeout] || 10
         @cache_clean_interval = @config[:cache_clean_interval] || 3600
 
-        @regex_key_match = nil
-
-        if confine_keys = @config[:confine_to_keys]
-          confine_keys.map! { |r| Regexp.new(r) }
-          @regex_key_match = Regexp.union(confine_keys)
-        end
-
-
-        if @config[:use_ssl]
-          @http.use_ssl = true
-
-          if @config[:ssl_verify] == false
-            @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          else
-            @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          end
-
-          if @config[:ssl_cert]
-            store = OpenSSL::X509::Store.new
-            store.add_cert(OpenSSL::X509::Certificate.new(File.read(@config[:ssl_ca_cert])))
-            @http.cert_store = store
-
-            @http.key = OpenSSL::PKey::RSA.new(File.read(@config[:ssl_cert]))
-            @http.cert = OpenSSL::X509::Certificate.new(File.read(@config[:ssl_key]))
-          end
-        else
-          @http.use_ssl = false
-        end
       end
 
       def lookup(key, scope, order_override, resolution_type)
@@ -89,39 +80,9 @@ class Hiera
 
       private
 
-      def parse_response(answer)
-        return unless answer
-
-        format = @config[:output] || 'plain'
-        Hiera.debug("[hiera-http]: Query returned data, parsing response as #{format}")
-
-        case format
-        when 'json'
-          parse_json answer
-        when 'yaml'
-          parse_yaml answer
-        else
-          answer
-        end
-      end
-
-      # Handlers
-      # Here we define specific handlers to parse the output of the http request
-      # and return its structured representation.  Currently we support YAML and JSON
-      #
-      def parse_json(answer)
-        require 'rubygems'
-        require 'json'
-        JSON.parse(answer)
-      end
-
-      def parse_yaml(answer)
-        require 'yaml'
-        YAML.load(answer)
-      end
 
       def http_get_and_parse_with_cache(path)
-        return http_get_and_parse(path) if @cache_timeout <= 0
+        return @lookup.get_parsed(path) if @cache_timeout <= 0
 
         now = Time.now.to_i
         expired_at = now + @cache_timeout
@@ -133,39 +94,12 @@ class Hiera
         if !@cache[path] || @cache[path][:expired_at] < now
           @cache[path] = {
             :expired_at => expired_at,
-            :result => http_get_and_parse(path)
+            :result => @lookup.get_parsed(path)
           }
         end
         @cache[path][:result]
       end
 
-      def http_get_and_parse(path)
-        httpreq = Net::HTTP::Get.new(path)
-
-        if @config[:use_auth]
-          httpreq.basic_auth @config[:auth_user], @config[:auth_pass]
-        end
-
-        begin
-          httpres = @http.request(httpreq)
-        rescue Exception => e
-          Hiera.warn("[hiera-http]: Net::HTTP threw exception #{e.message}")
-          raise Exception, e.message unless @config[:failure] == 'graceful'
-          return
-        end
-
-        unless httpres.kind_of?(Net::HTTPSuccess)
-          Hiera.debug("[hiera-http]: bad http response from #{@config[:host]}:#{@config[:port]}#{path}")
-          Hiera.debug("HTTP response code was #{httpres.code}")
-          unless httpres.code == '404' && @config[:ignore_404]
-            raise Exception, 'Bad HTTP response' unless @config[:failure] == 'graceful'
-          end
-          return
-        end
-
-        parse_response httpres.body
-      end
-
 
       def periodically_clean_cache(now)
         return if now < @clean_cache_at.to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-http
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: lookup_http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Hiera backend for looking up data over HTTP APIs
 email: craig@craigdunn.org
 executables: []