hiera-http 0.0.2 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: 4e885355dcd8030bc8ec2147a964dac179edc9fd
+  data.tar.gz: 7465b53a13d54122afe45511c07a53eda4dcde4e
+SHA512: 
+  metadata.gz: 5864399b5f14e23bd5873d6f57413c2fba8d6e60053872f3ad4b96299a59c8236a81fd3a018d886dd11978c3ed1c1941dfe81337fb9e8817066ca8f8018f7261
+  data.tar.gz: a5fd96d518809b4f962c78f9fd778c23b9c93231a61f1575af945250005d408b47774ebaeb8ea8e7617c96ac9c19642cc72b2a07e610968e52901ed5af45b5e0

data/lib/hiera/backend/http_backend.rb

@@ -11,10 +11,20 @@ class Hiera
         @http.read_timeout = @config[:http_read_timeout] || 10
         @http.open_timeout = @config[:http_connect_timeout] || 10
 
+        @cache = {}
+        @cache_timeout = @config[:cache_timeout] || 10
+        @cache_clean_interval = @config[:cache_clean_interval] || 3600
+
         if @config[:use_ssl]
           @http.use_ssl = true
-          if @config[:ssl_cert]
+
+          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
@@ -28,7 +38,6 @@ class Hiera
       end
 
       def lookup(key, scope, order_override, resolution_type)
-
         answer = nil
 
         paths = @config[:paths].map { |p| Backend.parse_string(p, scope, { 'key' => key }) }
@@ -38,25 +47,10 @@ class Hiera
         paths.each do |path|
 
           Hiera.debug("[hiera-http]: Lookup #{key} from #{@config[:host]}:#{@config[:port]}#{path}")
-          httpreq = Net::HTTP::Get.new(path)
-
-          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'
-            next
-          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}")
-            raise Exception, 'Bad HTTP response' unless @config[:failure] == 'graceful'
-            next
-          end
-
-          result = self.parse_response(key, httpres.body)
-          next unless result
+          result = http_get_and_parse_with_cache(path)
+          result = result[key] if result.is_a?(Hash)
+          next if result.nil?
 
           parsed_result = Backend.parse_answer(result, scope)
 
@@ -66,7 +60,7 @@ class Hiera
             answer << parsed_result
           when :hash
             answer ||= {}
-            answer = parsed_result.merge answer
+            answer = Backend.merge_answer(parsed_result, answer)
           else
             answer = parsed_result
             break
@@ -76,30 +70,19 @@ class Hiera
       end
 
 
-      def parse_response(key,answer)
+      private
 
-        return nil unless answer
+      def parse_response(answer)
+        return unless answer
 
-        Hiera.debug("[hiera-http]: Query returned data, parsing response as #{@config[:output] || 'plain'}")
+        format = @config[:output] || 'plain'
+        Hiera.debug("[hiera-http]: Query returned data, parsing response as #{format}")
 
-        case @config[:output]
-
-        when 'plain'
-          # When the output format is configured as plain we assume that if the
-          # endpoint URL returns an HTTP success then the contents of the response
-          # body is the value itself, or nil.
-          #
-          answer
+        case format
         when 'json'
-          # If JSON is specified as the output format, assume the output of the
-          # endpoint URL is a JSON document and return keypart that matched our
-          # lookup key
-          self.json_handler(key,answer)
+          parse_json answer
         when 'yaml'
-          # If YAML is specified as the output format, assume the output of the
-          # endpoint URL is a YAML document and return keypart that matched our
-          # lookup key
-          self.yaml_handler(key,answer)
+          parse_yaml answer
         else
           answer
         end
@@ -107,19 +90,74 @@ class Hiera
 
       # Handlers
       # Here we define specific handlers to parse the output of the http request
-      # and return a value.  Currently we support YAML and JSON
+      # and return its structured representation.  Currently we support YAML and JSON
       #
-      def json_handler(key,answer)
+      def parse_json(answer)
         require 'rubygems'
         require 'json'
-        JSON.parse(answer)[key]
+        JSON.parse(answer)
       end
 
-      def yaml_handler(answer)
+      def parse_yaml(answer)
         require 'yaml'
-        YAML.parse(answer)[key]
+        YAML.parse(answer)
       end
 
+      def http_get_and_parse_with_cache(path)
+        return http_get(path) if @cache_timeout <= 0
+
+        now = Time.now.to_i
+        expired_at = now + @cache_timeout
+
+        # Deleting all stale cache entries can be expensive. Do not do it every time
+        periodically_clean_cache(now, expired_at) unless @cache_clean_interval == 0
+
+        # Just refresh the entry being requested for performance
+        unless @cache[path] && @cache[path][:created_at] < expired_at
+          @cache[path] = {
+            :created_at => now,
+            :result => http_get_and_parse(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, expired_at)
+        return if now < @clean_cache_at.to_i
+
+        @clean_cache_at = now + @cache_clean_interval
+        @cache.select! do |_, entry|
+          entry[:created_at] < expired_at
+        end
+      end
     end
   end
 end

metadata

@@ -1,77 +1,61 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hiera-http
-version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 1.3.0
 platform: ruby
-authors:
+authors: 
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: hiera
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+
+date: 2015-03-18 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.1.1
-  type: :runtime
+  version_requirements: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+  type: :runtime
+  name: json
 description: Hiera backend for looking up data over HTTP APIs
 email: craig@craigdunn.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/hiera/backend/http_backend.rb
 homepage: http://github.com/crayfishx/hiera-http
 licenses: []
+
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id002 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTTP backend for Hiera
 test_files: []
+