puppet 7.5.0-x86-mingw32 → 7.9.0-x86-mingw32

data/lib/puppet/application/script.rb

@@ -1,7 +1,7 @@
-require 'puppet/application'
-require 'puppet/configurer'
-require 'puppet/util/profiler/aggregate'
-require 'puppet/parser/script_compiler'
+require_relative '../../puppet/application'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/util/profiler/aggregate'
+require_relative '../../puppet/parser/script_compiler'
 
 class Puppet::Application::Script < Puppet::Application
 
@@ -71,7 +71,8 @@ configuration options can also be generated by running puppet with
   Where to send log messages. Choose between 'syslog' (the POSIX syslog
   service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
   file. Defaults to 'console'.
-  Multiple destinations can be set using a comma separated list (eg: `/path/file1,console,/path/file2`)"
+  Multiple destinations can be set using a comma separated list
+  (eg: `/path/file1,console,/path/file2`)"
 
   A path ending with '.json' will receive structured output in JSON format. The
   log file will not have an ending ']' automatically written to it due to the

data/lib/puppet/application/ssl.rb

@@ -1,5 +1,5 @@
-require 'puppet/application'
-require 'puppet/ssl/oids'
+require_relative '../../puppet/application'
+require_relative '../../puppet/ssl/oids'
 
 class Puppet::Application::Ssl < Puppet::Application
 
@@ -117,6 +117,7 @@ HELP
     end
 
     Puppet::SSL::Oids.register_puppet_oids
+    Puppet::SSL::Oids.load_custom_oid_file(Puppet[:trusted_oid_mapping_file])
 
     certname = Puppet[:certname]
     action = command_line.args.first

data/lib/puppet/application_support.rb

@@ -1,9 +1,9 @@
 require 'yaml'
 
-require 'puppet'
-require 'puppet/node/environment'
-require 'puppet/file_system'
-require 'puppet/indirector'
+require_relative '../puppet'
+require_relative '../puppet/node/environment'
+require_relative '../puppet/file_system'
+require_relative '../puppet/indirector'
 
 module Puppet
   module ApplicationSupport

data/lib/puppet/compilable_resource_type.rb

@@ -1,4 +1,4 @@
-require 'puppet'
+require_relative '../puppet'
 # The CompilableResourceType module should be either included in a class or used as a class extension
 # to mark that the instance used as the 'resource type' of a resource instance
 # is an object that is compatible with Puppet::Type's API wrt. compiling.

data/lib/puppet/concurrent/lock.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/synchronized'
+require_relative '../../puppet/concurrent/synchronized'
 
 module Puppet
 module Concurrent

data/lib/puppet/configurer.rb

@@ -1,13 +1,13 @@
 # The client for interacting with the puppetmaster config server.
 require 'timeout'
-require 'puppet/util'
+require_relative '../puppet/util'
 require 'securerandom'
 #require 'puppet/parser/script_compiler'
-require 'puppet/pops/evaluator/deferred_resolver'
+require_relative '../puppet/pops/evaluator/deferred_resolver'
 
 class Puppet::Configurer
-  require 'puppet/configurer/fact_handler'
-  require 'puppet/configurer/plugin_handler'
+  require_relative 'configurer/fact_handler'
+  require_relative 'configurer/plugin_handler'
 
   include Puppet::Configurer::FactHandler
 

data/lib/puppet/configurer/downloader.rb

@@ -1,5 +1,5 @@
-require 'puppet/configurer'
-require 'puppet/resource/catalog'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/resource/catalog'
 
 class Puppet::Configurer::Downloader
   attr_reader :name, :path, :source, :ignore
@@ -73,7 +73,8 @@ class Puppet::Configurer::Downloader
       :purge => true,
       :force => true,
       :backup => false,
-      :noop => false
+      :noop => false,
+      :max_files => -1
     }
     if !Puppet::Util::Platform.windows?
       defargs[:owner] = Process.uid

data/lib/puppet/configurer/fact_handler.rb

@@ -1,7 +1,7 @@
-require 'puppet/indirector/facts/facter'
+require_relative '../../puppet/indirector/facts/facter'
 
-require 'puppet/configurer'
-require 'puppet/configurer/downloader'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/configurer/downloader'
 
 # Break out the code related to facts.  This module is
 # just included into the agent, but having it here makes it

data/lib/puppet/configurer/plugin_handler.rb

@@ -1,7 +1,7 @@
 # Break out the code related to plugins.  This module is
 # just included into the agent, but having it here makes it
 # easier to test.
-require 'puppet/configurer'
+require_relative '../../puppet/configurer'
 
 class Puppet::Configurer::PluginHandler
   SUPPORTED_LOCALES_MOUNT_AGENT_VERSION = Gem::Version.new("5.3.4")

data/lib/puppet/confine.rb

@@ -1,6 +1,6 @@
 # The class that handles testing whether our providers
 # actually work or not.
-require 'puppet/util'
+require_relative '../puppet/util'
 
 class Puppet::Confine
   include Puppet::Util

data/lib/puppet/confine/boolean.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine'
+require_relative '../../puppet/confine'
 
 # Common module for the Boolean confines. It currently
 # contains just enough code to implement PUP-9336.

data/lib/puppet/confine/exists.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine'
+require_relative '../../puppet/confine'
 
 class Puppet::Confine::Exists < Puppet::Confine
   def self.summarize(confines)

data/lib/puppet/confine/false.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine/boolean'
+require_relative '../../puppet/confine/boolean'
 
 class Puppet::Confine::False < Puppet::Confine
   include Puppet::Confine::Boolean

data/lib/puppet/confine/feature.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine'
+require_relative '../../puppet/confine'
 
 class Puppet::Confine::Feature < Puppet::Confine
   def self.summarize(confines)

data/lib/puppet/confine/true.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine/boolean'
+require_relative '../../puppet/confine/boolean'
 
 class Puppet::Confine::True < Puppet::Confine
   include Puppet::Confine::Boolean

data/lib/puppet/confine/variable.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine'
+require_relative '../../puppet/confine'
 
 # Require a specific value for a variable, either a Puppet setting
 # or a Facter value.  This class is a bit weird because the name

data/lib/puppet/confine_collection.rb

@@ -1,6 +1,6 @@
 # Manage a collection of confines, returning a boolean or
 # helpful information.
-require 'puppet/confine'
+require_relative '../puppet/confine'
 
 class Puppet::ConfineCollection
   def confine(hash)

data/lib/puppet/confiner.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine_collection'
+require_relative '../puppet/confine_collection'
 
 # The Confiner module contains methods for managing a Provider's confinement (suitability under given
 # conditions). The intent is to include this module in an object where confinement management is wanted.

data/lib/puppet/context.rb

@@ -1,4 +1,4 @@
-require 'puppet/thread_local'
+require_relative '../puppet/thread_local'
 
 # Puppet::Context is a system for tracking services and contextual information
 # that puppet needs to be able to run. Values are "bound" in a context when it is created
@@ -11,7 +11,7 @@ require 'puppet/thread_local'
 #
 # @api private
 class Puppet::Context
-  require 'puppet/context/trusted_information'
+  require_relative 'context/trusted_information'
 
   class UndefinedBindingError < Puppet::Error; end
   class StackUnderflow < Puppet::Error; end

data/lib/puppet/context/trusted_information.rb

@@ -1,4 +1,4 @@
-require 'puppet/trusted_external'
+require_relative '../../puppet/trusted_external'
 
 # @api private
 class Puppet::Context::TrustedInformation

data/lib/puppet/daemon.rb

@@ -1,5 +1,5 @@
-require 'puppet/application'
-require 'puppet/scheduler'
+require_relative '../puppet/application'
+require_relative '../puppet/scheduler'
 
 # Run periodic actions in a daemonized process.
 #

data/lib/puppet/data_binding.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector'
+require_relative '../puppet/indirector'
 
 # A class for managing data lookups
 class Puppet::DataBinding

data/lib/puppet/datatypes/error.rb

@@ -15,7 +15,7 @@ Puppet::DataTypes.create_type('Error') do
     }
     PUPPET
 
-  require 'puppet/datatypes/impl/error'
+  require_relative '../../puppet/datatypes/impl/error'
 
   implementation_class Puppet::DataTypes::Error
 end

data/lib/puppet/defaults.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/platform'
+require_relative '../puppet/util/platform'
 
 module Puppet
 
@@ -219,7 +219,7 @@ module Puppet
         as well as any translations in the report and CLI.",
       :hook    => proc do |value|
         if value
-          require 'puppet/gettext/stubs'
+          require_relative '../puppet/gettext/stubs'
           Puppet::GettextConfig.disable_gettext
         end
       end
@@ -478,6 +478,7 @@ module Puppet
     },
     :maximum_uid => {
         :default  => 4294967290,
+        :type     => :integer,
         :desc     => "The maximum allowed UID.  Some platforms use negative UIDs
           but then ship with tools that do not know how to handle signed ints,
           so the UIDs show up as huge numbers that can then not be fed back into
@@ -615,6 +616,7 @@ module Puppet
     },
     :http_proxy_port => {
       :default    => 3128,
+      :type       => :port,
       :desc       => "The HTTP proxy port to use for outgoing connections",
     },
     :http_proxy_user => {
@@ -837,8 +839,8 @@ names.
 **Note:** The list of alternate names is locked in when the server's
 certificate is signed. If you need to change the list later, you can't just
 change this setting; you also need to regenerate the certificate. For more
-information on that process, see the [cert regen docs]
-(https://puppet.com/docs/puppet/latest/ssl_regenerate_certificates.html).
+information on that process, see the 
+[cert regen docs](https://puppet.com/docs/puppet/latest/ssl_regenerate_certificates.html).
 
 To see all the alternate names your servers are using, log into your CA server
 and run `puppetserver ca list --all`, then check the output for `(alt names: ...)`.
@@ -1197,6 +1199,7 @@ EOT
     },
     :keylength => {
       :default    => 4096,
+      :type       => :integer,
       :desc       => "The bit length of keys.",
     },
     :cert_inventory => {
@@ -1426,7 +1429,9 @@ EOT
         See the report reference for information on the built-in report
         handlers; custom report handlers can also be loaded from modules.
         (Report handlers are loaded from the lib directory, at
-        `puppet/reports/NAME.rb`.)",
+        `puppet/reports/NAME.rb`.)
+
+        To turn off reports entirely, set this to `none`",
     },
     :reportdir => {
       :default => "$vardir/reports",
@@ -1672,7 +1677,7 @@ EOT
     },
     :agent_disabled_lockfile => {
         :default    => "$statedir/agent_disabled.lock",
-        :type       => :file,
+        :type       => :string,
         :desc       => "A lock file to indicate that puppet agent runs have been administratively
           disabled.  File contains a JSON object with state information.",
     },
@@ -2021,6 +2026,7 @@ EOT
     },
     :ldapport => {
       :default  => 389,
+      :type     => :port,
       :desc     => "The LDAP port.",
     },
 
@@ -2082,8 +2088,8 @@ EOT
       # Call our hook with the default value, so we always get the libdir set.
       :call_hook => :on_initialize_and_write,
       :hook => proc do |value|
-        require 'puppet/node'
-        require 'puppet/node/facts'
+        require_relative '../puppet/node'
+        require_relative '../puppet/node/facts'
         if value
           Puppet::Resource::Catalog.indirection.set_global_setting(:cache_class, :store_configs)
           settings.override_default(:catalog_cache_terminus, :store_configs)
@@ -2104,6 +2110,7 @@ EOT
   settings.define_settings(:parser,
    :max_errors => {
      :default => 10,
+     :type => :integer,
      :desc => <<-'EOT'
        Sets the max number of logged/displayed parser validation errors in case
        multiple errors have been detected. A value of 0 is the same as a value of 1; a
@@ -2112,6 +2119,7 @@ EOT
    },
    :max_warnings => {
      :default => 10,
+     :type => :integer,
      :desc => <<-'EOT'
        Sets the max number of logged/displayed parser validation warnings in
        case multiple warnings have been detected. A value of 0 blocks logging of
@@ -2120,6 +2128,7 @@ EOT
      },
   :max_deprecations => {
     :default => 10,
+    :type => :integer,
     :desc => <<-'EOT'
       Sets the max number of logged/displayed parser validation deprecation
       warnings in case multiple deprecation warnings have been detected. A value of 0
@@ -2157,10 +2166,6 @@ EOT
     :rich_data => {
       :default  => true,
       :type     => :boolean,
-      :hook    => proc do |value|
-        envs = Puppet.lookup(:environments) { nil }
-        envs.clear_all unless envs.nil?
-      end,
       :desc     => <<-'EOT'
         Enables having extended data in the catalog by storing them as a hash with the special key
         `__ptype`. When enabled, resource containing values of the data types `Binary`, `Regexp`,

data/lib/puppet/environments.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/synchronized'
+require_relative '../puppet/concurrent/synchronized'
 
 # @api private
 module Puppet::Environments
@@ -356,6 +356,16 @@ module Puppet::Environments
       # Evict all that have expired, in the same way as `get`
       clear_all_expired
 
+      # Evict all that was removed from diks
+      cached_envs = @cache.keys.map!(&:to_sym)
+      loader_envs = @loader.list.map!(&:name)
+      removed_envs = cached_envs - loader_envs
+
+      removed_envs.each do |env_name|
+        Puppet.debug { "Environment no longer exists '#{env_name}'"}
+        clear(env_name)
+      end
+
       @loader.list.map do |env|
         name = env.name
         old_entry = @cache[name]

data/lib/puppet/etc.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/character_encoding'
+require_relative '../puppet/util/character_encoding'
 # Wrapper around Ruby Etc module allowing us to manage encoding in a single
 # place.
 # This represents a subset of Ruby's Etc module, only the methods required by Puppet.

data/lib/puppet/external/pson/common.rb

@@ -1,4 +1,4 @@
-require 'puppet/external/pson/version'
+require_relative '../../../puppet/external/pson/version'
 
 # PSON is a vendored version of pure_json v1.1.9 plus puppet patches. It
 # is deprecated and should not be used for future work. Use JSON instead.

data/lib/puppet/external/pson/pure.rb

@@ -1,6 +1,6 @@
-require 'puppet/external/pson/common'
-require 'puppet/external/pson/pure/parser'
-require 'puppet/external/pson/pure/generator'
+require_relative '../../../puppet/external/pson/common'
+require_relative 'pure/parser'
+require_relative 'pure/generator'
 
 module PSON
   # This module holds all the modules/classes that implement PSON's

data/lib/puppet/face.rb

@@ -8,5 +8,5 @@
 #
 # It isn't hidden to gratuitously hide things, just to make it easier to
 # separate out the interests people will have.  --daniel 2011-04-07
-require 'puppet/interface'
+require_relative '../puppet/interface'
 Puppet::Face = Puppet::Interface

data/lib/puppet/face/catalog.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector/face'
+require_relative '../../puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:catalog, '0.0.1') do
   copyright "Puppet Inc.", 2011

data/lib/puppet/face/config.rb

@@ -1,5 +1,5 @@
-require 'puppet/face'
-require 'puppet/settings/ini_file'
+require_relative '../../puppet/face'
+require_relative '../../puppet/settings/ini_file'
 
 Puppet::Face.define(:config, '0.0.1') do
   extend Puppet::Util::Colors

data/lib/puppet/face/epp.rb

@@ -1,7 +1,7 @@
-require 'puppet/face'
-require 'puppet/pops'
-require 'puppet/parser/files'
-require 'puppet/file_system'
+require_relative '../../puppet/face'
+require_relative '../../puppet/pops'
+require_relative '../../puppet/parser/files'
+require_relative '../../puppet/file_system'
 
 Puppet::Face.define(:epp, '0.0.1') do
   copyright "Puppet Inc.", 2014
@@ -156,7 +156,7 @@ Puppet::Face.define(:epp, '0.0.1') do
     end
 
     when_invoked do |*args|
-      require 'puppet/pops'
+      require_relative '../../puppet/pops'
       options = args.pop
       # pass a dummy node, as facts are not needed for dump
       options[:node] = Puppet::Node.new("testnode", :facts => Puppet::Node::Facts.new("facts", {}))
@@ -382,7 +382,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       if fmt.nil? || fmt == 'old'
         output << Puppet::Pops::Model::ModelTreeDumper.new.dump(parse_result) << "\n"
       else
-        require 'puppet/pops/pn'
+        require_relative '../../puppet/pops/pn'
         pn = Puppet::Pops::Model::PNTransformer.transform(parse_result)
         case fmt
         when 'json'