jerakia 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6acac89ddfc15c52ab520f40f8742b41bfff43c
-  data.tar.gz: 3d38c1f23615cf0d768e1ee570c336eafc4dd305
+  metadata.gz: 691dd2bc7adfbd791cfff7d5e1e81721567d0684
+  data.tar.gz: 987421a97b12e0803be5562656d5c92b916ae326
 SHA512:
-  metadata.gz: 8c7d34fa57d58252f3e8e60be1d4eee70e2bb5e96edb5667273394366eae282a9af473afcb298aee9c67a05789ff477411fe0405d92112d18af71d53c9152372
-  data.tar.gz: d469edcfd9ac14665944b372e29f8533eed8bce3c507f04073056af67363ebf273bb650a211f4bc19a94ee11c70bf1f91502f2afe3fae5f4175e45554f38d94a
+  metadata.gz: 2e6dab70dc4cd75bd53a8e697c2dbca44a2de610f99d9f1da6875cd8b6a788caa9d2ab3ec4cd9367a1379929dc88b2e04caa3758eda7622b9097c410f8634764
+  data.tar.gz: acf4f2caacbbdd93d65a7225b7f1ae1777e4398993b23dd05e0ba6be5af6bd9dcc7eae2a9cb080916b6cacf2439481f7f3a435ea2d25ba5f453ab77f6b5576b2

data/lib/hiera/backend/jerakia_backend.rb

@@ -1,3 +1,6 @@
+require 'puppet'
+require 'puppet/resource'
+
 class Hiera
   module Backend
     class Jerakia_backend
@@ -35,9 +38,9 @@ class Hiera
 
         metadata={}
         if scope.is_a?(Hash)
-          metadata=scope
+          metadata=scope.reject { |k, v| v.is_a?(Puppet::Resource) }
         else
-          metadata = scope.real.to_hash
+          metadata = scope.real.to_hash.reject { |k, v| v.is_a?(Puppet::Resource) }
         end
 
         request = Jerakia::Request.new(

data/lib/jerakia/cli.rb

@@ -70,6 +70,11 @@ class Jerakia
 
 
     def lookup(key)
+      # Thor by default now returns a frozen options hash so we 
+      # need to dup this here to prevent problems later with
+      # modifying the request object
+      #
+      options_copy = options.dup
 
       case true
       when options[:verbose]
@@ -92,15 +97,15 @@ class Jerakia
           :trace    => options[:trace],
         })
         req = Jerakia::Request.new(
-          :key           => key,
-          :namespace     => options[:namespace].split(/::/),
-          :policy        => options[:policy].to_sym,
-          :lookup_type   => options[:type].to_sym,
-          :merge         => options[:merge_type].to_sym,
-          :metadata      => options[:metadata] || {},
-          :scope         => options[:scope].to_sym,
-          :scope_options => options[:scope_options],
-          :use_schema    => options[:schema],
+          :key           => key.dup,
+          :namespace     => options_copy[:namespace].split(/::/),
+          :policy        => options_copy[:policy].to_sym,
+          :lookup_type   => options_copy[:type].to_sym,
+          :merge         => options_copy[:merge_type].to_sym,
+          :metadata      => options_copy[:metadata] || {},
+          :scope         => options_copy[:scope].to_sym,
+          :scope_options => options_copy[:scope_options],
+          :use_schema    => options_copy[:schema],
         )
 
 

data/lib/jerakia/policy.rb

@@ -27,8 +27,7 @@ class Jerakia::Policy
   end
 
   def clone_request
-    copy_request = request.clone
-    return copy_request
+    Marshal.load(Marshal.dump(request))
   end
 
   def submit_lookup(lookup)

data/lib/jerakia/version.rb

@@ -4,6 +4,6 @@ class Jerakia
   #
   # This should be updated when a new gem is released and it is read from the gemspec file
   #
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 
 end

data/lib/puppet/indirector/data_binding/jerakia.rb

@@ -19,7 +19,7 @@ class Puppet::DataBinding::Jerakia < Puppet::Indirector::Code
     lookupdata=request.key.split(/::/)
     key=lookupdata.pop
     namespace=lookupdata
-    metadata =  request.options[:variables].to_hash
+    metadata =  request.options[:variables].to_hash.reject { |k, v| v.is_a?(Puppet::Resource) }
     policy=metadata["jerakia_policy"] || @default_policy
     jacreq = Jerakia::Request.new(
       :key => key,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor