hiera-consul 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f393c35a128be6bfaae874febd674059dba594
-  data.tar.gz: c1e33bcd1a674e40faaf21a64c76070a1cea1014
+  metadata.gz: 5511f6fb4e5f61eca5669dba7d210e8e69c93519
+  data.tar.gz: 747b63180b69108982f7649cfe7c4e4df6e9c51d
 SHA512:
-  metadata.gz: ac2dab1523653d471e01dca3f5ebbb366ec039fda5f0d92cce61435732e67d6889f3cc404975eb1b9347c215e1f53111acf7e996e7173f1e33cbc16c7a7c00de
-  data.tar.gz: 86944abef51a03957ac77321dd493f2903fccd1b5404490c2782de554c21e6ffd596e38f6131b4a7714709b6d616858793043191d5090833683aa605ba9e5b4f
+  metadata.gz: ca6875819a8c7f2cb36a84474c66505d79cac6ffd86a04dfa8a28bfd267df5864aea77000c4134bbe59e2a327e376e6264c12789155449bc6b1a3508e61fc2c2
+  data.tar.gz: 864e34a71ba9261cf7944c0da1e0e6436f29152af4ea7cbbc90870292d06f9b610dda4cfbf5d578f2e26658dda156e0985911cbfe51b290a930792435b321743

data/lib/hiera/backend/consul_backend.rb

@@ -20,14 +20,21 @@ class Hiera
         else
           raise "[hiera-consul] Missing minimum configuration, please check hiera.yaml"
         end
-
-        Hiera.debug("[hiera-consul] Client configured to connect to #{@consul.address}:#{@consul.port}")
-
         @consul.read_timeout = @config[:http_read_timeout] || 10
         @consul.open_timeout = @config[:http_connect_timeout] || 10
+
+        begin
+          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)
+        return nil if @consul.nil?
+
         answer = nil
 
         paths = @config[:paths].map { |p| Backend.parse_string(p, scope, { 'key' => key }) }
@@ -76,7 +83,7 @@ class Hiera
               Hiera.debug("[hiera-consul] Could not read key: #{path}")
             end
           rescue Exception => e
-            Hiera.warn("[hiera-consul] Error occurred read value #{path}: #{e}")
+            Hiera.warn("[hiera-consul] Error occurred reading value #{path}: #{e}")
           end
 
           data
@@ -118,6 +125,14 @@ class Hiera
         end
       end
 
+      def check_agent
+        response = wrapquery("/v1/agent/self")
+        if response.nil?
+          raise "Client could not connect to #{@consul.address}:#{@consul.port}"
+        end
+        true
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-consul
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jonathan Sokolowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -31,7 +31,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/hiera/backend/consul_backend.rb
-- lib/hiera/backend/vault_backend.rb
 homepage: http://github.com/jsok/hiera-consul
 licenses:
 - Apache-2.0

data/lib/hiera/backend/vault_backend.rb

@@ -1,60 +0,0 @@
-# Vault backend for Hiera
-class Hiera
-  module Backend
-    class Vault_backend
-
-      def initialize()
-        require 'json'
-        require 'vault'
-
-        @config = Config[:vault]
-        @config[:mounts] ||= {}
-        @config[:mounts][:generic] ||= ['secret']
-
-        begin
-          @vault = Vault::Client.new(address: @config[:addr], token: @config[:token])
-          fail if @vault.sys.seal_status.sealed?
-          Hiera.debug("[hiera-vault] Client configured to connect to #{@vault.address}")
-        rescue Exception => e
-          @vault = nil
-          Hiera.warn("[hiera-vault] Skipping backend. Configuration error: #{e}")
-        end
-      end
-
-      def lookup(key, scope, order_override, resolution_type)
-        return nil if @vault.nil?
-
-        answer = nil
-
-        # Only generic mounts supported so far
-        @config[:mounts][:generic].each do |mount|
-          path = Backend.parse_string(mount, scope, { 'key' => key })
-          answer = lookup_generic("#{path}/#{key}", scope)
-
-          break if answer.kind_of? Hash
-        end
-
-        answer
-      end
-
-      def lookup_generic(key, scope)
-          begin
-            secret = @vault.logical.read(key)
-          rescue Vault::HTTPConnectionError
-            Hiera.debug("[hiera-vault] Could not connect to read secret: #{key}")
-          rescue Vault::HTTPError => e
-            Hiera.warn("[hiera-vault] Could not read secret #{key}: #{e.errors.join("\n").rstrip}")
-          end
-
-          return nil if secret.nil?
-
-          Hiera.debug("[hiera-vault] Read secret: #{key}")
-          # Turn secret's hash keys into strings
-          data = secret.data.inject({}) { |h, (k, v)| h[k.to_s] = v; h }
-
-          return Backend.parse_answer(data, scope)
-      end
-
-    end
-  end
-end