puppet 7.6.1-universal-darwin → 7.10.0-universal-darwin

data/lib/puppet/ssl/certificate.rb

@@ -1,4 +1,4 @@
-require 'puppet/ssl/base'
+require_relative '../../puppet/ssl/base'
 
 # Manage certificates themselves.  This class has no
 # 'generate' method because the CA is responsible

data/lib/puppet/ssl/certificate_request.rb

@@ -1,5 +1,5 @@
-require 'puppet/ssl/base'
-require 'puppet/ssl/certificate_signer'
+require_relative '../../puppet/ssl/base'
+require_relative '../../puppet/ssl/certificate_signer'
 
 # This class creates and manages X509 certificate signing requests.
 #

data/lib/puppet/ssl/certificate_request_attributes.rb

@@ -1,5 +1,5 @@
-require 'puppet/ssl'
-require 'puppet/util/yaml'
+require_relative '../../puppet/ssl'
+require_relative '../../puppet/util/yaml'
 
 # This class transforms simple key/value pairs into the equivalent ASN1
 # structures. Values may be strings or arrays of strings.

data/lib/puppet/ssl/oids.rb

@@ -1,4 +1,4 @@
-require 'puppet/ssl'
+require_relative '../../puppet/ssl'
 
 # This module defines OIDs for use within Puppet.
 #

data/lib/puppet/ssl/openssl_loader.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/platform'
+require_relative '../../puppet/util/platform'
 
 # This file should be required instead of writing `require 'openssl'`
 # or any library that loads openssl like `net/https`. This allows the

data/lib/puppet/ssl/ssl_context.rb

@@ -1,4 +1,4 @@
-require 'puppet/ssl'
+require_relative '../../puppet/ssl'
 
 module Puppet::SSL
   SSLContext = Struct.new(

data/lib/puppet/ssl/ssl_provider.rb

@@ -1,4 +1,4 @@
-require 'puppet/ssl'
+require_relative '../../puppet/ssl'
 
 # SSL Provider creates `SSLContext` objects that can be used to create
 # secure connections.

data/lib/puppet/ssl/state_machine.rb

@@ -1,5 +1,5 @@
-require 'puppet/ssl'
-require 'puppet/util/pidlock'
+require_relative '../../puppet/ssl'
+require_relative '../../puppet/util/pidlock'
 
 # This class implements a state machine for bootstrapping a host's CA and CRL
 # bundles, private key and signed client certificate. Each state has a frozen

data/lib/puppet/ssl/verifier.rb

@@ -1,4 +1,4 @@
-require 'puppet/ssl'
+require_relative '../../puppet/ssl'
 
 # Verify an SSL connection.
 #
@@ -117,6 +117,10 @@ class Puppet::SSL::Verifier
         return false
       end
 
+    when OpenSSL::X509::V_ERR_HOSTNAME_MISMATCH # new in ruby-openssl 2.2.0/ruby 3.0
+      @last_error = Puppet::SSL::CertMismatchError.new(peer_cert, @hostname)
+      return false
+
     when OpenSSL::X509::V_ERR_CRL_NOT_YET_VALID
       crl = store_context.current_crl
       if crl && crl.last_update && crl.last_update < Time.now + FIVE_MINUTES_AS_SECONDS

data/lib/puppet/syntax_checkers/base64.rb

@@ -1,6 +1,6 @@
 # A syntax checker for Base64.
 # @api public
-require 'puppet/syntax_checkers'
+require_relative '../../puppet/syntax_checkers'
 require 'base64'
 class Puppet::SyntaxCheckers::Base64 < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 

data/lib/puppet/syntax_checkers/epp.rb

@@ -1,6 +1,6 @@
 # A syntax checker for JSON.
 # @api public
-require 'puppet/syntax_checkers'
+require_relative '../../puppet/syntax_checkers'
 class Puppet::SyntaxCheckers::EPP < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 
   # Checks the text for Puppet Language EPP syntax issues and reports them to the given acceptor.

data/lib/puppet/syntax_checkers/json.rb

@@ -1,6 +1,6 @@
 # A syntax checker for JSON.
 # @api public
-require 'puppet/syntax_checkers'
+require_relative '../../puppet/syntax_checkers'
 class Puppet::SyntaxCheckers::Json < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 
   # Checks the text for JSON syntax issues and reports them to the given acceptor.

data/lib/puppet/syntax_checkers/pp.rb

@@ -1,6 +1,6 @@
 # A syntax checker for JSON.
 # @api public
-require 'puppet/syntax_checkers'
+require_relative '../../puppet/syntax_checkers'
 class Puppet::SyntaxCheckers::PP < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 
   # Checks the text for Puppet Language syntax issues and reports them to the given acceptor.

data/lib/puppet/transaction.rb

@@ -1,7 +1,7 @@
-require 'puppet'
-require 'puppet/util/tagging'
-require 'puppet/util/skip_tags'
-require 'puppet/application'
+require_relative '../puppet'
+require_relative '../puppet/util/tagging'
+require_relative '../puppet/util/skip_tags'
+require_relative '../puppet/application'
 require 'digest/sha1'
 require 'set'
 
@@ -10,12 +10,12 @@ require 'set'
 #
 # @api private
 class Puppet::Transaction
-  require 'puppet/transaction/additional_resource_generator'
-  require 'puppet/transaction/event'
-  require 'puppet/transaction/event_manager'
-  require 'puppet/transaction/resource_harness'
-  require 'puppet/resource/status'
-  require 'puppet/transaction/persistence'
+  require_relative 'transaction/additional_resource_generator'
+  require_relative 'transaction/event'
+  require_relative 'transaction/event_manager'
+  require_relative 'transaction/resource_harness'
+  require_relative '../puppet/resource/status'
+  require_relative 'transaction/persistence'
 
   attr_accessor :catalog, :ignoreschedules, :for_network_device
 
@@ -466,4 +466,4 @@ class Puppet::Transaction
 
 end
 
-require 'puppet/transaction/report'
+require_relative 'transaction/report'

data/lib/puppet/transaction/additional_resource_generator.rb

@@ -137,7 +137,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
       else
         @catalog.add_resource_after(parent_resource, res)
       end
-      @catalog.add_edge(@catalog.container_of(parent_resource), res)
+      @catalog.add_edge(@catalog.container_of(parent_resource), res) if @catalog.container_of(parent_resource)
       if @relationship_graph && priority
         # If we have a relationship_graph we should add the resource
         # to it (this is an eval_generate). If we don't, then the

data/lib/puppet/transaction/event.rb

@@ -1,7 +1,7 @@
-require 'puppet/transaction'
-require 'puppet/util/tagging'
-require 'puppet/util/logging'
-require 'puppet/network/format_support'
+require_relative '../../puppet/transaction'
+require_relative '../../puppet/util/tagging'
+require_relative '../../puppet/util/logging'
+require_relative '../../puppet/network/format_support'
 
 # A simple struct for storing what happens on the system.
 class Puppet::Transaction::Event

data/lib/puppet/transaction/event_manager.rb

@@ -1,4 +1,4 @@
-require 'puppet/transaction'
+require_relative '../../puppet/transaction'
 
 # This class stores, routes, and responds to events generated while evaluating
 # a transaction.

data/lib/puppet/transaction/persistence.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'puppet/util/yaml'
+require_relative '../../puppet/util/yaml'
 
 # A persistence store implementation for storing information between
 # transaction runs for the purposes of information inference (such
@@ -87,7 +87,17 @@ class Puppet::Transaction::Persistence
 
   # Save data from internal class to persistence store on disk.
   def save
-    Puppet::Util::Yaml.dump(@new_data, Puppet[:transactionstorefile])
+    converted_data = Puppet::Pops::Serialization::ToDataConverter.convert(
+      @new_data, {
+        symbol_as_string: false,
+        local_reference: false,
+        type_by_reference: true,
+        force_symbol: true,
+        silence_warnings: true,
+        message_prefix: to_s
+      }
+    )
+    Puppet::Util::Yaml.dump(converted_data, Puppet[:transactionstorefile])
   end
 
   # Use the catalog and run_mode to determine if persistence should be enabled or not

data/lib/puppet/transaction/report.rb

@@ -1,5 +1,5 @@
-require 'puppet'
-require 'puppet/indirector'
+require_relative '../../puppet'
+require_relative '../../puppet/indirector'
 
 # This class is used to report what happens on a client.
 # There are two types of data in a report; _Logs_ and _Metrics_.
@@ -75,6 +75,10 @@ class Puppet::Transaction::Report
   # @return [String] the environment name
   attr_accessor :environment
 
+  # The name of the environment the agent initially started in
+  # @return [String] the environment name
+  attr_accessor :initial_environment
+
   # Whether there are changes that we decided not to apply because of noop
   # @return [Boolean]
   #
@@ -375,7 +379,17 @@ class Puppet::Transaction::Report
   # @api public
   #
   def raw_summary
-    report = { "version" => { "config" => configuration_version, "puppet" => Puppet.version  } }
+    report = {
+      "version" => {
+        "config" => configuration_version,
+        "puppet" => Puppet.version
+      },
+      "application" => {
+        "run_mode" => Puppet.run_mode.name.to_s,
+        "initial_environment" => initial_environment,
+        "converged_environment" => environment
+      }
+    }
 
     @metrics.each do |name, metric|
       key = metric.name.to_s

data/lib/puppet/transaction/resource_harness.rb

@@ -1,4 +1,4 @@
-require 'puppet/resource/status'
+require_relative '../../puppet/resource/status'
 
 class Puppet::Transaction::ResourceHarness
   NO_ACTION = Object.new

data/lib/puppet/type.rb

@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
-require 'puppet'
-require 'puppet/util/log'
-require 'puppet/util/metric'
-require 'puppet/property'
-require 'puppet/parameter'
-require 'puppet/util'
-require 'puppet/util/autoload'
-require 'puppet/metatype/manager'
-require 'puppet/util/errors'
-require 'puppet/util/logging'
-require 'puppet/util/tagging'
-require 'puppet/concurrent/lock'
+require_relative '../puppet'
+require_relative '../puppet/util/log'
+require_relative '../puppet/util/metric'
+require_relative '../puppet/property'
+require_relative '../puppet/parameter'
+require_relative '../puppet/util'
+require_relative '../puppet/util/autoload'
+require_relative '../puppet/metatype/manager'
+require_relative '../puppet/util/errors'
+require_relative '../puppet/util/logging'
+require_relative '../puppet/util/tagging'
+require_relative '../puppet/concurrent/lock'
 
 # see the bottom of the file for the rest of the inclusions
 
@@ -1272,7 +1272,7 @@ class Type
       like it does when running normally. However, if a resource attribute is not in
       the desired state (as declared in the catalog), Puppet will take no
       action, and will instead report the changes it _would_ have made. These
-      simulated changes will appear in the report sent to the puppet master, or
+      simulated changes will appear in the report sent to the primary Puppet server, or
       be shown on the console if running puppet agent or puppet apply in the
       foreground. The simulated changes will not send refresh events to any
       subscribing or notified resources, although Puppet will log that a refresh
@@ -1699,8 +1699,8 @@ class Type
 
   ###############################
   # All of the provider plumbing for the resource types.
-  require 'puppet/provider'
-  require 'puppet/util/provider_features'
+  require_relative '../puppet/provider'
+  require_relative '../puppet/util/provider_features'
 
   # Add the feature handling module.
   extend Puppet::Util::ProviderFeatures

data/lib/puppet/type/component.rb

@@ -1,7 +1,7 @@
 
-require 'puppet'
-require 'puppet/type'
-require 'puppet/transaction'
+require_relative '../../puppet'
+require_relative '../../puppet/type'
+require_relative '../../puppet/transaction'
 
 Puppet::Type.newtype(:component) do
   include Enumerable

data/lib/puppet/type/exec.rb

@@ -11,7 +11,10 @@ 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.
+        Puppet from running the command unless some condition is met. The
+        `onlyif` and `unless` commands of an `exec` are used in the process of
+        determining whether the `exec` is already in sync, therefore they must be run
+        during a noop Puppet run.
       * 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.) 
@@ -201,7 +204,9 @@ module 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
+        unless command.is_a?(String) || command.is_a?(Array)
+          raise ArgumentError, _("Command must be a String or Array<String>, got value of class %{klass}") % { klass: command.class }
+        end
       end
     end
 
@@ -454,10 +459,17 @@ module Puppet
         `user`, `cwd`, and `group` as the main command. If the `path` isn't set, you
         must fully qualify the command's name.
 
+        Since this command is used in the process of determining whether the
+        `exec` is already in sync, it must be run during a noop Puppet run.
+
         This parameter can also take an array of commands. For example:
 
             unless => ['test -f /tmp/file1', 'test -f /tmp/file2'],
 
+        or an array of arrays. For example:
+
+            unless => [['test', '-f', '/tmp/file1'], 'test -f /tmp/file2']
+
         This `exec` would only run if every command in the array has a
         non-zero exit code.
       EOT
@@ -510,10 +522,17 @@ module Puppet
         `user`, `cwd`, and `group` as the main command. If the `path` isn't set, you
         must fully qualify the command's name.
 
+        Since this command is used in the process of determining whether the
+        `exec` is already in sync, it must be run during a noop Puppet run.
+
         This parameter can also take an array of commands. For example:
 
             onlyif => ['test -f /tmp/file1', 'test -f /tmp/file2'],
 
+        or an array of arrays. For example:
+
+            onlyif => [['test', '-f', '/tmp/file1'], 'test -f /tmp/file2']
+
         This `exec` would only run if every command in the array has an
         exit code of 0 (success).
       EOT
@@ -562,12 +581,14 @@ module Puppet
       reqs << self[:cwd] if self[:cwd]
 
       file_regex = Puppet::Util::Platform.windows? ? %r{^([a-zA-Z]:[\\/]\S+)} : %r{^(/\S+)}
+      cmd = self[:command]
+      cmd = cmd[0] if cmd.is_a? Array
 
-      self[:command].scan(file_regex) { |str|
+      cmd.scan(file_regex) { |str|
         reqs << str
       }
 
-      self[:command].scan(/^"([^"]+)"/) { |str|
+      cmd.scan(/^"([^"]+)"/) { |str|
         reqs << str
       }
 
@@ -583,6 +604,7 @@ module Puppet
           # fully qualified.  It might not be a bad idea to add
           # unqualified files, but, well, that's a bit more annoying
           # to do.
+          line = line[0] if line.is_a? Array
           reqs += line.scan(file_regex)
         end
       }

data/lib/puppet/type/file.rb

@@ -6,11 +6,11 @@ require 'uri'
 require 'fileutils'
 require 'enumerator'
 require 'pathname'
-require 'puppet/parameter/boolean'
-require 'puppet/util/diff'
-require 'puppet/util/checksums'
-require 'puppet/util/backups'
-require 'puppet/util/symbolic_file_mode'
+require_relative '../../puppet/parameter/boolean'
+require_relative '../../puppet/util/diff'
+require_relative '../../puppet/util/checksums'
+require_relative '../../puppet/util/backups'
+require_relative '../../puppet/util/symbolic_file_mode'
 
 Puppet::Type.newtype(:file) do
   include Puppet::Util::Checksums
@@ -91,23 +91,23 @@ Puppet::Type.newtype(:file) do
 
       Backing up to a local filebucket isn't particularly useful. If you want
       to make organized use of backups, you will generally want to use the
-      puppet master server's filebucket service. This requires declaring a
+      primary Puppet server's filebucket service. This requires declaring a
       filebucket resource and a resource default for the `backup` attribute
       in site.pp:
 
           # /etc/puppetlabs/puppet/manifests/site.pp
           filebucket { 'main':
             path   => false,                # This is required for remote filebuckets.
-            server => 'puppet.example.com', # Optional; defaults to the configured puppet master.
+            server => 'puppet.example.com', # Optional; defaults to the configured primary Puppet server.
           }
 
           File { backup => main, }
 
-      If you are using multiple puppet master servers, you will want to
+      If you are using multiple primary servers, you will want to
       centralize the contents of the filebucket. Either configure your load
-      balancer to direct all filebucket traffic to a single master, or use
+      balancer to direct all filebucket traffic to a single primary server, or use
       something like an out-of-band rsync task to synchronize the content on all
-      masters.
+      primary servers.
 
       > **Note**: Enabling and using the backup option, and by extension the 
         filebucket resource, requires appropriate planning and management to ensure 
@@ -218,6 +218,23 @@ Puppet::Type.newtype(:file) do
     end
   end
 
+  newparam(:max_files) do
+    desc "In case the resource is a directory and the recursion is enabled, puppet will
+      generate a new resource for each file file found, possible leading to
+      an excessive number of resources generated without any control.
+
+      Setting `max_files` will check the number of file resources that
+      will eventually be created and will raise a resource argument error if the
+      limit will be exceeded.
+
+      Use value `0` to log a warning instead of raising an error.
+
+      Use value `-1` to disable errors and warnings due to max files."
+
+    defaultto 0
+    newvalues(/^[0-9]+$/, /^-1$/)
+  end
+
   newparam(:replace, :boolean => true, :parent => Puppet::Parameter::Boolean) do
     desc "Whether to replace a file or symlink that already exists on the local system but
       whose content doesn't match what the `source` or `content` attribute
@@ -342,7 +359,7 @@ Puppet::Type.newtype(:file) do
       This command must have a fully qualified path, and should contain a
       percent (`%`) token where it would expect an input file. It must exit `0`
       if the syntax is correct, and non-zero otherwise. The command will be
-      run on the target system while applying the catalog, not on the puppet master.
+      run on the target system while applying the catalog, not on the primary Puppet server.
 
       Example:
 
@@ -574,7 +591,7 @@ Puppet::Type.newtype(:file) do
     options = @original_parameters.merge(:path => full_path).reject { |param, value| value.nil? }
 
     # These should never be passed to our children.
-    [:parent, :ensure, :recurse, :recurselimit, :target, :alias, :source].each do |param|
+    [:parent, :ensure, :recurse, :recurselimit, :max_files, :target, :alias, :source].each do |param|
       options.delete(param) if options.include?(param)
     end
 
@@ -751,6 +768,7 @@ Puppet::Type.newtype(:file) do
       :links => self[:links],
       :recurse => (self[:recurse] == :remote ? true : self[:recurse]),
       :recurselimit => self[:recurselimit],
+      :max_files => self[:max_files],
       :source_permissions => self[:source_permissions],
       :ignore => self[:ignore],
       :checksum_type => (self[:source] || self[:content]) ? self[:checksum] : :none,
@@ -1100,16 +1118,16 @@ end
 # We put all of the properties in separate files, because there are so many
 # of them.  The order these are loaded is important, because it determines
 # the order they are in the property lit.
-require 'puppet/type/file/checksum'
-require 'puppet/type/file/content'     # can create the file
-require 'puppet/type/file/source'      # can create the file
-require 'puppet/type/file/checksum_value' # can create the file, in place of content
-require 'puppet/type/file/target'      # creates a different type of file
-require 'puppet/type/file/ensure'      # can create the file
-require 'puppet/type/file/owner'
-require 'puppet/type/file/group'
-require 'puppet/type/file/mode'
-require 'puppet/type/file/type'
-require 'puppet/type/file/selcontext'  # SELinux file context
-require 'puppet/type/file/ctime'
-require 'puppet/type/file/mtime'
+require_relative 'file/checksum'
+require_relative 'file/content'     # can create the file
+require_relative 'file/source'      # can create the file
+require_relative 'file/checksum_value' # can create the file, in place of content
+require_relative 'file/target'      # creates a different type of file
+require_relative 'file/ensure'      # can create the file
+require_relative 'file/owner'
+require_relative 'file/group'
+require_relative 'file/mode'
+require_relative 'file/type'
+require_relative 'file/selcontext'  # SELinux file context
+require_relative 'file/ctime'
+require_relative 'file/mtime'