Merge pull request #8786 from BobosilaVictor/PUP-10435/lookup-facts

(PUP-10435) Facts provided in a file can't be used for classification

Author: Dorin-Pleava

lib/puppet/application/lookup.rb

@@ -337,18 +337,6 @@ def generate_scope
       Puppet.settings[:facts_terminus] = 'facter'
     end
 
-    unless node.is_a?(Puppet::Node) # to allow unit tests to pass a node instance
-      ni = Puppet::Node.indirection
-      tc = ni.terminus_class
-      if tc == :plain || options[:compile]
-        node = ni.find(node)
-      else
-        ni.terminus_class = :plain
-        node = ni.find(node)
-        ni.terminus_class = tc
-      end
-    end
-
     fact_file = options[:fact_file]
 
     if fact_file
@@ -364,7 +352,26 @@ def generate_scope
       unless given_facts.instance_of?(Hash)
         raise _("Incorrectly formatted data in %{fact_file} given via the --facts flag (only accepts yaml and json files)") % { fact_file: fact_file }
       end
-      node.add_extra_facts(given_facts)
+    end
+
+    unless node.is_a?(Puppet::Node) # to allow unit tests to pass a node instance
+      facts = Puppet::Node::Facts.indirection.find(node, :environment => Puppet.lookup(:current_environment))
+
+      facts = Puppet::Node::Facts.new(node, {}) if facts.nil?
+      facts.add_extra_values(given_facts) if given_facts
+
+      ni = Puppet::Node.indirection
+      tc = ni.terminus_class
+
+      if tc == :plain || options[:compile]
+        node = ni.find(node, facts: facts)
+      else
+        ni.terminus_class = :plain
+        node = ni.find(node, facts: facts)
+        ni.terminus_class = tc
+      end
+    else
+      node.add_extra_facts(given_facts) if given_facts
     end
 
     Puppet[:code] = 'undef' unless options[:compile]

spec/integration/application/lookup_spec.rb

@@ -7,6 +7,7 @@
   include PuppetSpec::Files
 
   context 'with an environment' do
+    let(:facts) { Puppet::Node::Facts.new("facts", {}) }
     let(:env_name) { 'spec' }
     let(:env_dir) { tmpdir('environments') }
     let(:environment_files) do
@@ -98,6 +99,8 @@ def explain(key, options = {})
 
     it 'skip loading of external facts when run with --node' do
       app.options[:node] = "random_node"
+
+      expect(Puppet::Node::Facts.indirection).to receive(:find).and_return(facts)
       expect(Facter).to receive(:load_external).once.with(false)
       expect(Facter).to receive(:load_external).once.with(true)
       lookup('a')