(maint) Merge up 6a2beb8 to main

Generated by CI

* commit '6a2beb84aa910a815de3628165d7f08fed0df3b1':
  (PUP-1460) Skip retrieving checksum for FIFO and socket files
  (PUP-7479) Prioritize `--environment` flag over ENC for lookup

Author: puppetlabs-jenkins

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

acceptance/tests/resource/file/handle_fifo_files.rb

@@ -0,0 +1,63 @@
+test_name "should be able to handle fifo files"
+tag 'audit:high',
+    'audit:acceptance'
+confine :except, :platform => /windows/
+
+def ensure_content_to_file_manifest(file_path, ensure_value)
+  return <<-MANIFEST
+  file { "#{file_path}":
+    ensure => #{ensure_value},
+    content => "Hello World"
+  }
+  MANIFEST
+end
+
+agents.each do |agent|
+  tmp_path = agent.tmpdir("tmpdir")
+  fifo_path = "#{tmp_path}/myfifo"
+
+  teardown do
+    agent.rm_rf(tmp_path)
+  end
+
+  step "create fifo" do
+    on(agent, "mkfifo #{fifo_path}")
+  end
+
+  step "check that fifo got created" do
+    on(agent, "ls -l #{fifo_path}") do |result|
+      assert(result.stdout.start_with?('p'))
+    end
+  end
+
+  step "puppet ensures given fifo is present" do
+    apply_manifest_on(agent, ensure_content_to_file_manifest(fifo_path, 'present'), :acceptable_exit_codes => [2]) do
+      assert_match(/Warning: .+ Ensure set to :present but file type is fifo so no content will be synced/, stderr)
+    end
+  end
+
+  step "check that given file is still a fifo" do
+    on(agent, "ls -l #{fifo_path}") do |result|
+      assert(result.stdout.start_with?('p'))
+    end
+  end
+
+  step "puppet ensures given fifo is a regular file" do
+    apply_manifest_on(agent, ensure_content_to_file_manifest(fifo_path, 'file'), :acceptable_exit_codes => [0]) do
+      assert_match(/Notice: .+\/myfifo\]\/ensure: defined content as '{/, stdout)
+      assert_no_match(/Warning: .+ Ensure set to :present but file type is fifo so no content will be synced/, stderr)
+    end
+  end
+
+  step "check that given fifo is now a regular file" do
+    on(agent, "ls -l #{fifo_path}") do |result|
+      assert(result.stdout.start_with?('-'))
+    end
+  end
+
+  step "check that given file now has desired content" do
+    on(agent, "cat #{fifo_path}") do |result|
+      assert_equal('Hello World', result.stdout)
+    end
+  end
+end

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

lib/puppet/type/file/data_sync.rb

@@ -79,7 +79,7 @@ def retrieve_checksum(resource)
       return :absent unless stat
       ftype = stat.ftype
       # Don't even try to manage the content on directories or links
-      return nil if ["directory","link"].include?(ftype)
+      return nil if ['directory', 'link', 'fifo', 'socket'].include?(ftype)
 
       begin
         resource.parameter(:checksum).sum_file(resource[:path])