puppet 8.4.0 → 8.5.0

data/lib/puppet/application/script.rb

@@ -6,12 +6,12 @@ require_relative '../../puppet/util/profiler/aggregate'
 require_relative '../../puppet/parser/script_compiler'
 
 class Puppet::Application::Script < Puppet::Application
-  option("--debug","-d")
-  option("--execute EXECUTE","-e") do |arg|
+  option("--debug", "-d")
+  option("--execute EXECUTE", "-e") do |arg|
     options[:code] = arg
   end
-  option("--test","-t")
-  option("--verbose","-v")
+  option("--test", "-t")
+  option("--verbose", "-v")
 
   option("--logdest LOGDEST", "-l") do |arg|
     handle_logdest_arg(arg)
@@ -23,92 +23,92 @@ class Puppet::Application::Script < Puppet::Application
 
   def help
     <<~HELP
-      
+
       puppet-script(8) -- #{summary}
       ========
-      
+
       SYNOPSIS
       --------
       Runs a puppet language script without compiling a catalog.
-      
-      
+
+
       USAGE
       -----
       puppet script [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
         [-e|--execute]
         [-l|--logdest syslog|eventlog|<FILE>|console] [--noop]
         <file>
-      
-      
+
+
       DESCRIPTION
       -----------
       This is a standalone puppet script runner tool; use it to run puppet code
       without compiling a catalog.
-      
+
       When provided with a modulepath, via command line or config file, puppet
       script can load functions, types, tasks and plans from modules.
-      
+
       OPTIONS
       -------
       Note that any setting that's valid in the configuration
       file is also a valid long argument. For example, 'environment' is a
       valid setting, so you can specify '--environment mytest'
       as an argument.
-      
+
       See the configuration file documentation at
       https://puppet.com/docs/puppet/latest/configuration.html for the
       full list of acceptable parameters. A commented list of all
       configuration options can also be generated by running puppet with
       '--genconfig'.
-      
+
       * --debug:
         Enable full debugging.
-      
+
       * --help:
         Print this help message
-      
-      
+
+
       * --logdest:
         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`)"
-      
+
         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
         appending nature of logging. It must be appended manually to make the content
         valid JSON.
-      
+
         A path ending with '.jsonl' will receive structured output in JSON Lines
         format.
-      
+
       * --noop:
         Use 'noop' mode where Puppet runs in a no-op or dry-run mode. This
         is useful for seeing what changes Puppet will make without actually
         executing the changes. Applies to tasks only.
-      
+
       * --execute:
         Execute a specific piece of Puppet code
-      
+
       * --verbose:
         Print extra information.
-      
+
       EXAMPLE
       -------
           $ puppet script -l /tmp/manifest.log manifest.pp
           $ puppet script --modulepath=/root/dev/modules -e 'notice("hello world")'
-      
-      
+
+
       AUTHOR
       ------
       Henrik Lindberg
-      
-      
+
+
       COPYRIGHT
       ---------
       Copyright (c) 2017 Puppet Inc., LLC Licensed under the Apache 2.0 License
-      
+
     HELP
   end
 
@@ -169,7 +169,7 @@ class Puppet::Application::Script < Puppet::Application
     node.environment = apply_environment
 
     # TRANSLATION, the string "For puppet script" is not user facing
-    Puppet.override({:current_environment => apply_environment}, "For puppet script") do
+    Puppet.override({ :current_environment => apply_environment }, "For puppet script") do
       # Merge in the facts.
       node.merge(facts.values) if facts
 

data/lib/puppet/application/ssl.rb

@@ -14,38 +14,38 @@ class Puppet::Application::Ssl < Puppet::Application
     <<~HELP
       puppet-ssl(8) -- #{summary}
       ========
-      
+
       SYNOPSIS
       --------
       Manage SSL keys and certificates for SSL clients needing
       to communicate with a puppet infrastructure.
-      
+
       USAGE
       -----
       puppet ssl <action> [-h|--help] [-v|--verbose] [-d|--debug] [--localca] [--target CERTNAME]
-      
-      
+
+
       OPTIONS
       -------
-      
+
       * --help:
         Print this help message.
-      
+
       * --verbose:
         Print extra information.
-      
+
       * --debug:
         Enable full debugging.
-      
+
       * --localca
         Also clean the local CA certificate and CRL.
-      
+
       * --target CERTNAME
         Clean the specified device certificate instead of this host's certificate.
-      
+
       ACTIONS
       -------
-      
+
       * bootstrap:
         Perform all of the steps necessary to request and download a client
         certificate. If autosigning is disabled, then puppet will wait every
@@ -53,34 +53,34 @@ class Puppet::Application::Ssl < Puppet::Application
         once and never wait, specify a time of 0. Since `waitforcert` is a
         Puppet setting, it can be specified as a time interval, such as 30s,
         5m, 1h.
-      
+
       * submit_request:
         Generate a certificate signing request (CSR) and submit it to the CA. 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. 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
         for subsequent requests. If there is already an existing certificate, it
         will be overwritten.
-      
+
       * verify:
         Verify the private key and certificate are present and match, verify the
         certificate is issued by a trusted CA, and check revocation status.
-      
+
       * clean:
         Remove the private key and certificate related files for this host. If
         `--localca` is specified, then also remove this host's local copy of the
         CA certificate(s) and CRL bundle. if `--target CERTNAME` is specified, then
         remove the files for the specified device on this host instead of this host.
-      
+
        * show:
         Print the full-text version of this host's certificate.
     HELP
@@ -149,7 +149,7 @@ class Puppet::Application::Ssl < Puppet::Application
     when 'clean'
       possible_extra_args = command_line.args.drop(1)
       unless possible_extra_args.empty?
-        raise Puppet::Error, _(<<~END) % { args: possible_extra_args.join(' ')}
+        raise Puppet::Error, _(<<~END) % { args: possible_extra_args.join(' ') }
           Extra arguments detected: %{args}
           Did you mean to run:
             puppetserver ca clean --certname <name>

data/lib/puppet/application.rb

@@ -109,7 +109,7 @@ class Application
   require_relative '../puppet/util'
   include Puppet::Util
 
-  DOCPATTERN = ::File.expand_path(::File.dirname(__FILE__) + "/util/command_line/*" )
+  DOCPATTERN = ::File.expand_path(::File.dirname(__FILE__) + "/util/command_line/*")
   CommandLineArgs = Struct.new(:subcommand_name, :args)
 
   @loader = Puppet::Util::Autoload.new(self, 'puppet/application')
@@ -178,7 +178,7 @@ class Application
 
     # used to declare code that handle an option
     def option(*options, &block)
-      long = options.find { |opt| opt =~ /^--/ }.gsub(/^--(?:\[no-\])?([^ =]+).*$/, '\1' ).tr('-','_')
+      long = options.find { |opt| opt =~ /^--/ }.gsub(/^--(?:\[no-\])?([^ =]+).*$/, '\1').tr('-', '_')
       fname = "handle_#{long}".intern
       if (block_given?)
         define_method(fname, &block)
@@ -287,7 +287,7 @@ class Application
       return @run_mode if @run_mode and not mode_name
 
       require_relative '../puppet/util/run_mode'
-      @run_mode = Puppet::Util::RunMode[ mode_name || Puppet.settings.preferred_run_mode ]
+      @run_mode = Puppet::Util::RunMode[mode_name || Puppet.settings.preferred_run_mode]
     end
 
     # Sets environment_mode name. When acting as a compiler, the environment mode
@@ -372,7 +372,7 @@ class Application
   # Initialize application defaults. It's usually not necessary to override this method.
   # @return [void]
   # @api public
-  def initialize_app_defaults()
+  def initialize_app_defaults
     Puppet.settings.initialize_app_defaults(app_defaults)
   end
 
@@ -501,7 +501,7 @@ class Application
   #   to log. Intended to be passed to super by subclasses.
   # @return [void]
   # @api public
-  def log_runtime_environment(extra_info=nil)
+  def log_runtime_environment(extra_info = nil)
     runtime_info = {
       'puppet_version' => Puppet.version,
       'ruby_version' => RUBY_VERSION,
@@ -514,7 +514,7 @@ class Application
     runtime_info['default_encoding'] = Encoding.default_external
     runtime_info.merge!(extra_info) unless extra_info.nil?
 
-    Puppet.debug 'Runtime environment: ' + runtime_info.map{|k,v| k + '=' + v.to_s}.join(', ')
+    Puppet.debug 'Runtime environment: ' + runtime_info.map { |k, v| k + '=' + v.to_s }.join(', ')
   end
 
   # Options defined with the `option` method are parsed from settings and the command line.
@@ -576,7 +576,7 @@ class Application
   end
 
   def name
-    self.class.to_s.sub(/.*::/,"").downcase.to_sym
+    self.class.to_s.sub(/.*::/, "").downcase.to_sym
   end
 
   # Return the text to display when running `puppet help`.

data/lib/puppet/application_support.rb

@@ -37,7 +37,7 @@ module Puppet
       configured_environment = configured_environment.override_from_commandline(Puppet.settings)
 
       # Setup a new context using the app's configuration
-      Puppet.push_context({:current_environment => configured_environment},
+      Puppet.push_context({ :current_environment => configured_environment },
                           "Update current environment from application's configuration")
     end
 

data/lib/puppet/compilable_resource_type.rb

@@ -7,11 +7,11 @@ require_relative '../puppet'
 # Puppet Resource Types written in Ruby use a meta programmed Ruby Class as the type. Those classes
 # are subtypes of Puppet::Type. Meta data (Pcore/puppet language) based resource types uses instances of
 # a class instead.
-# 
+#
 module Puppet::CompilableResourceType
   # All 3.x resource types implemented in Ruby using Puppet::Type respond true.
   # Other kinds of implementations should reimplement and return false.
   def is_3x_ruby_plugin?
     true
   end
-end
+end

data/lib/puppet/concurrent/lock.rb

@@ -13,4 +13,3 @@ class Lock
 end
 end
 end
-

data/lib/puppet/configurer/fact_handler.rb

@@ -20,7 +20,7 @@ module Puppet::Configurer::FactHandler
         facts.name = Puppet[:node_name_value]
       end
       facts
-    rescue SystemExit,NoMemoryError
+    rescue SystemExit, NoMemoryError
       raise
     rescue Exception => detail
       message = _("Could not retrieve local facts: %{detail}") % { detail: detail }
@@ -44,9 +44,9 @@ module Puppet::Configurer::FactHandler
     # so it's only important that encoding method here return original values
     # correctly when CGI.unescape called against it (in compiler code)
     if Puppet[:preferred_serialization_format] == "pson"
-      {:facts_format => :pson, :facts => Puppet::Util.uri_query_encode(facts.render(:pson)) }
+      { :facts_format => :pson, :facts => Puppet::Util.uri_query_encode(facts.render(:pson)) }
     else
-      {:facts_format => 'application/json', :facts => Puppet::Util.uri_query_encode(facts.render(:json)) }
+      { :facts_format => 'application/json', :facts => Puppet::Util.uri_query_encode(facts.render(:json)) }
     end
   end
 end

data/lib/puppet/configurer.rb

@@ -144,7 +144,7 @@ class Puppet::Configurer
   end
 
   def warn_fact_value_length(value, max_length)
-    Puppet.warning _("Fact value '%{value}' with the value length: '%{length}' exceeds the value length limit: %{max_length}") % { value: value, length:value.to_s.bytesize, max_length: max_length }
+    Puppet.warning _("Fact value '%{value}' with the value length: '%{length}' exceeds the value length limit: %{max_length}") % { value: value, length: value.to_s.bytesize, max_length: max_length }
   end
 
   def warn_fact_payload_size(payload, max_size)
@@ -155,7 +155,7 @@ class Puppet::Configurer
     max_length = Puppet[:fact_name_length_soft_limit]
     return if max_length.zero?
 
-    # rough byte size estimations of fact path as a postgresql btree index 
+    # rough byte size estimations of fact path as a postgresql btree index
     size_as_btree_index = 8 + (number_of_dots * 2) + name.to_s.bytesize
     warn_fact_name_length(name, max_length) if size_as_btree_index > max_length
   end
@@ -186,7 +186,7 @@ class Puppet::Configurer
     return if max_size.zero?
 
     warn_fact_payload_size(payload, max_size) if payload > max_size
-    Puppet.debug _("The size of the payload is %{payload}") % {payload: payload}
+    Puppet.debug _("The size of the payload is %{payload}") % { payload: payload }
   end
 
   def parse_fact_name_and_value_limits(object, path = [])
@@ -216,7 +216,7 @@ class Puppet::Configurer
 
     parse_fact_name_and_value_limits(facts)
     check_total_number_limit(@number_of_facts)
-    Puppet.debug _("The total number of facts registered is %{number_of_facts}") % {number_of_facts: @number_of_facts}
+    Puppet.debug _("The total number of facts registered is %{number_of_facts}") % { number_of_facts: @number_of_facts }
   end
 
   def get_facts(options)
@@ -273,7 +273,7 @@ class Puppet::Configurer
   end
 
   def prepare_and_retrieve_catalog_from_cache(options = {})
-    result = retrieve_catalog_from_cache({:transaction_uuid => @transaction_uuid, :static_catalog => @static_catalog})
+    result = retrieve_catalog_from_cache({ :transaction_uuid => @transaction_uuid, :static_catalog => @static_catalog })
     Puppet.info _("Using cached catalog from environment '%{catalog_env}'") % { catalog_env: result.environment } if result
     result
   end
@@ -560,7 +560,7 @@ class Puppet::Configurer
                    { host: e.response.url.host, port: e.response.url.port, code: e.response.code, reason: e.response.reason })
     rescue => detail
       # TRANSLATORS 'server_list' is the name of a setting and should not be translated
-      Puppet.debug _("Unable to connect to server from server_list setting: %{detail}") % {detail: detail}
+      Puppet.debug _("Unable to connect to server from server_list setting: %{detail}") % { detail: detail }
     end
     [nil, nil]
   end
@@ -670,7 +670,8 @@ class Puppet::Configurer
 
     Puppet.info(_("Uploading facts for %{node} to %{server}") % {
       node: facts.name,
-      server: puppet.url.hostname})
+      server: puppet.url.hostname
+    })
 
     puppet.put_facts(facts.name, facts: facts, environment: Puppet.lookup(:current_environment).name.to_s)
 

data/lib/puppet/confine/any.rb

@@ -6,7 +6,7 @@ class Puppet::Confine::Any < Puppet::Confine
   end
 
   def pass?(value)
-    !! value
+    !!value
   end
 
   def message(value)

data/lib/puppet/confine/boolean.rb

@@ -36,7 +36,7 @@ class Puppet::Confine
       return @cached_value unless @cached_value.nil?
 
       # Double negate to coerce the value into a Boolean
-      calculated_value = !! @values.first.call
+      calculated_value = !!@values.first.call
       if calculated_value == passing_value
         @cached_value = [calculated_value]
       end

data/lib/puppet/confine/exists.rb

@@ -16,6 +16,6 @@ class Puppet::Confine::Exists < Puppet::Confine
   end
 
   def summary
-    result.zip(values).inject([]) { |array, args| val, f = args; array << f unless val; array }
+    result.zip(values).each_with_object([]) { |args, array| val, f = args; array << f unless val; }
   end
 end

data/lib/puppet/confine/false.rb

@@ -14,7 +14,7 @@ class Puppet::Confine::False < Puppet::Confine
   end
 
   def pass?(value)
-    ! value
+    !value
   end
 
   def message(value)

data/lib/puppet/confine/feature.rb

@@ -4,7 +4,7 @@ require_relative '../../puppet/confine'
 
 class Puppet::Confine::Feature < Puppet::Confine
   def self.summarize(confines)
-    confines.collect { |c| c.values }.flatten.uniq.find_all { |value| ! confines[0].pass?(value) }
+    confines.collect { |c| c.values }.flatten.uniq.find_all { |value| !confines[0].pass?(value) }
   end
 
   # Is the named feature available?
@@ -16,4 +16,3 @@ class Puppet::Confine::Feature < Puppet::Confine
     "feature #{value} is missing"
   end
 end
-

data/lib/puppet/confine/true.rb

@@ -15,7 +15,7 @@ class Puppet::Confine::True < Puppet::Confine
 
   def pass?(value)
     # Double negate, so we only get true or false.
-    ! ! value
+    !!value
   end
 
   def message(value)

data/lib/puppet/confine/variable.rb

@@ -12,7 +12,7 @@ class Puppet::Confine::Variable < Puppet::Confine
   # Only returns failed values, not all required values.
   def self.summarize(confines)
     result = Hash.new { |hash, key| hash[key] = [] }
-    confines.inject(result) { |total, confine| total[confine.name] += confine.values unless confine.valid?; total }
+    confines.each_with_object(result) { |confine, total| total[confine.name] += confine.values unless confine.valid?; }
   end
 
   # This is set by ConfineCollection.

data/lib/puppet/confine_collection.rb

@@ -49,6 +49,6 @@ class Puppet::ConfineCollection
   end
 
   def valid?
-    ! @confines.detect { |c| ! c.valid? }
+    !@confines.detect { |c| !c.valid? }
   end
 end

data/lib/puppet/context/trusted_information.rb

@@ -54,9 +54,9 @@ class Puppet::Context::TrustedInformation
       if certificate.nil?
         Puppet.info(_('TrustedInformation expected a certificate, but none was given.'))
       else
-        extensions = Hash[certificate.custom_extensions.collect do |ext|
+        extensions = certificate.custom_extensions.to_h do |ext|
           [ext['oid'].freeze, ext['value'].freeze]
-        end]
+        end
       end
       new('remote', node_name, extensions, external)
     else
@@ -93,10 +93,10 @@ class Puppet::Context::TrustedInformation
   def self.deep_freeze(object)
     case object
     when Array
-      object.each {|v| deep_freeze(v) }
+      object.each { |v| deep_freeze(v) }
       object.freeze
     when Hash
-      object.each {|k, v| deep_freeze(k); deep_freeze(v) }
+      object.each { |k, v| deep_freeze(k); deep_freeze(v) }
       object.freeze
     when NilClass, Numeric, TrueClass, FalseClass
       # do nothing

data/lib/puppet/daemon.rb

@@ -58,7 +58,7 @@ class Puppet::Daemon
 
   # Close stdin/stdout/stderr so that we can finish our transition into 'daemon' mode.
   # @return nil
-  def self.close_streams()
+  def self.close_streams
     Puppet.debug("Closing streams for daemon mode")
     begin
       $stdin.reopen "/dev/null"
@@ -68,7 +68,7 @@ class Puppet::Daemon
       Puppet.debug("Finished closing streams for daemon mode")
     rescue => detail
       Puppet.err "Could not start #{Puppet.run_mode.name}: #{detail}"
-      Puppet::Util::replace_file("/tmp/daemonout", 0644) do |f|
+      Puppet::Util.replace_file("/tmp/daemonout", 0644) do |f|
         f.puts "Could not start #{Puppet.run_mode.name}: #{detail}"
       end
       exit(12)
@@ -76,7 +76,7 @@ class Puppet::Daemon
   end
 
   # Convenience signature for calling Puppet::Daemon.close_streams
-  def close_streams()
+  def close_streams
     Puppet::Daemon.close_streams
   end
 
@@ -90,7 +90,7 @@ class Puppet::Daemon
   end
 
   def reload
-    agent.run({:splay => false})
+    agent.run({ :splay => false })
   rescue Puppet::LockError
     Puppet.notice "Not triggering already-running agent"
   end
@@ -116,7 +116,7 @@ class Puppet::Daemon
 
     # extended signals not supported under windows
     if !Puppet::Util::Platform.windows?
-      signals = {:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }
+      signals = { :HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }
       signals.each do |signal, method|
         Signal.trap(signal) do
           Puppet.notice "Caught #{signal}; storing #{method}"
@@ -127,7 +127,7 @@ class Puppet::Daemon
   end
 
   # Stop everything
-  def stop(args = {:exit => true})
+  def stop(args = { :exit => true })
     Puppet::Application.stop!
 
     remove_pidfile

data/lib/puppet/datatypes.rb

@@ -132,7 +132,7 @@ module Puppet::DataTypes
       loader = block.binding.eval('loader_injected_arg if defined?(loader_injected_arg)')
       create_loaded_type(type_name, loader, &block)
     rescue StandardError => e
-      raise ArgumentError, _("Data Type Load Error for type '%{type_name}': %{message}") % {type_name: type_name, message: e.message}
+      raise ArgumentError, _("Data Type Load Error for type '%{type_name}': %{message}") % { type_name: type_name, message: e.message }
     end
   end
 
@@ -158,7 +158,8 @@ module Puppet::DataTypes
 
       created_type = Puppet::Pops::Types::PObjectType.new(
         @type_name,
-        Puppet::Pops::Parser::EvaluatingParser.new.parse_string("{ #{@interface} }").body)
+        Puppet::Pops::Parser::EvaluatingParser.new.parse_string("{ #{@interface} }").body
+      )
 
       if !@implementation_class.nil?
         if @implementation_class < Puppet::Pops::Types::PuppetObject