hiera-simulator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a409ed848956ad385eaa26c1ca9ceaf758deb132
-  data.tar.gz: df0f290c98e20878842060ef1f60ac87d7635ccf
+  metadata.gz: 0916abf46cbd4952f409917b63b12f650429e5ba
+  data.tar.gz: 2a6ad789894a3010e9791139c340000543257d42
 SHA512:
-  metadata.gz: 8fff178d310a6ecb83ca7cb109811003d0f945ebeec248b47489a6be0e2d726690f2fbeb63e162e50cd82131de45e3a9f1379dac29e00723006809ad960c407d
-  data.tar.gz: 0b612f1d2de47c239e6bddcc5c4228d3aedc38adfca4b418f90a57d03c388276db7831692f333cbf0adcd759404f8352604c9b64c514d1622a8157126778600d
+  metadata.gz: bf6660801c35ab1258daf3040dc939438d7b495d85b35131500cb924ac443de5535545b878d0de2dc5cea3a53e486fd1424e801f3a5f11fefcc1b9c75f447e57
+  data.tar.gz: 21bf2b36c8a84e42348d08d9a31d7ec32a53cbd9e731529598e763f2bdca0d01569d2351c0e8b2aaba90bd92175cf81abd0b552ece8d0a902dc3fb9ecf5852a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hiera-simulator (0.2.1)
+    hiera-simulator (0.2.2)
       bundler
       deep_merge
       hiera
@@ -14,7 +14,7 @@ GEM
   specs:
     deep_merge (1.0.1)
     diff-lcs (1.2.5)
-    hiera (1.3.4)
+    hiera (3.1.1)
       json_pure
     httparty (0.13.7)
       json (~> 1.8)
@@ -41,7 +41,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  hiera
   hiera-simulator!
   rspec (>= 3.0.0)
 

data/README.md

@@ -45,6 +45,7 @@ Here are the important ones:
 
 | Version | Notes |
 |---------|-------|
+| 0.2.2   | Raise error directly if PuppetDB responds with code 200 but has an error message |
 | 0.2.1   | Remove PuppetDB hiera backend support, add --[no-]stringify-facts command line option |
 | 0.2.0   | Add support for PuppetDB API v4 |
 | 0.1.0   | Initial release |

data/lib/hiera-simulator/fact_source/puppetdb.rb

@@ -40,6 +40,18 @@ module HieraSimulator
       def facts_common(uri)
         reply = response(uri)
 
+        # Check for an error from PuppetDB despite return code 200
+        if reply.is_a?(Hash) && reply.key?('error')
+          message = "Error from PuppetDB: #{reply['error']}"
+          raise HieraSimulator::FactLookupError, message
+        end
+
+        # Check for unexpected data - we expect an array
+        unless reply.is_a?(Array)
+          message = "Unexpected data from PuppetDB: Expected Array got #{reply.class}"
+          raise HieraSimulator::FactSourceError, message
+        end
+
         # Stringify facts if needed (old hiera, old PuppetDB)
         if @stringify_facts
           result = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-simulator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kevin Paulisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake