puppet 7.28.0 → 8.0.1

data/lib/puppet/settings/integer_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Settings::IntegerSetting < Puppet::Settings::BaseSetting
   def munge(value)
     return value if Integer === value

data/lib/puppet/settings/path_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Settings::PathSetting < Puppet::Settings::StringSetting
   def munge(value)
     if value.is_a?(String)

data/lib/puppet/settings/port_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Settings::PortSetting < Puppet::Settings::IntegerSetting
   def munge(value)
     value = super

data/lib/puppet/settings/priority_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/settings/base_setting'
 
 # A setting that represents a scheduling priority, and evaluates to an

data/lib/puppet/settings/server_list_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Settings::ServerListSetting < Puppet::Settings::ArraySetting
 
   def type

data/lib/puppet/settings/string_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Settings::StringSetting < Puppet::Settings::BaseSetting
   def type
     :string

data/lib/puppet/settings/symbolic_enum_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Settings::SymbolicEnumSetting < Puppet::Settings::BaseSetting
   attr_accessor :values
 

data/lib/puppet/settings/terminus_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Settings::TerminusSetting < Puppet::Settings::BaseSetting
   def munge(value)
     case value

data/lib/puppet/settings/ttl_setting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A setting that represents a span of time to live, and evaluates to Numeric
 # seconds to live where 0 means shortest possible time to live, a positive numeric value means time
 # to live in seconds, and the symbolic entry 'unlimited' is an infinite amount of time.

data/lib/puppet/settings/value_translator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Convert arguments into booleans, integers, or whatever.
 class Puppet::Settings::ValueTranslator
   def [](value)

data/lib/puppet/settings.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet'
 require 'getoptlong'
 require_relative '../puppet/util/watched_file'
@@ -5,7 +6,6 @@ require_relative '../puppet/util/command_line/puppet_option_parser'
 require 'forwardable'
 require 'fileutils'
 require 'concurrent'
-require_relative 'concurrent/lock'
 
 # The class for handling configuration files.
 class Puppet::Settings
@@ -50,7 +50,7 @@ class Puppet::Settings
   # The acceptable sections of the puppet.conf configuration file.
   ALLOWED_SECTION_NAMES = ['main', 'server', 'master', 'agent', 'user'].freeze
 
-  NONE = 'none'.freeze
+  NONE = 'none'
 
   # This method is intended for puppet internal use only; it is a convenience method that
   # returns reasonable application default settings values for a given run_mode.
@@ -79,11 +79,11 @@ class Puppet::Settings
   end
 
   def self.hostname_fact()
-    Puppet.runtime[:facter].value :hostname
+    Puppet.runtime[:facter].value 'networking.hostname'
   end
 
   def self.domain_fact()
-    Puppet.runtime[:facter].value :domain
+    Puppet.runtime[:facter].value 'networking.domain'
   end
 
   def self.default_config_file_name
@@ -147,21 +147,8 @@ class Puppet::Settings
     @configuration_file = nil
 
     # And keep a per-environment cache
-    # We can't use Concurrent::Map because we want to preserve insertion order
-    @cache_lock = Puppet::Concurrent::Lock.new
-    @cache = Concurrent::Hash.new do |hash, key|
-      @cache_lock.synchronize do
-        break hash[key] if hash.key?(key)
-        hash[key] = Concurrent::Hash.new
-      end
-    end
-    @values_lock = Puppet::Concurrent::Lock.new
-    @values = Concurrent::Hash.new do |hash, key|
-      @values_lock.synchronize do
-        break hash[key] if hash.key?(key)
-        hash[key] = Concurrent::Hash.new
-      end
-    end
+    @cache = Concurrent::Hash.new { |hash, key| hash[key] = Concurrent::Hash.new }
+    @values = Concurrent::Hash.new { |hash, key| hash[key] = Concurrent::Hash.new }
 
     # The list of sections we've used.
     @used = []
@@ -1414,7 +1401,7 @@ Generated on #{Time.now}.
   #
   # @api public
   class ChainedValues
-    ENVIRONMENT_SETTING = "environment".freeze
+    ENVIRONMENT_SETTING = "environment"
     ENVIRONMENT_INTERPOLATION_ALLOWED = ['config_version'].freeze
 
     # @see Puppet::Settings.values

data/lib/puppet/ssl/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/ssl/openssl_loader'
 require_relative '../../puppet/ssl'
 require_relative '../../puppet/ssl/digest'

data/lib/puppet/ssl/certificate.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/ssl/base'
 
 # Manage certificates themselves.  This class has no

data/lib/puppet/ssl/certificate_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/ssl/base'
 require_relative '../../puppet/ssl/certificate_signer'
 
@@ -68,10 +69,7 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
     csr.public_key = if key.is_a?(OpenSSL::PKey::EC)
                        # EC#public_key doesn't follow the PKey API,
                        # see https://github.com/ruby/openssl/issues/29
-                       point = key.public_key
-                       pubkey = OpenSSL::PKey::EC.new(point.group)
-                       pubkey.public_key = point
-                       pubkey
+                       key
                      else
                        key.public_key
                      end

data/lib/puppet/ssl/certificate_request_attributes.rb

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

data/lib/puppet/ssl/certificate_signer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Take care of signing a certificate in a FIPS 140-2 compliant manner.
 #
 # @see https://projects.puppetlabs.com/issues/17295

data/lib/puppet/ssl/digest.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::SSL::Digest
   attr_reader :digest
 

data/lib/puppet/ssl/error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::SSL
   class SSLError < Puppet::Error; end
 

data/lib/puppet/ssl/oids.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/ssl'
 
 # This module defines OIDs for use within Puppet.
@@ -71,7 +72,6 @@ module Puppet::SSL::Oids
 
     ["1.3.6.1.4.1.34380.1.3.1",  'pp_authorization', 'Certificate Extension Authorization'],
     ["1.3.6.1.4.1.34380.1.3.13", 'pp_auth_role', 'Puppet Node Role Name for Authorization'],
-    ["1.3.6.1.4.1.34380.1.3.39", 'pp_cli_auth', 'Puppetserver CA CLI Authorization'],
   ]
 
   @did_register_puppet_oids = false

data/lib/puppet/ssl/openssl_loader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/util/platform'
 
 # This file should be required instead of writing `require 'openssl'`

data/lib/puppet/ssl/ssl_context.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 require_relative '../../puppet/ssl'
 
 module Puppet::SSL
-  # The `keyword_init: true` option is no longer needed in Ruby >= 3.2
   SSLContext = Struct.new(
     :store,
     :cacerts,
@@ -10,16 +10,22 @@ module Puppet::SSL
     :client_cert,
     :client_chain,
     :revocation,
-    :verify_peer,
-    keyword_init: true
+    :verify_peer
   ) do
-    def initialize(*)
-      super
-      self[:cacerts] ||= []
-      self[:crls] ||= []
-      self[:client_chain] ||= []
-      self[:revocation] = true if self[:revocation].nil?
-      self[:verify_peer] = true if self[:verify_peer].nil?
+    DEFAULTS = {
+      cacerts: [],
+      crls: [],
+      client_chain: [],
+      revocation: true,
+      verify_peer: true
+    }.freeze
+
+    # This is an idiom to initialize a Struct from keyword
+    # arguments. Ruby 2.5 introduced `keyword_init: true` for
+    # that purpose, but we need to support older versions.
+    def initialize(kwargs = {})
+      super({})
+      DEFAULTS.merge(**kwargs).each { |k,v| self[k] = v }
     end
   end
 end

data/lib/puppet/ssl/ssl_provider.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/ssl'
 
 # SSL Provider creates `SSLContext` objects that can be used to create
@@ -235,7 +236,7 @@ class Puppet::SSL::SSLProvider
   def default_flags
     # checking the signature of the self-signed cert doesn't add any security,
     # but it's a sanity check to make sure the cert isn't corrupt. This option
-    # is only available in openssl 1.1+
+    # is not available in JRuby's OpenSSL library.
     if defined?(OpenSSL::X509::V_FLAG_CHECK_SS_SIGNATURE)
       OpenSSL::X509::V_FLAG_CHECK_SS_SIGNATURE
     else

data/lib/puppet/ssl/state_machine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/ssl'
 require_relative '../../puppet/util/pidlock'
 

data/lib/puppet/ssl/verifier.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/ssl'
 
 # Verify an SSL connection.

data/lib/puppet/ssl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Just to make the constants work out.
 require_relative '../puppet'
 require_relative 'ssl/openssl_loader'
@@ -9,7 +10,7 @@ require_relative 'ssl/openssl_loader'
 # @see Puppet::SSL::SSLProvider
 # @api private
 module Puppet::SSL
-  CA_NAME = "ca".freeze
+  CA_NAME = "ca"
 
   require_relative 'ssl/oids'
   require_relative 'ssl/error'

data/lib/puppet/syntax_checkers/base64.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A syntax checker for Base64.
 # @api public
 require_relative '../../puppet/syntax_checkers'

data/lib/puppet/syntax_checkers/epp.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A syntax checker for JSON.
 # @api public
 require_relative '../../puppet/syntax_checkers'

data/lib/puppet/syntax_checkers/json.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A syntax checker for JSON.
 # @api public
 require_relative '../../puppet/syntax_checkers'

data/lib/puppet/syntax_checkers/pp.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A syntax checker for JSON.
 # @api public
 require_relative '../../puppet/syntax_checkers'

data/lib/puppet/syntax_checkers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A name space for syntax checkers provided by Puppet.
 module Puppet::SyntaxCheckers
 end

data/lib/puppet/test/test_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'tmpdir'
 require 'fileutils'
 
@@ -69,13 +70,7 @@ module Puppet::Test
     # @return nil
     def self.before_all_tests()
       # The process environment is a shared, persistent resource.
-      # Can't use Puppet.features.microsoft_windows? as it may be mocked out in a test.  This can cause test recurring test failures
-      if (!!File::ALT_SEPARATOR)
-        mode = :windows
-      else
-        mode = :posix
-      end
-      $old_env = Puppet::Util.get_environment(mode)
+      $old_env = ENV.to_hash
     end
 
     # Call this method once, at the end of a test run, when no more tests
@@ -188,20 +183,8 @@ module Puppet::Test
       end
       $saved_indirection_state = nil
 
-      # Can't use Puppet.features.microsoft_windows? as it may be mocked out in a test.  This can cause test recurring test failures
-      if (!!File::ALT_SEPARATOR)
-        mode = :windows
-      else
-        mode = :posix
-      end
-      # Restore the global process environment.  Can't just assign because this
-      # is a magic variable, sadly, and doesn't do that™.  It is sufficiently
-      # faster to use the compare-then-set model to avoid excessive work that it
-      # justifies the complexity.  --daniel 2012-03-15
-      unless Puppet::Util.get_environment(mode) == $old_env
-        Puppet::Util.clear_environment(mode)
-        $old_env.each {|k, v| Puppet::Util.set_env(k, v, mode) }
-      end
+      # Restore the global process environment.
+      ENV.replace($old_env)
 
       # Clear all environments
       Puppet.lookup(:environments).clear_all

data/lib/puppet/thread_local.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
 require 'concurrent'
 
-class Puppet::ThreadLocal < Concurrent::ThreadLocalVar
+# We want to use the pure Ruby implementation even on JRuby. If we use the Java
+# implementation of ThreadLocal, we end up leaking references to JRuby instances
+# and preventing them from being garbage collected.
+class Puppet::ThreadLocal < Concurrent::RubyThreadLocalVar
 end

data/lib/puppet/transaction/additional_resource_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Adds additional resources to the catalog and relationship graph that are
 # generated by existing resources. There are two ways that a resource can
 # generate additional resources, either through the #generate method or the

data/lib/puppet/transaction/event.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/transaction'
 require_relative '../../puppet/util/tagging'
 require_relative '../../puppet/util/logging'

data/lib/puppet/transaction/event_manager.rb

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

data/lib/puppet/transaction/persistence.rb

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

data/lib/puppet/transaction/report.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet'
 require_relative '../../puppet/indirector'
 
@@ -139,7 +140,7 @@ class Puppet::Transaction::Report
   #
   attr_accessor :transaction_completed
 
-  TOTAL = "total".freeze
+  TOTAL = "total"
 
   def self.from_data_hash(data)
     obj = self.allocate
@@ -368,7 +369,7 @@ class Puppet::Transaction::Report
   def summary
     report = raw_summary
 
-    ret = ""
+    ret = String.new
     report.keys.sort_by(&:to_s).each do |key|
       ret += "#{Puppet::Util::Metric.labelize(key)}:\n"
 

data/lib/puppet/transaction/resource_harness.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/resource/status'
 
 class Puppet::Transaction::ResourceHarness

data/lib/puppet/transaction.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet'
 require_relative '../puppet/util/tagging'
 require_relative '../puppet/util/skip_tags'

data/lib/puppet/trusted_external.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A method for retrieving external trusted facts
 module Puppet::TrustedExternal
   def retrieve(certname)

data/lib/puppet/type/component.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require_relative '../../puppet'
 require_relative '../../puppet/type'
@@ -63,7 +64,7 @@ Puppet::Type.newtype(:component) do
     catalog.adjacent(self).each do |child|
       if child.respond_to?(:refresh)
         child.refresh
-        child.log "triggering refresh"
+        child.log "triggering #{:refresh}"
       end
     end
   end

data/lib/puppet/type/exec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   Type.newtype(:exec) do
     include Puppet::Util::Execution
@@ -592,17 +593,13 @@ module Puppet
       cmd = self[:command]
       cmd = cmd[0] if cmd.is_a? Array
 
-      if cmd.is_a?(Puppet::Pops::Evaluator::DeferredValue)
-        self.debug("The 'command' parameter is deferred and cannot be autorequired")
-      else
-        cmd.scan(file_regex) { |str|
-          reqs << str
-        }
+      cmd.scan(file_regex) { |str|
+        reqs << str
+      }
 
-        cmd.scan(/^"([^"]+)"/) { |str|
-          reqs << str
-        }
-      end
+      cmd.scan(/^"([^"]+)"/) { |str|
+        reqs << str
+      }
 
       [:onlyif, :unless].each { |param|
         tmp = self[param]
@@ -617,11 +614,7 @@ module Puppet
           # unqualified files, but, well, that's a bit more annoying
           # to do.
           line = line[0] if line.is_a? Array
-          if line.is_a?(Puppet::Pops::Evaluator::DeferredValue)
-            self.debug("The '#{param}' parameter is deferred and cannot be autorequired")
-          else
-            reqs += line.scan(file_regex)
-          end
+          reqs += line.scan(file_regex)
         end
       }
 

data/lib/puppet/type/file/checksum.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/checksums'
 
 # Specify which checksum algorithm to use when checksumming

data/lib/puppet/type/file/checksum_value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/checksums'
 require_relative '../../../puppet/type/file/data_sync'
 

data/lib/puppet/type/file/content.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'net/http'
 require 'uri'
 require 'tempfile'

data/lib/puppet/type/file/ctime.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   Puppet::Type.type(:file).newproperty(:ctime) do
     desc %q{A read-only state to check the file ctime. On most modern \*nix-like

data/lib/puppet/type/file/data_sync.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/checksums'
 require_relative '../../../puppet/util/diff'
 require 'date'

data/lib/puppet/type/file/ensure.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Puppet
   Puppet::Type.type(:file).ensurable do

data/lib/puppet/type/file/group.rb

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

data/lib/puppet/type/file/mode.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage file modes.  This state should support different formats
 # for specification (e.g., u+rwx, or -0011), but for now only supports
 # specifying the full mode.

data/lib/puppet/type/file/mtime.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   Puppet::Type.type(:file).newproperty(:mtime) do
     desc %q{A read-only state to check the file mtime. On \*nix-like systems, this

data/lib/puppet/type/file/owner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   Puppet::Type.type(:file).newproperty(:owner) do
     include Puppet::Util::Warnings

data/lib/puppet/type/file/selcontext.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Manage SELinux context of files.
 #
 # This code actually manages three pieces of data in the context.

data/lib/puppet/type/file/source.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/file_serving/terminus_helper'
@@ -72,7 +73,7 @@ module Puppet
           file { '/etc/nfs.conf':
             source => [
               "puppet:///modules/nfs/conf.${host}",
-              "puppet:///modules/nfs/conf.${operatingsystem}",
+              "puppet:///modules/nfs/conf.${os['name']}",
               'puppet:///modules/nfs/conf'
             ]
           }

data/lib/puppet/type/file/target.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   Puppet::Type.type(:file).newproperty(:target) do
     desc "The target for creating a link.  Currently, symlinks are the

data/lib/puppet/type/file/type.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   Puppet::Type.type(:file).newproperty(:type) do
     require 'etc'

data/lib/puppet/type/file.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 require 'digest/md5'
 require 'cgi'
 require 'etc'

data/lib/puppet/type/filebucket.rb

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

data/lib/puppet/type/group.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'etc'
 require_relative '../../puppet/property/keyvalue'
 require_relative '../../puppet/parameter/boolean'

data/lib/puppet/type/notify.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Simple module for logging messages on the client-side
 

data/lib/puppet/type/package.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 # Define the different packaging systems.  Each package system is implemented
 # in a module, which then gets used to individually extend each package object.
 # This allows packages to exist on the same machine using different packaging
@@ -242,7 +243,7 @@ module Puppet
       conditionally:
 
           # In the 'openssl' class
-          $ssl = $operatingsystem ? {
+          $ssl = $os['name'] ? {
             solaris => SMCossl,
             default => openssl
           }
@@ -254,7 +255,7 @@ module Puppet
 
           ...
 
-          $ssh = $operatingsystem ? {
+          $ssh = $os['name'] ? {
             solaris => SMCossh,
             default => openssh
           }