puppet 7.27.0-x64-mingw32 → 8.0.1-x64-mingw32

data/lib/puppet/application/facts.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application/indirection_base'
 
 class Puppet::Application::Facts < Puppet::Application::IndirectionBase

data/lib/puppet/application/filebucket.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application'
 
 class Puppet::Application::Filebucket < Puppet::Application

data/lib/puppet/application/generate.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application/face_base'
 
 # The Generate application. 

data/lib/puppet/application/help.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application/face_base'
 
 class Puppet::Application::Help < Puppet::Application::FaceBase

data/lib/puppet/application/indirection_base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application/face_base'
 
 class Puppet::Application::IndirectionBase < Puppet::Application::FaceBase

data/lib/puppet/application/lookup.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application'
 require_relative '../../puppet/pops'
 require_relative '../../puppet/node'
@@ -6,7 +7,7 @@ require_relative '../../puppet/parser/compiler'
 class Puppet::Application::Lookup < Puppet::Application
 
   RUN_HELP = _("Run 'puppet lookup --help' for more details").freeze
-  DEEP_MERGE_OPTIONS = '--knock-out-prefix, --sort-merged-arrays, and --merge-hash-arrays'.freeze
+  DEEP_MERGE_OPTIONS = '--knock-out-prefix, --sort-merged-arrays, and --merge-hash-arrays'
   TRUSTED_INFORMATION_FACTS = ["hostname", "domain", "fqdn", "clientcert"].freeze
 
   run_mode :server

data/lib/puppet/application/module.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application/face_base'
 
 class Puppet::Application::Module < Puppet::Application::FaceBase

data/lib/puppet/application/node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application/indirection_base'
 
 class Puppet::Application::Node < Puppet::Application::IndirectionBase

data/lib/puppet/application/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application/face_base'
 require_relative '../../puppet/face'
 

data/lib/puppet/application/plugin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application/face_base'
 class Puppet::Application::Plugin < Puppet::Application::FaceBase
   environment_mode :not_required

data/lib/puppet/application/report.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application/indirection_base'
 
 class Puppet::Application::Report < Puppet::Application::IndirectionBase

data/lib/puppet/application/resource.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application'
 
 class Puppet::Application::Resource < Puppet::Application

data/lib/puppet/application/script.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application'
 require_relative '../../puppet/configurer'
 require_relative '../../puppet/util/profiler/aggregate'

data/lib/puppet/application/ssl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/application'
 require_relative '../../puppet/ssl/oids'
 
@@ -59,11 +60,6 @@ ACTIONS
   the CSR. Otherwise a new key pair will be generated. If a CSR has already
   been submitted with the given `certname`, then the operation will fail.
 
-* generate_request:
-  Generate a certificate signing request (CSR). If
-  a private and public key pair already exist, they will be used to generate
-  the CSR. Otherwise a new key pair will be generated.
-
 * download_cert:
   Download a certificate for this host. If the current private key matches
   the downloaded certificate, then the certificate will be saved and used
@@ -141,21 +137,9 @@ HELP
       unless cert
         raise Puppet::Error, _("The certificate for '%{name}' has not yet been signed") % { name: certname }
       end
-    when 'generate_request'
-      generate_request(certname)
     when 'verify'
       verify(certname)
     when 'clean'
-      possible_extra_args = command_line.args.drop(1)
-      unless possible_extra_args.empty?
-        raise Puppet::Error, _(<<END) % { args: possible_extra_args.join(' ')}
-Extra arguments detected: %{args}
-Did you mean to run:
-  puppetserver ca clean --certname <name>
-Or:
-  puppet ssl clean --target <name>
-END
-      end
       clean(certname)
     when 'bootstrap'
       if !Puppet::Util::Log.sendlevel?(:info)
@@ -179,7 +163,13 @@ END
   def submit_request(ssl_context)
     key = @cert_provider.load_private_key(Puppet[:certname])
     unless key
-      key = create_key(Puppet[:certname])
+      if Puppet[:key_type] == 'ec'
+        Puppet.info _("Creating a new EC SSL key for %{name} using curve %{curve}") % { name: Puppet[:certname], curve: Puppet[:named_curve] }
+        key = OpenSSL::PKey::EC.generate(Puppet[:named_curve])
+      else
+        Puppet.info _("Creating a new SSL key for %{name}") % { name: Puppet[:certname] }
+        key = OpenSSL::PKey::RSA.new(Puppet[:keylength].to_i)
+      end
       @cert_provider.save_private_key(Puppet[:certname], key)
     end
 
@@ -198,20 +188,6 @@ END
     raise Puppet::Error.new(_("Failed to submit certificate request: %{message}") % { message: e.message }, e)
   end
 
-  def generate_request(certname)
-    key = @cert_provider.load_private_key(certname)
-    unless key
-      key = create_key(certname)
-      @cert_provider.save_private_key(certname, key)
-    end
-
-    csr = @cert_provider.create_request(certname, key)
-    @cert_provider.save_request(certname, csr)
-    Puppet.notice _("Generated certificate request in '%{path}'") % { path: @cert_provider.to_path(Puppet[:requestdir], certname) }
-  rescue => e
-    raise Puppet::Error.new(_("Failed to generate certificate request: %{message}") % { message: e.message }, e)
-  end
-
   def download_cert(ssl_context)
     key = @cert_provider.load_private_key(Puppet[:certname])
 
@@ -310,14 +286,4 @@ END
   def create_route(ssl_context)
     @session.route_to(:ca, ssl_context: ssl_context)
   end
-
-  def create_key(certname)
-    if Puppet[:key_type] == 'ec'
-      Puppet.info _("Creating a new EC SSL key for %{name} using curve %{curve}") % { name: certname, curve: Puppet[:named_curve] }
-      OpenSSL::PKey::EC.generate(Puppet[:named_curve])
-    else
-      Puppet.info _("Creating a new SSL key for %{name}") % { name: certname }
-      OpenSSL::PKey::RSA.new(Puppet[:keylength].to_i)
-    end
-  end
 end

data/lib/puppet/application.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'optparse'
 require_relative '../puppet/util/command_line'
 require_relative '../puppet/util/constant_inflector'
@@ -503,12 +504,8 @@ class Application
     runtime_info = {
       'puppet_version' => Puppet.version,
       'ruby_version'   => RUBY_VERSION,
-      'run_mode'       => self.class.run_mode.name
+      'run_mode'       => self.class.run_mode.name,
     }
-    unless Puppet::Util::Platform.jruby_fips?
-      runtime_info['openssl_version'] = "'#{OpenSSL::OPENSSL_VERSION}'"
-      runtime_info['openssl_fips'] = OpenSSL::OPENSSL_FIPS
-    end
     runtime_info['default_encoding'] = Encoding.default_external
     runtime_info.merge!(extra_info) unless extra_info.nil?
 

data/lib/puppet/application_support.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'yaml'
 
 require_relative '../puppet'

data/lib/puppet/coercion.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Various methods used to coerce values into a canonical form.
 #
 # @api private

data/lib/puppet/compilable_resource_type.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 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

data/lib/puppet/concurrent/lock.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/concurrent/synchronized'
 
 module Puppet

data/lib/puppet/concurrent/synchronized.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
 module Concurrent
 

data/lib/puppet/concurrent.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 module Puppet::Concurrent
 end

data/lib/puppet/configurer/downloader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/configurer'
 require_relative '../../puppet/resource/catalog'
 

data/lib/puppet/configurer/fact_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/facts/facter'
 
 require_relative '../../puppet/configurer'

data/lib/puppet/configurer/plugin_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Break out the code related to plugins.  This module is
 # just included into the agent, but having it here makes it
 # easier to test.

data/lib/puppet/configurer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The client for interacting with the puppetmaster config server.
 require 'timeout'
 require_relative '../puppet/util'

data/lib/puppet/confine/any.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Confine::Any < Puppet::Confine
   def self.summarize(confines)
     confines.inject(0) { |count, confine| count + confine.summary }

data/lib/puppet/confine/boolean.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/confine'
 
 # Common module for the Boolean confines. It currently

data/lib/puppet/confine/exists.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/confine'
 
 class Puppet::Confine::Exists < Puppet::Confine

data/lib/puppet/confine/false.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/confine/boolean'
 
 class Puppet::Confine::False < Puppet::Confine

data/lib/puppet/confine/feature.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/confine'
 
 class Puppet::Confine::Feature < Puppet::Confine

data/lib/puppet/confine/true.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/confine/boolean'
 
 class Puppet::Confine::True < Puppet::Confine

data/lib/puppet/confine/variable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/confine'
 
 # Require a specific value for a variable, either a Puppet setting

data/lib/puppet/confine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The class that handles testing whether our providers
 # actually work or not.
 require_relative '../puppet/util'

data/lib/puppet/confine_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage a collection of confines, returning a boolean or
 # helpful information.
 require_relative '../puppet/confine'

data/lib/puppet/confiner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/confine_collection'
 
 # The Confiner module contains methods for managing a Provider's confinement (suitability under given
@@ -16,7 +17,7 @@ module Puppet::Confiner
   # * `:any` => an array of expressions that will be ORed together
   #
   # @example
-  #   confine :operatingsystem => [:redhat, :fedora]
+  #   confine 'os.name' => [:redhat, :fedora]
   #   confine :true { ... }
   #
   # @param hash [Hash<{Symbol => Object}>] hash of confines

data/lib/puppet/context/trusted_information.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/trusted_external'
 
 # @api private
@@ -109,12 +110,12 @@ class Puppet::Context::TrustedInformation
 
   def to_h
     {
-      'authenticated'.freeze => authenticated,
-      'certname'.freeze => certname,
-      'extensions'.freeze => extensions,
-      'hostname'.freeze => hostname,
-      'domain'.freeze => domain,
-      'external'.freeze => external,
+      'authenticated' => authenticated,
+      'certname' => certname,
+      'extensions' => extensions,
+      'hostname' => hostname,
+      'domain' => domain,
+      'external' => external,
     }.freeze
   end
 end

data/lib/puppet/context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/thread_local'
 
 # Puppet::Context is a system for tracking services and contextual information

data/lib/puppet/daemon.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/application'
 require_relative '../puppet/scheduler'
 

data/lib/puppet/data_binding.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/indirector'
 
 # A class for managing data lookups

data/lib/puppet/datatypes/error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Puppet::DataTypes.create_type('Error') do
   interface <<-PUPPET
     type_parameters => {

data/lib/puppet/datatypes/impl/error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::DataTypes::Error
   attr_reader :msg, :kind, :issue_code, :details
   alias message msg

data/lib/puppet/datatypes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Data types in the Puppet Language can have implementations written in Ruby
 # and distributed in puppet modules. A data type can be declared together with
 # its implementation by creating a file in 'lib/puppet/functions/<modulename>'.

data/lib/puppet/defaults.rb

@@ -1,9 +1,14 @@
+# frozen_string_literal: true
 require_relative '../puppet/util/platform'
 
 module Puppet
 
   def self.default_diffargs
-    '-u'
+    if (Puppet.runtime[:facter].value(:kernel) == "AIX" && Puppet.runtime[:facter].value(:kernelmajversion) == "5300")
+      ""
+    else
+      "-u"
+    end
   end
 
   def self.default_digest_algorithm
@@ -184,14 +189,14 @@ module Puppet
         ",
     },
     :strict => {
-      :default    => :warning,
+      :default    => :error,
       :type       => :symbolic_enum,
       :values     => [:off, :warning, :error],
       :desc       => "The strictness level of puppet. Allowed values are:
 
         * off     - do not perform extra validation, do not report
-        * warning - perform extra validation, report as warning (default)
-        * error   - perform extra validation, fail with error
+        * warning - perform extra validation, report as warning
+        * error   - perform extra validation, fail with error (default)
 
         The strictness level is for both language semantics and runtime
         evaluation validation. In addition to controlling the behavior with
@@ -365,11 +370,12 @@ module Puppet
           be set in `[server]`, `[agent]`, or an environment config section.",
         :call_hook => :on_define_and_write,
         :hook             => proc do |value|
-          Puppet::Util.set_env('PATH', '') if Puppet::Util.get_env('PATH').nil?
-          Puppet::Util.set_env('PATH', value) unless value == 'none'
-          paths = Puppet::Util.get_env('PATH').split(File::PATH_SEPARATOR)
+          ENV['PATH'] = '' if ENV['PATH'].nil?
+          ENV['PATH'] = value unless value == 'none'
+          paths = ENV['PATH'].split(File::PATH_SEPARATOR)
           Puppet::Util::Platform.default_paths.each do |path|
-            Puppet::Util.set_env('PATH', Puppet::Util.get_env('PATH') + File::PATH_SEPARATOR + path) unless paths.include?(path)
+            next if paths.include?(path)
+            ENV['PATH'] = ENV['PATH'] + File::PATH_SEPARATOR + path
           end
           value
         end
@@ -1207,12 +1213,13 @@ EOT
       #{AS_DURATION}",
     },
     :crl_refresh_interval => {
+      :default    => "1d",
       :type       => :duration,
       :desc       => "How often the Puppet agent refreshes its local CRL. By
-         default the CRL is only downloaded once, and never refreshed. If a
-         duration is specified, then the agent will refresh its CRL whenever it
-         next runs and the elapsed time since the CRL was last refreshed exceeds
-         the duration.
+         default the CRL is refreshed once every 24 hours. If a different
+         duration is specified, then the agent will refresh its CRL whenever
+         it next runs and the elapsed time since the CRL was last refreshed
+         exceeds the duration.
 
          In general, the duration should be greater than the `runinterval`.
          Setting it to an equal or lesser value will cause the CRL to be
@@ -1460,7 +1467,7 @@ EOT
         To turn off reports entirely, set this to `none`",
     },
     :exclude_unchanged_resources => {
-      :default => false,
+      :default => true,
       :type => :boolean,
       :desc => 'When set to true, resources that have had no changes after catalog application
         will not have corresponding unchanged resource status updates listed in the report.'
@@ -1706,9 +1713,14 @@ EOT
       instances will be serialized using this method, since not all classes
       can be guaranteed to support this format, but it will be used for all
       classes that support it.",
+      :hook => proc { |value|
+        if value == "pson" && !Puppet.features.pson?
+          raise(Puppet::Settings::ValidationError, "The 'puppet-pson' gem must be installed to use the PSON serialization format.")
+        end
+      }
     },
     :allow_pson_serialization => {
-      :default    => true,
+      :default    => false,
       :type       => :boolean,
       :desc       => "Whether when unable to serialize to JSON or other formats,
         Puppet falls back to PSON. This option affects both puppetserver's
@@ -1738,7 +1750,7 @@ EOT
     },
     :include_legacy_facts => {
       :type       => :boolean,
-      :default    => true,
+      :default    => false,
       :desc       => "Whether to include legacy facts when requesting a catalog. This
         option can be set to false provided all puppet manifests, hiera.yaml and hiera
         configuration layers no longer access legacy facts, such as `$osfamily`, and
@@ -2054,11 +2066,11 @@ EOT
         what is being done.",
     },
     :preprocess_deferred => {
-      :default => true,
+      :default => false,
       :type => :boolean,
       :desc => "Whether puppet should call deferred functions before applying
         the catalog. If set to `true`, then all prerequisites needed for the
-        deferred function must be satified prior to puppet running. If set to
+        deferred function must be satisfied prior to puppet running. If set to
         `false`, then deferred functions will follow puppet relationships and
         ordering. This allows puppet to install prerequisites needed for a
         deferred function and call the deferred function in the same run."
@@ -2227,7 +2239,7 @@ EOT
     EOT
     },
   :strict_variables => {
-    :default => false,
+    :default => true,
     :type => :boolean,
     :desc => <<-'EOT'
       Causes an evaluation error when referencing unknown variables. (This does not affect

data/lib/puppet/environments.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/concurrent/synchronized'
 
 # @api private

data/lib/puppet/error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   # The base class for all Puppet errors. It can wrap another exception
   class Error < RuntimeError

data/lib/puppet/etc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/util/character_encoding'
 # Wrapper around Ruby Etc module allowing us to manage encoding in a single
 # place.

data/lib/puppet/external/dot.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # rdot.rb
 #
 #

data/lib/puppet/face/catalog/select.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Select and show a list of resources of a given type.
 Puppet::Face.define(:catalog, '0.0.1') do
   action :select do

data/lib/puppet/face/catalog.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:catalog, '0.0.1') do

data/lib/puppet/face/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/face'
 require_relative '../../puppet/settings/ini_file'
 
@@ -81,7 +82,7 @@ Puppet::Face.define(:config, '0.0.1') do
     end
 
     when_rendering :console do |to_be_rendered|
-      output = ''
+      output = String.new
       if to_be_rendered.keys.length > 1
         to_be_rendered.keys.sort.each do |setting|
           output << "#{setting} = #{to_be_rendered[setting]}\n"

data/lib/puppet/face/epp.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/face'
 require_relative '../../puppet/pops'
 require_relative '../../puppet/parser/files'
@@ -366,7 +367,7 @@ Puppet::Face.define(:epp, '0.0.1') do
   end
 
   def dump_parse(source, filename, options, show_filename = true)
-    output = ""
+    output = String.new
     evaluating_parser = Puppet::Pops::Parser::EvaluatingParser::EvaluatingEppParser.new
     begin
       if options[:validate]
@@ -450,7 +451,7 @@ Puppet::Face.define(:epp, '0.0.1') do
 
   def render_file(epp_template_name, compiler, options, show_filename, file_nbr)
     template_args = get_values(compiler, options)
-    output = ""
+    output = String.new
     begin
       if show_filename && options[:header]
         output << "\n" unless file_nbr == 1

data/lib/puppet/face/facts.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/face'
 require_relative '../../puppet/node/facts'
 

data/lib/puppet/face/generate.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/face'
 require_relative '../../puppet/generate/type'
 

data/lib/puppet/face/help/action.erb

@@ -54,7 +54,6 @@ undocumented option
 	end
 	unless action.options.empty?
       action.options.sort.each do |name|
-        next if name == :extra
         option = action.get_option name -%>
 <%= "  " + option.optparse.join(" | ")[0,(optionroom - 1)].ljust(optionroom) + ' - ' -%>
 <%     if !(option.summary) -%>

data/lib/puppet/face/help/face.erb

@@ -49,7 +49,6 @@ undocumented option
 	end
  	unless face.options.empty?
       face.options.sort.each do |name|
-        next if name == :extra
         option = face.get_option name -%>
 <%= "  " + option.optparse.join(" | ")[0,(optionroom - 1)].ljust(optionroom) + ' - ' -%>
 <%     if !(option.summary) -%>

data/lib/puppet/face/help.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/face'
 require_relative '../../puppet/application/face_base'
 require_relative '../../puppet/util/constant_inflector'
@@ -190,9 +191,9 @@ Puppet::Face.define(:help, '0.0.1') do
     end
   end
 
-  COMMON = 'Common:'.freeze
-  SPECIALIZED = 'Specialized:'.freeze
-  BLANK = "\n".freeze
+  COMMON = 'Common:'
+  SPECIALIZED = 'Specialized:'
+  BLANK = "\n"
   def available_application_names_special_sort()
     full_list = Puppet::Application.available_application_names
     a_list = full_list & %w{apply agent config help lookup module resource}