puppet-databinding-jerakiaserver 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01db418ee49d7008862c23f707961a902e3658ef
-  data.tar.gz: 18fcdc271a91cd5bc534986065fdf2e54a39c94c
+  metadata.gz: 305b558ff702b4d78adaf8bfed2b5d5ac472b189
+  data.tar.gz: c87beaa8346291fa90cb303360b8a15ea71e73dd
 SHA512:
-  metadata.gz: a2b1c2e07d991fae51ee1b90fe56258d1772723c6a376b56928dc242ccc93dfc5ec1da93b620042ece51acce9958f766cac06e2a2b91e022803f70a5c9326df6
-  data.tar.gz: bf28b67a833c0322a321debf701aa0e15b38b86b9451617680153f3f54db54e5f5af2f7e64918f9f0603d33085fdfebb60d4ad6407fbd18b2cf956a6e7498176
+  metadata.gz: 7ad39725911bd7fa18a3dbfade20b76667132c6c2649b1c1f0fa2796dbddc28b550d7326fe03e5b5c8a47e512539b62bd79859d9308d3cd822fb166bd7e0a2cf
+  data.tar.gz: 923ebd1340c493516edf3f2dbf09066f257983d4f4552aa341b6374b50d0d7149072e3ea361f55d7ace3bd2105d85911cc0e8e48b8532dfe573723c6963d8a63

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

@@ -1,7 +1,6 @@
 require 'puppet/indirector/code'
 require 'jerakia/client'
 require 'json'
-require 'digest/md5'
 
 class Puppet::DataBinding::Jerakiaserver < Puppet::Indirector::Code
 
@@ -17,19 +16,10 @@ class Puppet::DataBinding::Jerakiaserver < Puppet::Indirector::Code
     super
   end
 
-  def server_scope(identifier)
-    returndata = jerakia.get_scope_uuid('puppet', identifier)
-    if returndata.is_a?(Hash)
-      return returndata['uuid']
-    else
-      return nil
-    end
-  end
-
   def store_scope(identifier, uuid, scope)
     @scope_cache[identifier] = {
       :uuid => uuid,
-      :md5  => Digest::MD5.hexdigest(scope.to_s)
+      :scope  => scope
     }
   end
 
@@ -38,30 +28,12 @@ class Puppet::DataBinding::Jerakiaserver < Puppet::Indirector::Code
     store_scope(identifier, returndata['uuid'], scope)
   end
 
-  def scope_valid?(identifier, scope)
-    uuid = server_scope(identifier)
-
-    # If the server doesn't have a copy, refresh
-    return false unless uuid
-
-    if scope_cache[identifier]
-      # If the UUID is different we need to refresh
-      return false unless scope_cache[identifier][:uuid] == uuid
-
-      # If the MD5 sum of the scope has changed, we are probably in a new
-      # puppet run and need to refresh the scope.
-      return false unless scope_cache[identifier][:md5] == Digest::MD5.hexdigest(scope.to_s)
-    else
-
-      # If the scope is not cached at all then we should refresh
-      return false
-    end
+  def scope_valid?(identifier, metadata)
+    return false unless @scope_cache.include?(identifier)
+    return false unless @scope_cache[identifier][:scope] == metadata
     return true
   end
 
-
-
-
   def find(request)
 
     # Jerakia doesn't do anything with lookup_options, this behaviour is achieved
@@ -73,10 +45,13 @@ class Puppet::DataBinding::Jerakiaserver < Puppet::Indirector::Code
     namespace=lookupdata.join('/')
     metadata =  request.options[:variables].to_hash.reject { |k, v| v.is_a?(Puppet::Resource) }
 
-    # If the scope is unchanged assume this is part of the same puppet run and don't resend
-    # otherwise we need to send the scope to Jerakia server ahead of time.
-    #
-    identifier = metadata['trusted']['certname']
+    # If we are on an earlier version of Puppet that doesn't have trusted facts,
+    # use the fqdn fact to identify us. Puppet 4 uses trusted.
+    if metadata['trusted']
+      identifier = metadata['trusted']['certname']
+    else
+      identifier = metadata['fqdn']
+    end
 
     send_scope(identifier, metadata) unless scope_valid?(identifier, metadata)
 
@@ -89,12 +64,20 @@ class Puppet::DataBinding::Jerakiaserver < Puppet::Indirector::Code
       }
     }
 
-    lookup = jerakia.lookup(key, lookup_options)
+    begin
+      lookup = jerakia.lookup(key, lookup_options)
+    rescue Jerakia::Client::ScopeNotFoundError => e
+      send_scope(identifier, metadata)
+      lookup = jerakia.lookup(key, lookup_options)
+    rescue => e
+      raise Puppet::DataBinding::LookupError.new("Jerakia data lookup failed #{e.class}", e.message)
+    end
+
     if lookup.is_a?(Hash)
       raise Puppet::DataBinding::LookupError.new("Jerakia data lookup failed", lookup['message']) unless lookup['status'] = 'ok'
       return lookup['payload']
     else
-      raise Puppet::DataBinding::LookupError.new("Jerakia data lookup failed", "Unknown reason")
+      raise Puppet::DataBinding::LookupError.new("Jerakia data lookup failed", "Expected a hash but got a #{lookup.class}")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-databinding-jerakiaserver
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jerakia-client