Merge pull request #8816 from BobosilaVictor/PUP-7479/enc-enforced-lookup

(PUP-7479) Prioritize `--environment` flag over ENC for lookup

Author: GabrielNagy

acceptance/tests/parser_functions/puppet_lookup_cmd.rb

@@ -2596,6 +2596,15 @@ def data()
     "lookup in ENC specified environment failed"
   )
 
+  step "--compile uses environment specified in --envrionment flag"
+  r = on(master, puppet('lookup', '--compile', "--node #{@node1}", "--confdir #{@confdir}", "--facts #{@coderoot}/facts.yaml", "--environment env1", 'environment_key'))
+  result = r.stdout
+  assert_match(
+    /env-env1 hiera provided value/,
+    result,
+    "env1 environment_key lookup failed, expected 'env-env1 hiera"
+  )
+
   step "without --compile does not use environment specified in ENC"
   r = on(master, puppet('lookup', "--node #{@node1}", "--confdir #{@confdir}", "--facts #{@coderoot}/facts.yaml", 'environment_key'))
   result = r.stdout

lib/puppet/application/lookup.rb

@@ -363,32 +363,28 @@ def generate_scope
     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
-
-      if facts.values.empty?
-        raise _("No facts available for target node: %{node}") % { node: node}
-      end
-
-      ni = Puppet::Node.indirection
-      tc = ni.terminus_class
-
-      service = Puppet.runtime[:http]
-      session = service.create_session
-      cert = session.route_to(:ca)
-
-      cert = cert.get_certificate(node)
-      trusted = Puppet::Context::TrustedInformation.new(true, node, cert)
-
-      Puppet.override(trusted_information: trusted) do
-        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
+      facts = retrieve_node_facts(node, given_facts) 
+      if Puppet.settings.set_by_cli?('environment')
+        node = Puppet::Node.new(node, :classes => nil, :parameters => nil, :facts => facts, :environment => Puppet.settings.value('environment'))
+      else
+        ni = Puppet::Node.indirection
+        tc = ni.terminus_class
+
+        service = Puppet.runtime[:http]
+        session = service.create_session
+        cert = session.route_to(:ca)
+
+        cert = cert.get_certificate(node)
+        trusted = Puppet::Context::TrustedInformation.new(true, node, cert)
+
+        Puppet.override(trusted_information: trusted) do
+          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
         end
       end
     else
@@ -405,4 +401,16 @@ def generate_scope
       compiler.compile { |catalog| yield(compiler.topscope); catalog }
     end
   end
+
+  def retrieve_node_facts(node, given_facts)
+    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
+
+    if facts.values.empty?
+      raise _("No facts available for target node: %{node}") % { node: node}
+    end
+    facts
+  end
 end