puppet 6.4.5-universal-darwin → 6.5.0-universal-darwin

data/lib/puppet/test/test_helper.rb

@@ -145,6 +145,7 @@ module Puppet::Test
       Puppet::Util::Profiler.clear
 
       Puppet::SSL::Host.reset
+      Puppet::Rest::Routes.clear
 
       Puppet.clear_deprecation_warnings
     end

data/lib/puppet/transaction.rb

@@ -57,11 +57,7 @@ class Puppet::Transaction
 
     @prefetch_failed_providers = Hash.new { |h,k| h[k] = {} }
 
-    # With merge_dependency_warnings, notify and warn about class dependency failures ... just once per class. TJK 2019-09-09
-    @merge_dependency_warnings = Puppet[:merge_dependency_warnings]
     @failed_dependencies_already_notified = Set.new()
-    @failed_class_dependencies_already_notified = Set.new()
-    @failed_class_dependencies_already_warned = Set.new()
   end
 
   # Invoke the pre_run_check hook in every resource in the catalog.
@@ -291,25 +287,15 @@ class Puppet::Transaction
     # explosion of edges, we also ended up reporting failures for containers
     # like class and stage.  This is undesirable; while just skipping the
     # output isn't perfect, it is RC-safe. --daniel 2011-06-07
-    is_puppet_class = resource.class == Puppet::Type.type(:whit)
-    # With merge_dependency_warnings, notify about class dependency failures ... just once per class. TJK 2019-09-09
+    suppress_report = (resource.class == Puppet::Type.type(:whit))
+
     s = resource_status(resource)
     if s && s.dependency_failed?
-      if @merge_dependency_warnings && is_puppet_class
-       	# Notes: Puppet::Resource::Status.failed_dependencies() is an Array of Puppet::Resource(s) and
-        #        Puppet::Resource.ref() calls Puppet::Resource.to_s() which is: "#{type}[#{title}]" and
-       	#        Puppet::Resource.resource_status(resource) calls Puppet::Resource.to_s()
-        class_dependencies_to_be_notified = (s.failed_dependencies.map(&:ref) - @failed_class_dependencies_already_notified.to_a)
-        class_dependencies_to_be_notified.each do |dep_ref|
-          resource.notice _("Class dependency %{dep} has failures: %{status}") % { dep: dep_ref, status: resource_status(dep_ref).failed }
-        end
-        @failed_class_dependencies_already_notified.merge(class_dependencies_to_be_notified)
-      else
-        unless @merge_dependency_warnings || is_puppet_class
-          s.failed_dependencies.find_all { |d| !(@failed_dependencies_already_notified.include?(d.ref)) }.each do |dep|
-            resource.notice _("Dependency %{dep} has failures: %{status}") % { dep: dep, status: resource_status(dep).failed }
-            @failed_dependencies_already_notified.add(dep.ref)
-          end
+      # See above. --daniel 2011-06-06
+      unless suppress_report then
+        s.failed_dependencies.find_all { |d| !(@failed_dependencies_already_notified.include?(d.ref)) }.each do |dep|
+          resource.notice _("Dependency %{dep} has failures: %{status}") % { dep: dep, status: resource_status(dep).failed }
+          @failed_dependencies_already_notified.add(dep.ref)
         end
       end
     end
@@ -409,19 +395,11 @@ class Puppet::Transaction
       # explosion of edges, we also ended up reporting failures for containers
       # like class and stage.  This is undesirable; while just skipping the
       # output isn't perfect, it is RC-safe. --daniel 2011-06-07
-      # With merge_dependency_warnings, warn about class dependency failures ... just once per class. TJK 2019-09-09
-      unless resource.class == Puppet::Type.type(:whit)
-        if @merge_dependency_warnings && resource.parent && failed_dependencies?(resource.parent)
-          ps = resource_status(resource.parent)
-          ps.failed_dependencies.find_all { |d| !(@failed_class_dependencies_already_warned.include?(d.ref)) }.each do |dep|
-            resource.parent.warning _("Skipping resources in class because of failed class dependencies")
-            @failed_class_dependencies_already_warned.add(dep.ref)
-          end
-        else
-          resource.warning _("Skipping because of failed dependencies")
-        end
+      unless resource.class == Puppet::Type.type(:whit) then
+        resource.warning _("Skipping because of failed dependencies")
       end
-    elsif resource_status(resource).failed? && @prefetch_failed_providers[resource.type][resource.provider.class.name]
+    elsif resource_status(resource).failed? &&
+        @prefetch_failed_providers[resource.type][resource.provider.class.name]
       #Do not try to evaluate a resource with a known failed provider
       resource.warning _("Skipping because provider prefetch failed")
     elsif resource.virtual?

data/lib/puppet/transaction/report.rb

@@ -346,7 +346,7 @@ class Puppet::Transaction::Report
     report = raw_summary
 
     ret = ""
-    report.keys.sort_by(&:to_s).each do |key|
+    report.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |key|
       ret += "#{Puppet::Util::Metric.labelize(key)}:\n"
 
       report[key].keys.sort { |a,b|

data/lib/puppet/type.rb

@@ -1454,7 +1454,7 @@ class Type
           }
 
       Tags are useful for things like applying a subset of a host's configuration
-      with [the `tags` setting](https://puppet.com/docs/puppet/latest/configuration.html#tags)
+      with [the `tags` setting](/puppet/latest/configuration.html#tags)
       (e.g. `puppet agent --test --tags bootstrap`)."
 
     munge do |tags|
@@ -1916,7 +1916,9 @@ end
         # Since we're mixing @doc with text from other sources, we must normalize
         # its indentation with scrub. But we don't need to manually scrub the
         # provider's doc string, since markdown_definitionlist sanitizes its inputs.
-        scrub(@doc) + "Available providers are:\n\n" + parenttype.providers.sort_by(&:to_s).collect { |i|
+        scrub(@doc) + "Available providers are:\n\n" + parenttype.providers.sort { |a,b|
+          a.to_s <=> b.to_s
+        }.collect { |i|
           markdown_definitionlist( i, scrub(parenttype().provider(i).doc) )
         }.join
       end

data/lib/puppet/type/exec.rb

@@ -23,6 +23,9 @@ module Puppet
       consider developing a custom resource type instead, as it will be much
       more predictable and maintainable.
 
+      **Duplication:** Even though `command` is the namevar, Puppet allows
+      multiple `exec` resources with the same `command` value.
+
       **Refresh:** `exec` resources can respond to refresh events (via
       `notify`, `subscribe`, or the `~>` arrow). The refresh behavior of execs
       is non-standard, and can be affected by the `refresh` and
@@ -150,13 +153,9 @@ module Puppet
             end
           end
           unless log == :false
-            if @resource.parameter(:command).sensitive
-              self.send(log, "[output redacted]")
-            else
-              @output.split(/\n/).each { |line|
-                self.send(log, line)
-              }
-            end
+            @output.split(/\n/).each { |line|
+              self.send(log, line)
+            }
           end
         end
 
@@ -180,7 +179,10 @@ module Puppet
         succeeds, any output produced will be logged at the instance's
         normal log level (usually `notice`), but if the command fails
         (meaning its return code does not match the specified code) then
-        any output is logged at the `err` log level."
+        any output is logged at the `err` log level.
+
+        Multiple `exec` resources can use the same `command` value; Puppet
+        only uses the resource title to ensure `exec`s are unique."
 
       validate do |command|
         raise ArgumentError, _("Command must be a String, got value of class %{klass}") % { klass: command.class } unless command.is_a? String
@@ -461,13 +463,9 @@ module Puppet
           return false
         end
 
-        if sensitive
-          self.debug("[output redacted]")
-        else
-          output.split(/\n/).each { |line|
-            self.debug(line)
-          }
-        end
+        output.split(/\n/).each { |line|
+          self.debug(line)
+        }
 
         status.exitstatus != 0
       end
@@ -517,13 +515,9 @@ module Puppet
           return false
         end
 
-        if sensitive
-          self.debug("[output redacted]")
-        else
-          output.split(/\n/).each { |line|
-            self.debug(line)
-          }
-        end
+        output.split(/\n/).each { |line|
+          self.debug(line)
+        }
 
         status.exitstatus == 0
       end
@@ -640,7 +634,7 @@ module Puppet
       sensitive = false
       parameters_to_check = [:command, :unless, :onlyif]
 
-      parameters_to_check.each do |p| 
+      parameters_to_check.each do |p|
         if sensitive_parameters.include?(p)
           sensitive_parameters.delete(p)
           sensitive = true

data/lib/puppet/type/file.rb

@@ -32,9 +32,9 @@ Puppet::Type.newtype(:file) do
     **Autorequires:** If Puppet is managing the user or group that owns a
     file, the file resource will autorequire them. If Puppet is managing any
     parent directories of a file, the file resource autorequires them.
-    
-    Warning: Enabling `recurse` on directories containing large numbers of 
-    files slows agent runs. To manage file attributes for many files, 
+
+    Warning: Enabling `recurse` on directories containing large numbers of
+    files slows agent runs. To manage file attributes for many files,
     consider using alternative methods such as the `chmod_r`, `chown_r`,
      or `recursive_file_permissions` modules from the Forge."
 
@@ -298,6 +298,30 @@ Puppet::Type.newtype(:file) do
     defaultto :true
   end
 
+  newparam(:staging_location) do
+    desc "When rendering a file first render it to this location. The default
+         location is the same path as the desired location with a unique filename.
+         This parameter is useful in conjuction with validate_cmd to test a
+         file before moving the file to it's final location.
+         WARNING: File replacement is only guaranteed to be atomic if the staging
+         location is on the same filesystem as the final location."
+
+    validate do |value|
+      unless Puppet::Util.absolute_path?(value)
+        fail Puppet::Error, "File paths must be fully qualified, not '#{value}'"
+      end
+    end
+
+    munge do |value|
+      if value.start_with?('//') and ::File.basename(value) == "/"
+        # This is a UNC path pointing to a share, so don't add a trailing slash
+        ::File.expand_path(value)
+      else
+        ::File.join(::File.split(::File.expand_path(value)))
+      end
+    end
+  end
+
   newparam(:validate_cmd) do
     desc "A command for validating the file's syntax before replacing it. If
       Puppet would need to rewrite a file due to new `source` or `content`, it
@@ -577,7 +601,8 @@ Puppet::Type.newtype(:file) do
     # remote system.
     mark_children_for_purging(children) if self.purge?
 
-    result = children.values.sort_by { |a| a[:path] }
+    # REVISIT: sort_by is more efficient?
+    result = children.values.sort { |a, b| a[:path] <=> b[:path] }
     remove_less_specific_files(result)
   end
 
@@ -861,7 +886,16 @@ Puppet::Type.newtype(:file) do
     mode_int = mode ? symbolic_mode_to_int(mode, Puppet::Util::DEFAULT_POSIX_MODE) : nil
 
     if write_temporary_file?
-      Puppet::Util.replace_file(self[:path], mode_int) do |file|
+      if self[:validate_cmd]
+        validate_callback = proc { |path|
+          output = Puppet::Util::Execution.execute(self[:validate_cmd].gsub(self[:validate_replacement], path), :failonfail => true, :combine => true)
+          output.split(/\n/).each { |line|
+            self.debug(line)
+          }
+        }
+      end
+
+      Puppet::Util.replace_file(self[:path], mode_int, staging_location: self[:staging_location], validate_callback: validate_callback) do |file|
         file.binmode
         devfail 'a property should have been provided if write_temporary_file? returned true' if property.nil?
         content_checksum = property.write(file)
@@ -879,12 +913,6 @@ Puppet::Type.newtype(:file) do
         end
 
         fail_if_checksum_is_wrong(file.path, content_checksum) if validate_checksum?
-        if self[:validate_cmd]
-          output = Puppet::Util::Execution.execute(self[:validate_cmd].gsub(self[:validate_replacement], file.path), :failonfail => true, :combine => true)
-          output.split(/\n/).each { |line|
-            self.debug(line)
-          }
-        end
       end
     else
       umask = mode ? 000 : 022

data/lib/puppet/type/file/data_sync.rb

@@ -42,11 +42,7 @@ module Puppet
           send resource[:loglevel], "[diff redacted]"
         else
           write_temporarily(param) do |path|
-            diff_output = diff(resource[:path], path)
-            if diff_output.encoding == Encoding::BINARY || !diff_output.valid_encoding?
-              diff_output = "Binary files #{resource[:path]} and #{path} differ"
-            end
-            send resource[:loglevel], "\n" + diff_output
+            send resource[:loglevel], "\n" + diff(resource[:path], path)
           end
         end
       end

data/lib/puppet/type/group.rb

@@ -175,8 +175,7 @@ module Puppet
     end
 
     newparam(:ia_load_module, :required_features => :manages_aix_lam) do
-      desc "The name of the I&A module to use to manage this group.
-        This should be set to `files` if managing local groups."
+      desc "The name of the I&A module to use to manage this user"
     end
 
     newproperty(:attributes, :parent => Puppet::Property::KeyValue, :required_features => :manages_aix_lam) do
@@ -217,8 +216,7 @@ module Puppet
              :required_features => :libuser,
              :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
-            being managed by some other NSS. For AIX, refer to the
-            `ia_load_module` parameter."
+            being managed by some other NSS"
       defaultto false
     end
 

data/lib/puppet/type/notify.rb

@@ -4,19 +4,18 @@
 
 module Puppet
   Type.newtype(:notify) do
-    @doc = "Sends an arbitrary message to the agent run-time log."
+    @doc = "Sends an arbitrary message to the agent run-time log. It's important to note that the notify resource type is not idempotent. As a result, notifications are shown as a change on every Puppet run."
 
     apply_to_all
 
     newproperty(:message, :idempotent => false) do
       desc "The message to be sent to the log."
       def sync
-        message = @sensitive ? 'Sensitive [value redacted]' : self.should
         case @resource["withpath"]
         when :true
-          send(@resource[:loglevel], message)
+          send(@resource[:loglevel], self.should)
         else
-          Puppet.send(@resource[:loglevel], message)
+          Puppet.send(@resource[:loglevel], self.should)
         end
         return
       end

data/lib/puppet/type/package.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Define the different packaging systems.  Each package system is implemented
 # in a module, which then gets used to individually extend each package object.
 # This allows packages to exist on the same machine using different packaging
@@ -57,7 +56,6 @@ module Puppet
         a user or another package. Held is considered a superset of
         installed.",
       :methods => [:hold]
-    feature :install_only, "The provider accepts options to only install packages never update (kernels, etc.)"
     feature :install_options, "The provider accepts options to be
       passed to the installer command."
     feature :uninstall_options, "The provider accepts options to be
@@ -485,16 +483,8 @@ module Puppet
     end
 
     newparam(:flavor) do
-      desc "OpenBSD and DNF modules support 'flavors', which are
-        further specifications for which type of package you want."
-    end
-
-    newparam(:install_only, :boolean => false, :parent => Puppet::Parameter::Boolean, :required_features => :install_only) do
-      desc <<-EOT
-        It should be set for packages that should only ever be installed,
-        never updated. Kernels in particular fall into this category.
-      EOT
-      defaultto false
+      desc "OpenBSD supports 'flavors', which are further specifications for
+        which type of package you want."
     end
 
     newparam(:install_options, :parent => Puppet::Parameter::PackageOptions, :required_features => :install_options) do
@@ -548,14 +538,7 @@ module Puppet
     newparam(:allow_virtual, :boolean => true, :parent => Puppet::Parameter::Boolean, :required_features => :virtual_packages) do
       desc 'Specifies if virtual package names are allowed for install and uninstall.'
 
-      defaultto do
-        provider_class = provider.class
-        if provider_class.respond_to?(:defaultto_allow_virtual)
-          provider_class.defaultto_allow_virtual
-        else
-          true
-        end
-      end
+      defaultto true
     end
 
     autorequire(:file) do

data/lib/puppet/type/schedule.rb

@@ -338,7 +338,7 @@ module Puppet
       end
 
       def weekday_integer?(value)
-        value.is_a?(Integer) && (0..6).cover?(value)
+        value.is_a?(Integer) && (0..6).include?(value)
       end
 
       def weekday_string?(value)

data/lib/puppet/type/service.rb

@@ -75,11 +75,6 @@ module Puppet
         provider.enabled?
       end
 
-      # This only works on Windows systems.
-      newvalue(:delayed, :event => :service_delayed_start) do
-        provider.delayed_start
-      end
-
       # This only makes sense on systemd systems. Static services cannot be enabled
       # or disabled manually.
       def insync?(current)
@@ -92,8 +87,8 @@ module Puppet
       end
 
       validate do |value|
-        if (value == :manual || value == :delayed) && !Puppet::Util::Platform.windows?
-          raise Puppet::Error.new(_("Setting enable to %{value} is only supported on Microsoft Windows.") % { value: value.to_s} )
+        if value == :manual && !Puppet::Util::Platform.windows?
+          raise Puppet::Error.new(_("Setting enable to manual is only supported on Microsoft Windows."))
         end
       end
     end
@@ -230,7 +225,7 @@ module Puppet
       desc "The control variable used to manage services (originally for HP-UX).
         Defaults to the upcased service name plus `START` replacing dots with
         underscores, for those providers that support the `controllable` feature."
-      defaultto { resource.name.tr(".","_").upcase + "_START" if resource.provider.controllable? }
+      defaultto { resource.name.gsub(".","_").upcase + "_START" if resource.provider.controllable? }
     end
 
     newparam :hasrestart do

data/lib/puppet/type/user.rb

@@ -614,8 +614,7 @@ module Puppet
     end
 
     newparam(:ia_load_module, :required_features => :manages_aix_lam) do
-      desc "The name of the I&A module to use to manage this user.
-        This should be set to `files` if managing local users."
+      desc "The name of the I&A module to use to manage this user."
     end
 
     newproperty(:attributes, :parent => Puppet::Property::KeyValue, :required_features => :manages_aix_lam) do
@@ -679,8 +678,7 @@ module Puppet
             :required_features => :libuser,
             :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
-            being managed by some other NSS. For AIX, refer to the
-            `ia_load_module` parameter."
+            being managed by some other NSS"
       defaultto false
     end
 

data/lib/puppet/util.rb

@@ -322,7 +322,7 @@ module Util
     params = { :scheme => 'file' }
 
     if Puppet::Util::Platform.windows?
-      path = path.tr('\\', '/')
+      path = path.gsub(/\\/, '/')
 
       if unc = /^\/\/([^\/]+)(\/.+)/.match(path)
         params[:host] = unc[1]
@@ -523,44 +523,21 @@ module Util
 
   module_function :thinmark
 
-  PUPPET_STACK_INSERTION_FRAME = /.*puppet_stack\.rb.*in.*`stack'/
-
   # utility method to get the current call stack and format it to a human-readable string (which some IDEs/editors
   # will recognize as links to the line numbers in the trace)
-  def self.pretty_backtrace(backtrace = caller(1), puppetstack = [])
-    format_backtrace_array(backtrace, puppetstack).join("\n")
-  end
-
-  # arguments may be a Ruby stack, with an optional Puppet stack argument,
-  # or just a Puppet stack.
-  # stacks may be an Array of Strings "/foo.rb:0 in `blah'" or
-  # an Array of Arrays that represent a frame: ["/foo.pp", 0]
-  def self.format_backtrace_array(primary_stack, puppetstack = [])
-    primary_stack.flat_map do |frame|
-      frame = format_puppetstack_frame(frame) if frame.is_a?(Array)
-      primary_frame = resolve_stackframe(frame)
-
-      if primary_frame =~ PUPPET_STACK_INSERTION_FRAME && !puppetstack.empty?
-        [resolve_stackframe(format_puppetstack_frame(puppetstack.shift)),
-         primary_frame]
+  def self.pretty_backtrace(backtrace = caller(1))
+    backtrace.collect do |line|
+      _, path, rest = /^(.*):(\d+.*)$/.match(line).to_a
+      # If the path doesn't exist - like in one test, and like could happen in
+      # the world - we should just tolerate it and carry on. --daniel 2012-09-05
+      # Also, if we don't match, just include the whole line.
+      if path
+        path = Pathname(path).realpath rescue path
+        "#{path}:#{rest}"
       else
-        primary_frame
+        line
       end
-    end
-  end
-
-  def self.resolve_stackframe(frame)
-    _, path, rest = /^(.*):(\d+.*)$/.match(frame).to_a
-    if path
-      path = Pathname(path).realpath rescue path
-      "#{path}:#{rest}"
-    else
-      frame
-    end
-  end
-
-  def self.format_puppetstack_frame(file_and_lineno)
-    file_and_lineno.join(':')
+    end.join("\n")
   end
 
   # Replace a file, securely.  This takes a block, and passes it the file
@@ -574,7 +551,7 @@ module Util
   # preserved.  This works hard to avoid loss of any metadata, but will result
   # in an inode change for the file.
   #
-  # Arguments: `filename`, `default_mode`
+  # Arguments: `filename`, `default_mode`, `staging_location`
   #
   # The filename is the file we are going to replace.
   #
@@ -582,11 +559,14 @@ module Util
   # exist; if the file is present we copy the existing mode/owner/group values
   # across. The default_mode can be expressed as an octal integer, a numeric string (ie '0664')
   # or a symbolic file mode.
+  #
+  # The staging_location is a location to render the temporary file before
+  # moving the file to it's final location.
 
   DEFAULT_POSIX_MODE = 0644
   DEFAULT_WINDOWS_MODE = nil
 
-  def replace_file(file, default_mode, &block)
+  def replace_file(file, default_mode, staging_location: nil, validate_callback: nil, &block)
     raise Puppet::DevError, _("replace_file requires a block") unless block_given?
 
     if default_mode
@@ -604,9 +584,15 @@ module Util
     end
 
     begin
-      file     = Puppet::FileSystem.pathname(file)
+      file = Puppet::FileSystem.pathname(file)
+
       # encoding for Uniquefile is not important here because the caller writes to it as it sees fit
-      tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(file), Puppet::FileSystem.dir_string(file))
+      if staging_location
+        tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(file), staging_location)
+      else
+        tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(file), Puppet::FileSystem.dir_string(file))
+      end
+
 
       effective_mode =
       if !Puppet::Util::Platform.windows?
@@ -646,6 +632,10 @@ module Util
 
       tempfile.close
 
+      if validate_callback
+        validate_callback.call(tempfile.path)
+      end
+
       if Puppet::Util::Platform.windows?
         # Windows ReplaceFile needs a file to exist, so touch handles this
         if !Puppet::FileSystem.exist?(file)