puppet 8.3.1 → 8.4.0

data/lib/puppet/settings/config_file.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/settings/ini_file'
 
 ##
@@ -7,7 +8,6 @@ require_relative '../../puppet/settings/ini_file'
 # Parses puppet configuration files
 #
 class Puppet::Settings::ConfigFile
-
   ##
   # @param value_converter [Proc] a function that will convert strings into ruby types
   def initialize(value_converter)
@@ -78,7 +78,7 @@ class Puppet::Settings::ConfigFile
   Meta = Struct.new(:owner, :group, :mode)
   NO_META = Meta.new(nil, nil, nil)
 
-private
+  private
 
   def unique_sections_in(ini, file, allowed_section_names)
     ini.section_lines.collect do |section|
@@ -86,7 +86,7 @@ private
         error_location_str = Puppet::Util::Errors.error_location(file, section.line_number)
         message = _("Illegal section '%{name}' in config file at %{error_location}.") %
             { name: section.name, error_location: error_location_str }
-        #TRANSLATORS 'puppet.conf' is the name of the puppet configuration file and should not be translated.
+        # TRANSLATORS 'puppet.conf' is the name of the puppet configuration file and should not be translated.
         message += ' ' + _("The only valid puppet.conf sections are: [%{allowed_sections_list}].") %
             { allowed_sections_list: allowed_section_names.join(", ") }
         message += ' ' + _("Please use the directory environments feature to specify environments.")

data/lib/puppet/settings/directory_setting.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Settings::DirectorySetting < Puppet::Settings::FileSetting
   def type
     :directory

data/lib/puppet/settings/duration_setting.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A setting that represents a span of time, and evaluates to an integer
 # number of seconds after being parsed
 class Puppet::Settings::DurationSetting < Puppet::Settings::BaseSetting

data/lib/puppet/settings/enum_setting.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Settings::EnumSetting < Puppet::Settings::BaseSetting
   attr_accessor :values
 
@@ -11,7 +12,7 @@ class Puppet::Settings::EnumSetting < Puppet::Settings::BaseSetting
       value
     else
       raise Puppet::Settings::ValidationError,
-        _("Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'") % { value: value, name: @name, allowed_values: values.join("', '") }
+            _("Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'") % { value: value, name: @name, allowed_values: values.join("', '") }
     end
   end
 end

data/lib/puppet/settings/environment_conf.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 # Configuration settings for a single directory Environment.
 # @api private
 class Puppet::Settings::EnvironmentConf
-
   ENVIRONMENT_CONF_ONLY_SETTINGS = [:modulepath, :manifest, :config_version].freeze
   VALID_SETTINGS = (ENVIRONMENT_CONF_ONLY_SETTINGS + [:environment_timeout, :environment_data_provider, :static_catalogs, :rich_data]).freeze
 
@@ -58,16 +58,16 @@ class Puppet::Settings::EnvironmentConf
     disable_per_environment_manifest = Puppet.settings.value(:disable_per_environment_manifest)
 
     fallback_manifest_directory =
-    if puppet_conf_manifest.absolute?
-      puppet_conf_manifest.to_s
-    else
-      File.join(@path_to_env, puppet_conf_manifest.to_s)
-    end
+      if puppet_conf_manifest.absolute?
+        puppet_conf_manifest.to_s
+      else
+        File.join(@path_to_env, puppet_conf_manifest.to_s)
+      end
 
     if disable_per_environment_manifest
       environment_conf_manifest = absolute(raw_setting(:manifest))
       if environment_conf_manifest && fallback_manifest_directory != environment_conf_manifest
-        #TRANSLATORS 'disable_per_environment_manifest' is a setting and 'environment.conf' is a file name and should not be translated
+        # TRANSLATORS 'disable_per_environment_manifest' is a setting and 'environment.conf' is a file name and should not be translated
         message = _("The 'disable_per_environment_manifest' setting is true, but the environment located at %{path_to_env} has a manifest setting in its environment.conf of '%{environment_conf}' which does not match the default_manifest setting '%{puppet_conf}'.") %
             { path_to_env: @path_to_env, environment_conf: environment_conf_manifest, puppet_conf: puppet_conf_manifest }
         message += ' ' + _("If this environment is expecting to find modules in '%{environment_conf}', they will not be available!") % { environment_conf: environment_conf_manifest }
@@ -171,6 +171,7 @@ class Puppet::Settings::EnvironmentConf
 
   def expand_glob(path)
     return nil if path.nil?
+
     if path =~ /[*?\[\{]/
       Dir.glob(path)
     else
@@ -180,6 +181,7 @@ class Puppet::Settings::EnvironmentConf
 
   def absolute(path)
     return nil if path.nil?
+
     if path =~ /^\$/
       # Path begins with $something interpolatable
       path
@@ -221,5 +223,4 @@ class Puppet::Settings::EnvironmentConf
       @environment.config_version
     end
   end
-
 end

data/lib/puppet/settings/errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Exceptions for the settings module
 require_relative '../../puppet/error'
 
@@ -6,6 +7,7 @@ class Puppet::Settings
   class SettingsError < Puppet::Error ; end
   class ValidationError < SettingsError ; end
   class InterpolationError < SettingsError ; end
+
   class ParseError < SettingsError
     include Puppet::ExternalFileError
   end

data/lib/puppet/settings/file_or_directory_setting.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
-class Puppet::Settings::FileOrDirectorySetting < Puppet::Settings::FileSetting
-
-  def initialize(args)
-    super
-  end
 
+class Puppet::Settings::FileOrDirectorySetting < Puppet::Settings::FileSetting
   def type
     if Puppet::FileSystem.directory?(self.value) || @path_ends_with_slash
       :directory

data/lib/puppet/settings/file_setting.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A file.
 class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
   class SettingError < StandardError; end
@@ -48,7 +49,8 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
       end
     end
 
-  private
+    private
+
     def safe_to_use_settings_value?
       @settings[:mkusers] or @settings.send(@available_method)
     end
@@ -169,18 +171,6 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     resource
   end
 
-  # Make sure any provided variables look up to something.
-  def validate(value)
-    return true unless value.is_a? String
-    value.scan(/\$(\w+)/) { |name|
-      name = $1
-      unless @settings.include?(name)
-        raise ArgumentError,
-          _("Settings parameter '%{name}' is undefined") % { name: name }
-      end
-    }
-  end
-
   # @api private
   # @param option [String] Extra file operation mode information to use
   #   (defaults to read-only mode 'r')

data/lib/puppet/settings/http_extra_headers_setting.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-class Puppet::Settings::HttpExtraHeadersSetting < Puppet::Settings::BaseSetting
 
+class Puppet::Settings::HttpExtraHeadersSetting < Puppet::Settings::BaseSetting
   def type
     :http_extra_headers
   end

data/lib/puppet/settings/ini_file.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # @api private
 class Puppet::Settings::IniFile
   DEFAULT_SECTION_NAME = "main"

data/lib/puppet/settings/integer_setting.rb

@@ -1,4 +1,5 @@
 # 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,4 +1,5 @@
 # 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,7 +1,8 @@
 # frozen_string_literal: true
+
 class Puppet::Settings::PortSetting < Puppet::Settings::IntegerSetting
   def munge(value)
-    value = super
+    value = super(value)
 
     if value < 0 || value > 65535
       raise Puppet::Settings::ValidationError, _("Value '%{value}' is not a valid port number for parameter: %{name}") % { value: value.inspect, name: @name }

data/lib/puppet/settings/priority_setting.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/settings/base_setting'
 
 # A setting that represents a scheduling priority, and evaluates to an
@@ -9,17 +10,17 @@ class Puppet::Settings::PrioritySetting < Puppet::Settings::BaseSetting
       require_relative '../../puppet/util/windows/process'
       require_relative '../../puppet/ffi/windows/constants'
       {
-        :high    => Puppet::FFI::Windows::Constants::HIGH_PRIORITY_CLASS,
-        :normal  => Puppet::FFI::Windows::Constants::NORMAL_PRIORITY_CLASS,
-        :low     => Puppet::FFI::Windows::Constants::BELOW_NORMAL_PRIORITY_CLASS,
-        :idle    => Puppet::FFI::Windows::Constants::IDLE_PRIORITY_CLASS
+        :high => Puppet::FFI::Windows::Constants::HIGH_PRIORITY_CLASS,
+        :normal => Puppet::FFI::Windows::Constants::NORMAL_PRIORITY_CLASS,
+        :low => Puppet::FFI::Windows::Constants::BELOW_NORMAL_PRIORITY_CLASS,
+        :idle => Puppet::FFI::Windows::Constants::IDLE_PRIORITY_CLASS
       }
     else
       {
-        :high    => -10,
-        :normal  => 0,
-        :low     => 10,
-        :idle    => 19
+        :high => -10,
+        :normal => 0,
+        :low => 10,
+        :idle => 19
       }
     end
 

data/lib/puppet/settings/server_list_setting.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
-class Puppet::Settings::ServerListSetting < Puppet::Settings::ArraySetting
 
+class Puppet::Settings::ServerListSetting < Puppet::Settings::ArraySetting
   def type
     :server_list
   end
 
   def print(value)
     if value.is_a?(Array)
-      #turn into a string
+      # turn into a string
       value.map {|item| item.join(":") }.join(",")
     else
       value

data/lib/puppet/settings/string_setting.rb

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

data/lib/puppet/settings/symbolic_enum_setting.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Settings::SymbolicEnumSetting < Puppet::Settings::BaseSetting
   attr_accessor :values
 
@@ -12,7 +13,7 @@ class Puppet::Settings::SymbolicEnumSetting < Puppet::Settings::BaseSetting
       sym
     else
       raise Puppet::Settings::ValidationError,
-        _("Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'") % { value: value, name: @name, allowed_values: values.join("', '") }
+            _("Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'") % { value: value, name: @name, allowed_values: values.join("', '") }
     end
   end
 end

data/lib/puppet/settings/terminus_setting.rb

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

data/lib/puppet/settings/ttl_setting.rb

@@ -1,4 +1,5 @@
 # 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.
@@ -38,6 +39,7 @@ class Puppet::Settings::TTLSetting < Puppet::Settings::BaseSetting
       if value < 0
         raise Puppet::Settings::ValidationError, _("Invalid negative 'time to live' %{value} - did you mean 'unlimited'?") % { value: value.inspect }
       end
+
       value
 
     when value == 'unlimited'

data/lib/puppet/settings/value_translator.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
+
 # Convert arguments into booleans, integers, or whatever.
 class Puppet::Settings::ValueTranslator
   def [](value)
     # Handle different data types correctly
     return case value
-      when /^false$/i; false
-      when /^true$/i; true
-      when true; true
-      when false; false
-      else
-        value.gsub(/^["']|["']$/,'').sub(/\s+$/, '')
-    end
+           when /^false$/i; false
+           when /^true$/i; true
+           when true; true
+           when false; false
+           else
+             value.gsub(/^["']|["']$/,'').sub(/\s+$/, '')
+           end
   end
 end