puppet 6.9.0 → 6.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e29fb771008f2391db8072a7c609e3388d1941f07ce3726b1e4f46e224f419d
-  data.tar.gz: 016e177050c07c41fbd16447c027d8353f5fe02bc9169b849e26d5a4be54d4ae
+  metadata.gz: 59f14a1638260b64116990632bc1e2e9f3bc9c9f67d6ac8e6d000364754eec95
+  data.tar.gz: 5653930e2713ccbfd33e67ae9d9e01694852cb98625a4411dfb43bdafaf5addd
 SHA512:
-  metadata.gz: bd9d5695bbc4945aa90afe21df95b1b639ac049904e6595bdd9406e686a20eb0255773eed7476549c97a2aed29ee13cd4a1367705ec032e629addecc63ce6bf1
-  data.tar.gz: d89df5ab8202cc7c44e53ecbb6a35eb14cbbaf77312d43b30b0cd97ddaca243141e6c0e8994f9d22aaadefe0a70f3aabdb7addd1720066a423b5c8a4206aae6a
+  metadata.gz: 3e897cb8963e9c4b71cfb3c781f77d99f43bd46ddfb34e29fb9924a53076ec3374b79063ff9cc62ba2c7d5caac172cbaffd6a9fd8d459b68632f00b439954e96
+  data.tar.gz: d7aef922b4b92835a505bf5d62b787c28e8054d752e3148cdf3b7fdd5956f5b38961798e61338c4585a0c39a5c70264af414c55e6e5ed848e91a6dfd345a693c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.9.0)
+    puppet (6.10.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       facter (>= 2.4.0, < 4)
@@ -64,7 +64,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (4.0.1)
-    puppet-resource_api (1.8.6)
+    puppet-resource_api (1.8.7)
       hocon (>= 1.0)
     puppetserver-ca (1.4.0)
       facter (>= 2.0.1, < 4)

data/lib/puppet/application/agent.rb

@@ -238,6 +238,10 @@ generated by running puppet agent with '--genconfig'.
   not start for another half hour).
 
   'puppet agent' exits after executing this.
+  
+*  --evaltrace:
+  Logs each resource as it is being evaluated. This allows you to interactively see exactly what is being done. (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
+
 
 * --fingerprint:
   Display the current certificate or certificate signing request
@@ -291,6 +295,11 @@ generated by running puppet agent with '--genconfig'.
   Enable the most common options used for testing. These are 'onetime',
   'verbose', 'no-daemonize', 'no-usecacheonfailure', 'detailed-exitcodes',
   'no-splay', and 'show_diff'.
+  
+* --trace
+  Prints stack traces on some errors. (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
+
+
 
 * --verbose:
   Turn on verbose reporting.

data/lib/puppet/application/device.rb

@@ -315,10 +315,10 @@ Licensed under the Apache 2.0 License
               Puppet.info _("retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}") % { resource: type, target: device.name, scheme: scheme, url_host: device_url.host, port: port, url_path: device_url.path }
               resources = find_resources(type, name)
               if options[:to_yaml]
-                text = resources.map do |resource|
-                  resource.prune_parameters(:parameters_to_include => @extra_params).to_hierayaml.force_encoding(Encoding.default_external)
-                end.join("\n")
-                text.prepend("#{type.downcase}:\n")
+                data = resources.map do |resource|
+                  resource.prune_parameters(:parameters_to_include => @extra_params).to_hiera_hash
+                end.inject(:merge!)
+                text = YAML.dump(type.downcase => data)
               else
                 text = resources.map do |resource|
                   resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest.force_encoding(Encoding.default_external)

data/lib/puppet/application/resource.rb

@@ -142,10 +142,10 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
       resources = find_or_save_resources(type, name, params)
 
     if options[:to_yaml]
-      text = resources.map do |resource|
-        resource.prune_parameters(:parameters_to_include => @extra_params).to_hierayaml.force_encoding(Encoding.default_external)
-      end.join("\n")
-      text.prepend("#{type.downcase}:\n")
+      data = resources.map do |resource|
+        resource.prune_parameters(:parameters_to_include => @extra_params).to_hiera_hash
+      end.inject(:merge!)
+      text = YAML.dump(type.downcase => data)
     else
       text = resources.map do |resource|
         resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest.force_encoding(Encoding.default_external)

data/lib/puppet/defaults.rb

@@ -1972,10 +1972,10 @@ EOT
         require 'puppet/node'
         require 'puppet/node/facts'
         if value
-          Puppet::Resource::Catalog.indirection.cache_class = :store_configs
+          Puppet::Resource::Catalog.indirection.set_global_setting(:cache_class, :store_configs)
           Puppet.settings.override_default(:catalog_cache_terminus, :store_configs)
-          Puppet::Node::Facts.indirection.cache_class = :store_configs
-          Puppet::Resource.indirection.terminus_class = :store_configs
+          Puppet::Node::Facts.indirection.set_global_setting(:cache_class, :store_configs)
+          Puppet::Resource.indirection.set_global_setting(:terminus_class, :store_configs)
         end
       end
     },

data/lib/puppet/functions/yaml_data.rb

@@ -1,12 +1,13 @@
+
+require 'yaml'
 # The `yaml_data` is a hiera 5 `data_hash` data provider function.
 # See [the configuration guide documentation](https://puppet.com/docs/puppet/latest/hiera_config_yaml_5.html#configuring-a-hierarchy-level-built-in-backends) for
 # how to use this function.
 #
 # @since 4.8.0
 #
-require 'yaml'
-
 Puppet::Functions.create_function(:yaml_data) do
+  # @since 4.8.0
   dispatch :yaml_data do
     param 'Struct[{path=>String[1]}]', :options
     param 'Puppet::LookupContext', :context

data/lib/puppet/indirector.rb

@@ -24,8 +24,8 @@ module Puppet::Indirector
       indirection = Puppet::Indirector::Indirection.instance(indirection_name)
       raise _("Indirection %{indirection_name} does not exist") % { indirection_name: indirection_name } unless indirection
 
-      indirection.terminus_class = terminus_name if terminus_name
-      indirection.cache_class = cache_name if cache_name
+      indirection.set_global_setting(:terminus_class, terminus_name) if terminus_name
+      indirection.set_global_setting(:cache_class, cache_name) if cache_name
     end
   end
 

data/lib/puppet/indirector/indirection.rb

@@ -2,6 +2,7 @@ require 'puppet/util/docs'
 require 'puppet/util/profiler'
 require 'puppet/indirector/envelope'
 require 'puppet/indirector/request'
+require 'puppet/thread_local'
 
 # The class that connects functional classes with their different collection
 # back-ends.  Each indirection has a set of associated terminus classes,
@@ -45,11 +46,14 @@ class Puppet::Indirector::Indirection
     cache_class ? true : false
   end
 
-  attr_reader :cache_class
+  def cache_class
+    @cache_class.value
+  end
+
   # Define a terminus class to be used for caching.
   def cache_class=(class_name)
     validate_terminus_class(class_name) if class_name
-    @cache_class = class_name
+    @cache_class.value = class_name
   end
 
   # This is only used for testing.
@@ -101,10 +105,26 @@ class Puppet::Indirector::Indirection
     @indirected_class = indirected_class
     self.extend(extend) if extend
 
-    # These setters depend on the indirection already being installed so they have to be at the end
-    self.cache_class = cache_class if cache_class
-    self.terminus_class = terminus_class if terminus_class
-    self.terminus_setting = terminus_setting if terminus_setting
+    # Setting these depend on the indirection already being installed so they have to be at the end
+    set_global_setting(:cache_class, cache_class)
+    set_global_setting(:terminus_class, terminus_class)
+    set_global_setting(:terminus_setting, terminus_setting)
+  end
+
+  # Use this to set indirector settings globally across threads.
+  def set_global_setting(setting, value)
+    case setting
+    when :cache_class
+      validate_terminus_class(value) if !value.nil?
+      @cache_class = Puppet::ThreadLocal.new(value)
+    when :terminus_class
+      validate_terminus_class(value) if !value.nil?
+      @terminus_class = Puppet::ThreadLocal.new(value)
+    when :terminus_setting
+      @terminus_setting = Puppet::ThreadLocal.new(value)
+    else
+      raise(ArgumentError, _("The setting %{setting} is not a valid indirection setting.") % {setting: setting})
+    end
   end
 
   # Set up our request object.
@@ -120,12 +140,18 @@ class Puppet::Indirector::Indirection
     termini[terminus_name] ||= make_terminus(terminus_name)
   end
 
-  # This can be used to select the terminus class.
-  attr_accessor :terminus_setting
+  # These can be used to select the terminus class.
+  def terminus_setting
+    @terminus_setting.value
+  end
+
+  def terminus_setting=(setting)
+    @terminus_setting.value = setting
+  end
 
   # Determine the terminus class.
   def terminus_class
-    unless @terminus_class
+    unless @terminus_class.value
       setting = self.terminus_setting
       if setting
         self.terminus_class = Puppet.settings[setting]
@@ -133,17 +159,17 @@ class Puppet::Indirector::Indirection
         raise Puppet::DevError, _("No terminus class nor terminus setting was provided for indirection %{name}") % { name: self.name}
       end
     end
-    @terminus_class
+    @terminus_class.value
   end
 
   def reset_terminus_class
-    @terminus_class = nil
+    @terminus_class.value = nil
   end
 
   # Specify the terminus class to use.
   def terminus_class=(klass)
     validate_terminus_class(klass)
-    @terminus_class = klass
+    @terminus_class.value = klass
   end
 
   # This is used by terminus_class= and cache=.

data/lib/puppet/provider/package/pip.rb

@@ -87,9 +87,9 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
   end
 
   # Parse lines of output from `pip freeze`, which are structured as:
-  # _package_==_version_
+  # _package_==_version_ or _package_===_version_
   def self.parse(line)
-    if line.chomp =~ /^([^=]+)==([^=]+)$/
+    if line.chomp =~ /^([^=]+)===?([^=]+)$/
       {:ensure => $2, :name => $1, :provider => name}
     end
   end

data/lib/puppet/resource.rb

@@ -432,6 +432,8 @@ class Puppet::Resource
   end
 
   # Convert our resource to yaml for Hiera purposes.
+  #
+  # @deprecated Use {to_hiera_hash} instead.
   def to_hierayaml
     # Collect list of attributes to align => and move ensure first
     attr = parameters.keys
@@ -451,6 +453,21 @@ class Puppet::Resource
     "  %s:\n%s" % [self.title, attributes]
   end
 
+  # Convert our resource to a hiera hash suitable for serialization.
+  def to_hiera_hash
+    # to_data_hash converts to safe Data types, e.g. no symbols, unicode replacement character
+    h = to_data_hash
+
+    params = h['parameters'] || {}
+    value = params.delete('ensure')
+
+    res = {}
+    res['ensure'] = value if value
+    res.merge!(Hash[params.sort])
+
+    return { h['title'] => res }
+  end
+
   # Convert our resource to Puppet code.
   def to_manifest
     # Collect list of attributes to align => and move ensure first

data/lib/puppet/ssl/openssl_loader.rb

@@ -21,8 +21,4 @@ else
       class Certificate; end
     end
   end
-
-  Puppet::SSL::Certificate.indirection.terminus = :none
-  Puppet::SSL::CertificateRequest.indirection.terminus = :none
-  Puppet::SSL::Key.indirection.terminus = :none
 end

data/lib/puppet/test/test_helper.rb

@@ -113,8 +113,8 @@ module Puppet::Test
       indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
       indirections.each do |indirector|
         $saved_indirection_state[indirector.name] = {
-            :@terminus_class => indirector.instance_variable_get(:@terminus_class),
-            :@cache_class    => indirector.instance_variable_get(:@cache_class)
+            :@terminus_class => indirector.instance_variable_get(:@terminus_class).value,
+            :@cache_class    => indirector.instance_variable_get(:@cache_class).value
         }
       end
 
@@ -172,7 +172,7 @@ module Puppet::Test
       indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
       indirections.each do |indirector|
         $saved_indirection_state.fetch(indirector.name, {}).each do |variable, value|
-          indirector.instance_variable_set(variable, value)
+          indirector.instance_variable_get(variable).value = value
         end
       end
       $saved_indirection_state = nil

data/lib/puppet/type/exec.rb

@@ -12,15 +12,27 @@ module Puppet
       * The command itself is already idempotent. (For example, `apt-get update`.)
       * The exec has an `onlyif`, `unless`, or `creates` attribute, which prevents
         Puppet from running the command unless some condition is met.
-      * The exec has `refreshonly => true`, which only allows Puppet to run the
-        command when some other resource is changed. (See the notes on refreshing
-        below.)
+      * The exec has `refreshonly => true`, which allows Puppet to run the
+        command only when some other resource is changed. (See the notes on refreshing
+        below.) 
+        
+      The state managed by an `exec` resource represents whether the specified command
+      _needs to be_ executed during the catalog run. The target state is always that
+      the command does not need to be executed. If the initial state is that the
+      command _does_ need to be executed, then successfully executing the command
+      transitions it to the target state.
+      
+      The `unless`, `onlyif`, and `creates` properties check the initial state of the
+      resource. If one or more of these properties is specified, the exec might not
+      need to run. If the exec does not need to run, then the system is already in
+      the target state. In such cases, the exec is considered successful without 
+      actually executing its command.
 
       A caution: There's a widespread tendency to use collections of execs to
       manage resources that aren't covered by an existing resource type. This
       works fine for simple tasks, but once your exec pile gets complex enough
       that you really have to think to understand what's happening, you should
-      consider developing a custom resource type instead, as it will be much
+      consider developing a custom resource type instead, as it is much
       more predictable and maintainable.
 
       **Duplication:** Even though `command` is the namevar, Puppet allows
@@ -31,30 +43,29 @@ module Puppet
       is non-standard, and can be affected by the `refresh` and
       `refreshonly` attributes:
 
-      * If `refreshonly` is set to true, the exec will _only_ run when it receives an
+      * If `refreshonly` is set to true, the exec runs _only_ when it receives an
         event. This is the most reliable way to use refresh with execs.
-      * If the exec already would have run and receives an event, it will run its
-        command **up to two times.** (If an `onlyif`, `unless`, or `creates` condition
-        is no longer met after the first run, the second run will not occur.)
-      * If the exec already would have run, has a `refresh` command, and receives an
-        event, it will run its normal command, then run its `refresh` command
-        (as long as any `onlyif`, `unless`, or `creates` conditions are still met
-        after the normal command finishes).
-      * If the exec would **not** have run (due to an `onlyif`, `unless`, or `creates`
-        attribute) and receives an event, it still will not run.
+      * If the exec has already run and then receives an event, it runs its
+        command **up to two times.** If an `onlyif`, `unless`, or `creates` condition
+        is no longer met after the first run, the second run does not occur.
+      * If the exec has already run, has a `refresh` command, and receives an
+        event, it runs its normal command. Then, if any `onlyif`, `unless`, or `creates`
+        conditions are still met, the exec runs its `refresh` command.
+      * If the exec has an `onlyif`, `unless`, or `creates` attribute that prevents it
+        from running, and it then receives an event, it still will not run.
       * If the exec has `noop => true`, would otherwise have run, and receives
-        an event from a non-noop resource, it will run once (or run its `refresh`
-        command instead, if it has one).
+        an event from a non-noop resource, it runs once. However, if it has a `refresh`
+        command, it runs that instead of its normal command.
 
       In short: If there's a possibility of your exec receiving refresh events,
-      it becomes doubly important to make sure the run conditions are restricted.
+      it is extremely important to make sure the run conditions are restricted.
 
       **Autorequires:** If Puppet is managing an exec's cwd or the executable
       file used in an exec's command, the exec resource autorequires those
       files. If Puppet is managing the user that an exec should run as, the
-      exec resource will autorequire that user."
+      exec resource autorequires that user."
 
-    # Create a new check mechanism.  It's basically just a parameter that
+    # Create a new check mechanism.  It's basically a parameter that
     # provides one extra 'check' method.
     def self.newcheck(name, options = {}, &block)
       @checks ||= {}

data/lib/puppet/type/service.rb

@@ -35,7 +35,7 @@ module Puppet
     feature :refreshable, "The provider can restart the service.",
       :methods => [:restart]
 
-    feature :enableable, "The provider can enable and disable the service",
+    feature :enableable, "The provider can enable and disable the service.",
       :methods => [:disable, :enable, :enabled?]
 
     feature :controllable, "The provider uses a control variable."
@@ -49,9 +49,9 @@ module Puppet
 
     newproperty(:enable, :required_features => :enableable) do
       desc "Whether a service should be enabled to start at boot.
-        This property behaves quite differently depending on the platform;
+        This property behaves differently depending on the platform;
         wherever possible, it relies on local tools to enable or disable
-        a given service."
+        a given service. Default values depend on the platform."
 
       newvalue(:true, :event => :service_enabled) do
         provider.enable
@@ -95,7 +95,7 @@ module Puppet
 
     # Handle whether the service should actually be running right now.
     newproperty(:ensure) do
-      desc "Whether a service should be running."
+      desc "Whether a service should be running. Default values depend on the platform."
 
       newvalue(:stopped, :event => :service_stopped) do
         provider.stop

data/lib/puppet/util/http_proxy.rb

@@ -198,7 +198,7 @@ module Puppet::Util::HttpProxy
         headers.merge!({"Accept-Encoding" => Puppet::Network::HTTP::Compression::ACCEPT_ENCODING})
       end
 
-      response = proxy.send(:head, current_uri.path, headers)
+      response = proxy.send(:head, current_uri, headers)
       Puppet.debug("HTTP HEAD request to #{current_uri} returned #{response.code} #{response.message}")
 
       if [301, 302, 307].include?(response.code.to_i)
@@ -209,9 +209,9 @@ module Puppet::Util::HttpProxy
 
       if method != :head
         if block_given?
-          response = proxy.send("request_#{method}".to_sym, current_uri.path, headers, &block)
+          response = proxy.send("request_#{method}".to_sym, current_uri, headers, &block)
         else
-          response = proxy.send(method, current_uri.path, headers)
+          response = proxy.send(method, current_uri, headers)
         end
 
         Puppet.debug("HTTP #{method.to_s.upcase} request to #{current_uri} returned #{response.code} #{response.message}")

data/lib/puppet/util/platform.rb

@@ -41,7 +41,7 @@ module Puppet
                            begin
                              require 'openssl'
                              false
-                           rescue LoadError
+                           rescue LoadError, NameError
                              true
                            end
                          else

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '6.9.0'
+  PUPPETVERSION = '6.10.0'
 
   ##
   # version is a public API method intended to always provide a fast and