Merge pull request #2585 from Magisus/v4-fact-terminus

(SERVER-3050) Allow retrieving facts from any terminus

Author: tvpartytonight

spec/puppet-server-lib/puppet/jvm/compiler_spec.rb

@@ -93,11 +93,11 @@ def set_facts(fact_hash)
 
         it 'requests facts from pdb after classifying and attempts to classify again' do
           allow(Puppet::Node::Facts.indirection.terminus).to receive(:name).and_return(:puppetdb)
-          expect(compiler).to receive(:get_facts_from_pdb)
+          expect(compiler).to receive(:get_facts_from_terminus)
                   .with(certname, 'fancy')
                   .ordered
                   .and_return(Puppet::Node::Facts.new(certname))
-          expect(compiler).to receive(:get_facts_from_pdb)
+          expect(compiler).to receive(:get_facts_from_terminus)
                   .with(certname, 'production')
                   .ordered
                   .and_return(Puppet::Node::Facts.new(certname))
@@ -114,7 +114,7 @@ def set_facts(fact_hash)
           end
 
           allow(Puppet::Node::Facts.indirection.terminus).to receive(:name).and_return(:puppetdb)
-          allow(compiler).to receive(:get_facts_from_pdb).and_return(Puppet::Node::Facts.new(certname))
+          allow(compiler).to receive(:get_facts_from_terminus).and_return(Puppet::Node::Facts.new(certname))
 
           expect(Puppet::Node.indirection).to receive(:find).and_return(
             Puppet::Node.new(certname, environment: 'production')

src/ruby/puppetserver-lib/puppet/server/compiler.rb

@@ -59,7 +59,7 @@ def create_node(request_data)
             end
 
             environment = node.environment
-            facts = get_facts_from_pdb(certname, environment.to_s)
+            facts = get_facts_from_terminus(certname, environment.to_s)
             node = Puppet.override(trusted_information: trusted_facts) do
               Puppet::Node.indirection.find(certname,
                                             environment: environment,
@@ -175,11 +175,9 @@ def process_facts(request_data)
 
       def extract_facts(request_data)
         if request_data['facts'].nil?
-          if Puppet::Node::Facts.indirection.terminus.name.to_s == "puppetdb"
-            facts = get_facts_from_pdb(request_data['certname'], request_data['environment'])
-          else
-            raise(Puppet::Error, "PuppetDB not configured, please provide facts with your catalog request.")
-          end
+          Puppet.debug _("No facts submitted with request, retrieving from %{terminus_name}.") % { terminus_name: Puppet::Node::Facts.indirection.terminus.name.to_s }
+          facts = get_facts_from_terminus(request_data['certname'],
+                                          request_data['environment'])
         else
           facts_from_request = request_data['facts']
 
@@ -209,16 +207,11 @@ def extract_trusted_facts(request_data, facts)
         trusted_facts ||= {}
       end
 
-      def get_facts_from_pdb(nodename, environment)
-        pdb_terminus = Puppet::Node::Facts::Puppetdb.new
-        request = Puppet::Indirector::Request.new(pdb_terminus.class.name,
-                                                  :find,
-                                                  nodename,
-                                                  nil,
-                                                  :environment => environment)
-        facts = pdb_terminus.find(request)
+      def get_facts_from_terminus(nodename, environment)
+        facts = Puppet::Node::Facts.indirection.find(nodename,
+                                                     {environment: environment})
 
-        # If no facts have been stored for the node, PDB will return nil
+        # If no facts have been stored for the node, the terminus will return nil
         if facts.nil?
           # Create an empty facts object
           facts = Puppet::Node::Facts.new(nodename)