hiera-consul 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5511f6fb4e5f61eca5669dba7d210e8e69c93519
-  data.tar.gz: 747b63180b69108982f7649cfe7c4e4df6e9c51d
+  metadata.gz: 699b0026da73c5c21ccfaa87ba2f9fbadb61cc9f
+  data.tar.gz: 0dfc0d7b9a1fda71d53adc3a7ef7ee30ae28bc35
 SHA512:
-  metadata.gz: ca6875819a8c7f2cb36a84474c66505d79cac6ffd86a04dfa8a28bfd267df5864aea77000c4134bbe59e2a327e376e6264c12789155449bc6b1a3508e61fc2c2
-  data.tar.gz: 864e34a71ba9261cf7944c0da1e0e6436f29152af4ea7cbbc90870292d06f9b610dda4cfbf5d578f2e26658dda156e0985911cbfe51b290a930792435b321743
+  metadata.gz: aadc3b95074ab3826450725b377762d8efd2e2fce003d04daaddf85ada0c1415ede768c07298879cb633eda173008d40522fe1a9029b40665b8e20e0c91575b9
+  data.tar.gz: 025c1139082ae81c42f3eafc560cdc315c75bac6c64402bd7df8b9b19c2d3dcb941f6a875868669a63905fc673f46768596f55f321aedcc5a82a8945097bb518

data/lib/hiera/backend/consul_backend.rb

@@ -10,26 +10,34 @@ class Hiera
         require 'uri'
 
         @config = Config[:consul]
+
         if ENV['CONSUL_HTTP_ADDR']
-          # By convention the ENV var does not contain a scheme, but URI
-          # requires one. Net::HTTP will switch to https if configured later.
-          uri = URI('http://' + ENV['CONSUL_HTTP_ADDR'])
-          @consul = Net::HTTP.new(uri.host, uri.port)
-        elsif (@config[:host] && @config[:port])
-          @consul = Net::HTTP.new(@config[:host], @config[:port])
-        else
-          raise "[hiera-consul] Missing minimum configuration, please check hiera.yaml"
+          #TODO(jsok): Check CONSUL_HTTP_SSL and set scheme appropriately
+          scheme = 'http://'
+          address = ENV['CONSUL_HTTP_ADDR']
+          uri = URI("#{scheme}#{address}")
+          @config[:host] = uri.host
+          @config[:port] = uri.port
         end
-        @consul.read_timeout = @config[:http_read_timeout] || 10
-        @consul.open_timeout = @config[:http_connect_timeout] || 10
 
         begin
+          if (@config[:host] && @config[:port])
+            @consul = Net::HTTP.new(@config[:host], @config[:port])
+            @consul.read_timeout = @config[:http_read_timeout] || 10
+            @consul.open_timeout = @config[:http_connect_timeout] || 10
+            #TODO(jsok): Check CONSUL_HTTP_SSL_VERIFY and configure SSL certs
+          else
+            raise "host info not found in CONSUL_HTTP_ADDR or @config[:host,:port]"
+          end
+
           check_agent
           Hiera.debug("[hiera-consul] Client configured to connect to #{@consul.address}:#{@consul.port}")
+
         rescue Exception => e
           @consul = nil
           Hiera.warn("[hiera-consul] Skipping backend. Configuration error: #{e}")
         end
+
       end
 
       def lookup(key, scope, order_override, resolution_type)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-consul
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jonathan Sokolowski
@@ -9,21 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-06-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  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'
+dependencies: []
 description: Hiera backend for looking up KV data stored in Vault
 email: jonathan.sokolowski@gmail.com
 executables: []