quixoten-puppetdb-terminus 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baeecd79dcf5a56ae9cf335161c0f581fac79d1a
-  data.tar.gz: bca88ab629d84a37187a7d01a098954f7618a2dd
+  metadata.gz: 4b8ac64ec0646cb863eb8ff02d7d836fa72ae388
+  data.tar.gz: 391e0dca5929e6f08884327cd6da5fee22dc9e33
 SHA512:
-  metadata.gz: b42c9bdfa974c725f6f8e9f4e2ba2be2a7710fcc817724f0ab0762063ae80d42855b572510958ec437c0142b4bb6a5a76825cd62d70fa459d190ad3ecea8f040
-  data.tar.gz: 4d3acb96498733c8e2d7d8ad8b9786db68927b78f2ccfe9627dfac98c37dc71ab1ce0a4da7c537e5c81cad2d249d40e209ce8ac7ed4809b792a7ae8b9a4f5de3
+  metadata.gz: 78020e2b1c69634080fbae981f83f0ded959d66c63415ef73808d6325c45ae0ddca7d40af0e1f0e1b3bf9bb9dd3e9e915d7817466c7947bb988d934ad8621895
+  data.tar.gz: b72efd6f4dbe6ee0a1b289062cdc6f6ebc0eb965762d48666263897fb8c3884f2f7865daef4f1121e1fe34f21339aa5f80446021defc84d75c97ec8295826b8c

data/Rakefile

@@ -2,15 +2,15 @@ require "bundler/gem_tasks"
 require "fileutils"
 require "puppetdb-terminus"
 
-desc "Download source from PuppetDB #{PuppetDB::Terminus::VERSION}"
-task :download_source do
-  version = ::PuppetDB::Terminus::VERSION.split(".")[0..2].join(".")
+desc "Synchronize lib/puppet with PuppetDB v#{PuppetDB::Terminus::UPSTREAM_VERSION} source"
+task :sync_with_upstream do
+  version = ::PuppetDB::Terminus::UPSTREAM_VERSION
   archive = "#{version}.tar.gz"
   url     = "https://github.com/puppetlabs/puppetdb/archive/#{archive}"
 
   `curl -sLO #{url}`
   FileUtils::rm_rf File.expand_path('../lib/puppet', __FILE__)
-  `tar axf #{archive} puppetdb-#{version}/puppet/lib/ --strip-components=2`
+  `tar -zxf #{archive} puppetdb-#{version}/puppet/lib/ --strip-components=2`
 end
 
-task :build => :download_source
+task :build => :sync_with_upstream

data/lib/puppet/indirector/catalog/puppetdb.rb

@@ -1,6 +1,7 @@
 require 'puppet/resource/catalog'
 require 'puppet/indirector/rest'
 require 'puppet/util/puppetdb'
+require 'time'
 
 class Puppet::Resource::Catalog::Puppetdb < Puppet::Indirector::REST
   include Puppet::Util::Puppetdb
@@ -14,8 +15,7 @@ class Puppet::Resource::Catalog::Puppetdb < Puppet::Indirector::REST
   def save(request)
     profile "catalog#save" do
       catalog = munge_catalog(request.instance, extract_extra_request_data(request))
-
-      submit_command(request.key, catalog, CommandReplaceCatalog, 4)
+      submit_command(request.key, catalog, CommandReplaceCatalog, 5)
     end
   end
 
@@ -28,6 +28,7 @@ class Puppet::Resource::Catalog::Puppetdb < Puppet::Indirector::REST
     {
       :transaction_uuid => request.options[:transaction_uuid],
       :environment => request.environment,
+      :producer_timestamp => request.options[:producer_timestamp] || Time.now.iso8601,
     }
   end
 
@@ -49,6 +50,7 @@ class Puppet::Resource::Catalog::Puppetdb < Puppet::Indirector::REST
       filter_keys(data)
       add_transaction_uuid(data, extra_request_data[:transaction_uuid])
       add_environment(data, extra_request_data[:environment])
+      add_producer_timestamp(data, extra_request_data[:producer_timestamp])
 
       data
     end
@@ -77,6 +79,18 @@ class Puppet::Resource::Catalog::Puppetdb < Puppet::Indirector::REST
     hash
   end
 
+  # Include producer_timestamp in hash, returning the complete hash.
+  #
+  # @param hash [Hash] original data hash
+  # @param producer_timestamp [String or nil] producer_tiemstamp
+  # @return [Hash] returns original hash augmented with producer_timestamp
+  # @api private
+  def add_producer_timestamp(hash, producer_timestamp)
+    hash['producer-timestamp'] = producer_timestamp
+
+    hash
+  end
+
   # Include transaction_uuid in hash, returning the complete hash.
   #
   # @param hash [Hash] original data hash

data/lib/puppet/indirector/facts/puppetdb.rb

@@ -3,6 +3,7 @@ require 'puppet/node/facts'
 require 'puppet/indirector/rest'
 require 'puppet/util/puppetdb'
 require 'json'
+require 'time'
 
 class Puppet::Node::Facts::Puppetdb < Puppet::Indirector::REST
   include Puppet::Util::Puppetdb
@@ -13,23 +14,33 @@ class Puppet::Node::Facts::Puppetdb < Puppet::Indirector::REST
     Puppet::Util::Puppetdb::GlobalCheck.run
   end
 
+  def get_trusted_info(node)
+    trusted = Puppet.lookup(:trusted_information) do
+      Puppet::Context::TrustedInformation.local(request.node)
+    end
+    trusted.to_h
+  end
+
   def save(request)
     profile "facts#save" do
       payload = profile "Encode facts command submission payload" do
         facts = request.instance.dup
         facts.values = facts.strip_internal
-        facts.stringify
+        if Puppet[:trusted_node_data]
+          facts.values[:trusted] = get_trusted_info(request.node)
+        end
         {
           "name" => facts.name,
           "values" => facts.values,
           # PDB-453: we call to_s to avoid a 'stack level too deep' error
           # when we attempt to use ActiveSupport 2.3.16 on RHEL 5 with
           # legacy storeconfigs.
-          "environment" => request.environment.to_s,
+          "environment" => request.options[:environment] || request.environment.to_s,
+          "producer-timestamp" => request.options[:producer_timestamp] || Time.now.iso8601,
         }
       end
 
-      submit_command(request.key, payload, CommandReplaceFacts, 2)
+      submit_command(request.key, payload, CommandReplaceFacts, 3)
     end
   end
 

data/lib/puppetdb/terminus/version.rb

@@ -1,5 +1,6 @@
 module PuppetDB
   module Terminus
-    VERSION = "2.1.0"
+    VERSION          = "2.2.0"
+    UPSTREAM_VERSION = VERSION.split(".")[0..2].join(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quixoten-puppetdb-terminus
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Devin Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: PuppetDB Terminus