openvox 9.0.0.pre.beta2 → 9.0.0.pre.rc2

data/lib/puppet/environments.rb

@@ -122,8 +122,6 @@ module Puppet::Environments
       env = get(name)
       if env
         Puppet::Settings::EnvironmentConf.static_for(env, Puppet[:environment_timeout], Puppet[:static_catalogs], Puppet[:rich_data])
-      else
-        nil
       end
     end
   end
@@ -221,8 +219,6 @@ module Puppet::Environments
       envdir = validated_directory(File.join(@environment_dir, name.to_s))
       if envdir
         Puppet::Settings::EnvironmentConf.load_from(envdir, @global_module_path)
-      else
-        nil
       end
     end
 
@@ -257,8 +253,6 @@ module Puppet::Environments
       envdir = Puppet::Environments::Directories.real_path(envdir).to_s
       if Puppet::FileSystem.directory?(envdir) && Puppet::Node::Environment.valid_name?(env_name)
         envdir
-      else
-        nil
       end
     end
 
@@ -325,8 +319,7 @@ module Puppet::Environments
       # Called when the environment is created.
       #
       # @param [Puppet::Node::Environment] env
-      def created(env)
-      end
+      def created(env); end
 
       # Is the environment with this name expired?
       #
@@ -339,8 +332,7 @@ module Puppet::Environments
       # The environment with this name was evicted.
       #
       # @param [Symbol] env_name The symbolic environment name
-      def evicted(env_name)
-      end
+      def evicted(env_name); end
     end
 
     def self.cache_expiration_service=(service)
@@ -536,8 +528,7 @@ module Puppet::Environments
         @guards = 0
       end
 
-      def touch
-      end
+      def touch; end
 
       def expired?(now)
         false

data/lib/puppet/face/epp.rb

@@ -558,8 +558,6 @@ Puppet::Face.define(:epp, '0.0.1') do
       template_file
     elsif Puppet::FileSystem.exist?(file)
       file
-    else
-      nil
     end
   end
 end

data/lib/puppet/file_bucket/dipper.rb

@@ -153,8 +153,6 @@ class Puppet::FileBucket::Dipper
         return nil
       end
       newsum
-    else
-      nil
     end
   end
 

data/lib/puppet/file_serving/content.rb

@@ -25,8 +25,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base
 
   # This is no longer used, but is still called by the file server implementations when interacting
   # with their model abstraction.
-  def collect(source_permissions = nil)
-  end
+  def collect(source_permissions = nil); end
 
   # Read the content of our file in.
   def content

data/lib/puppet/file_serving/mount.rb

@@ -36,6 +36,5 @@ class Puppet::FileServing::Mount
   end
 
   # A noop.
-  def validate
-  end
+  def validate; end
 end

data/lib/puppet/functions/tree_each.rb

@@ -30,7 +30,7 @@
 # `tree_each($data) |$value| { <PUPPET CODE BLOCK> }`
 #
 # The parameter `$path` is always given as an `Array` containing the path that when applied to
-# the tree as `$data.dig(*$path) yields the `$value`.
+# the tree as `$data.dig(*$path)` yields the `$value`.
 # The `$value` is the value at that path.
 #
 # For `Array` values, the path will contain `Integer` entries with the array index,

data/lib/puppet/generate/type.rb

@@ -124,7 +124,7 @@ module Puppet
         environment.modules.each do |mod|
           directory = File.join(Puppet::Util::Autoload.cleanpath(mod.plugin_directory), 'puppet', 'type')
           unless Puppet::FileSystem.exist?(directory)
-            Puppet.debug "Skipping '#{mod.name}' module because it contains no custom types."
+            Puppet.debug "Skipping '#{mod.name}' module because there is no readable puppet/type/ directory under: #{directory}"
             next
           end
 

data/lib/puppet/gettext/config.rb

@@ -196,8 +196,6 @@ module Puppet::GettextConfig
       WINDOWS_PATH
     elsif !Puppet::Util::Platform.windows? && Puppet::FileSystem.exist?(POSIX_PATH)
       POSIX_PATH
-    else
-      nil
     end
   end
 

data/lib/puppet/graph/simple_graph.rb

@@ -433,8 +433,6 @@ class Puppet::Graph::SimpleGraph
     elsif dependents(f).include?(t)
       m = (dependents(f) & direct_dependencies_of(t)).first
       path_between(f, m) + path_between(m, t)
-    else
-      nil
     end
   end
 

data/lib/puppet/http/service.rb

@@ -32,23 +32,10 @@ class Puppet::HTTP::Service
   #
   # @api private
   def self.create_service(client, session, name, server = nil, port = nil)
-    # this is the entry point for creating all services, check and issue warning here.
-    unless Puppet.settings.set_by_config? :server
-      if Puppet.features.root?
-        Puppet.deprecation_warning('OpenVox will not default to `server=puppet` as of version 9.0. Please update your configuration appropriately.')
-      else
-        Puppet.deprecation_warning('OpenVox no longer defaults to `server=puppet` when running as a non-privileged user. (Did you mean to run as root?)')
-
-        case name
-        when :ca
-          raise ArgumentError, 'Neither `server` nor `ca_server` is specified.' unless Puppet.settings.set_by_config? :ca_server
-        when :report
-          raise ArgumentError, 'Neither `server` nor `report_server` is specified.' unless Puppet.settings.set_by_config? :report_server
-        when :fileserver, :puppet, :puppetserver
-          raise ArgumentError, 'Required setting `server` is not specified.'
-        end
-      end
-    end
+    # Resolvers that already know which server to use (SRV records,
+    # server_list, or an explicit URL) pass it in. Only fall back on the
+    # `server` setting, and complain if it is missing, when they don't.
+    check_server_setting(name) if server.nil?
 
     case name
     when :ca
@@ -66,6 +53,48 @@ class Puppet::HTTP::Service
     end
   end
 
+  # Verify that the setting a service falls back on when no explicit server is
+  # given has been configured. OpenVox no longer defaults `server` to `puppet`.
+  #
+  # @param [Symbol] name the type of service being created
+  #
+  # @raise [ArgumentError] if the service cannot determine which server to use
+  #
+  # @api private
+  def self.check_server_setting(name)
+    return if Puppet.settings.set_by_config? :server
+
+    # These services fall back on their own setting before `server`. It has to
+    # resolve to a host: `ca_server = $server` without `server` is set but empty.
+    case name
+    when :ca
+      return if Puppet.settings.set_by_config?(:ca_server) && !Puppet[:ca_server].empty?
+    when :report
+      return if Puppet.settings.set_by_config?(:report_server) && !Puppet[:report_server].empty?
+    end
+
+    if Puppet.features.root?
+      error_message = <<~MSG
+        OpenVox does not default to `server=puppet` as of version 9.0. Please update your configuration appropriately by providing a specific server of your choice.
+
+        You can update the server setting in puppet.conf by running a command similar to:
+          puppet config --section main set server YOUR_SERVER_NAME
+      MSG
+      raise ArgumentError, error_message
+    end
+
+    Puppet.deprecation_warning('OpenVox no longer defaults to `server=puppet` when running as a non-privileged user. (Did you mean to run as root?)')
+
+    case name
+    when :ca
+      raise ArgumentError, 'Neither `server` nor `ca_server` is specified.'
+    when :report
+      raise ArgumentError, 'Neither `server` nor `report_server` is specified.'
+    when :fileserver, :puppet, :puppetserver
+      raise ArgumentError, 'Required setting `server` is not specified.'
+    end
+  end
+
   # Check if the service named is included in the list of available services.
   #
   # @param [Symbol] name

data/lib/puppet/indirector/facts/facter.rb

@@ -62,21 +62,22 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
       end
     end.flatten + Puppet[:factpath].split(File::PATH_SEPARATOR)
 
-    dirs = dirs.select do |dir|
-      next false unless FileTest.directory?(dir)
-
-      # Even through we no longer directly load facts in the terminus,
-      # print out each .rb in the facts directory as module
-      # developers may find that information useful for debugging purposes
-      if Puppet::Util::Log.sendlevel?(:info)
-        Puppet.info _("Loading facts")
-        Dir.glob("#{dir}/*.rb").each do |file|
-          Puppet.debug { "Loading facts from #{file}" }
+    dirs.select! { |dir| FileTest.directory?(dir) }
+
+    # Even though we no longer directly load facts in the terminus,
+    # print out each .rb in the facts directory as module
+    # developers may find that information useful for debugging purposes
+    unless dirs.empty?
+      Puppet.info _("Loading facts")
+      if Puppet::Util::Log.sendlevel?(:debug)
+        dirs.each do |dir|
+          Dir.glob("#{dir}/*.rb").each do |file|
+            Puppet.debug { "Loading facts from #{file}" }
+          end
         end
       end
-
-      true
     end
+
     dirs << request.options[:custom_dir] if request.options[:custom_dir]
     Puppet.runtime[:facter].search(*dirs)
   end

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -37,8 +37,6 @@ module Puppet::FileBucketFile
           Puppet.info _("FileBucket read %{checksum}") % { checksum: checksum }
           model.new(Puppet::FileSystem.binread(contents_file))
         end
-      else
-        nil
       end
     end
 

data/lib/puppet/interface/action.rb

@@ -49,7 +49,7 @@ class Puppet::Interface::Action
 
   # The name of this action
   # @return [Symbol]
-  attr_reader   :name
+  attr_reader :name
 
   # The face this action is attached to
   # @return [Puppet::Interface]

data/lib/puppet/module.rb

@@ -91,8 +91,7 @@ class Puppet::Module
   end
 
   # @deprecated The puppetversion module metadata field is no longer used.
-  def puppetversion=(something)
-  end
+  def puppetversion=(something); end
 
   # @deprecated The puppetversion module metadata field is no longer used.
   def validate_puppet_version
@@ -172,8 +171,6 @@ class Puppet::Module
 
     if Puppet::FileSystem.exist?(full_path)
       full_path
-    else
-      nil
     end
   end
 
@@ -205,8 +202,6 @@ class Puppet::Module
 
     if Puppet::FileSystem.exist?(full_path)
       full_path
-    else
-      nil
     end
   end
 

data/lib/puppet/node.rb

@@ -155,7 +155,11 @@ class Puppet::Node
   def merge(params)
     params.each do |name, value|
       if @parameters.include?(name)
-        Puppet::Util::Warnings.warnonce(_("The node parameter '%{param_name}' for node '%{node_name}' was already set to '%{value}'. It could not be set to '%{desired_value}'") % { param_name: name, node_name: @name, value: @parameters[name], desired_value: value })
+        if @parameters[name] == value
+          Puppet::Util::Warnings.notice_once(_("The node parameter '%{param_name}' for node '%{node_name}' was already set to '%{value}'. It could not be set to '%{desired_value}'") % { param_name: name, node_name: @name, value: @parameters[name], desired_value: value })
+        else
+          Puppet::Util::Warnings.warnonce(_("The node parameter '%{param_name}' for node '%{node_name}' was already set to '%{value}'. It could not be set to '%{desired_value}'") % { param_name: name, node_name: @name, value: @parameters[name], desired_value: value })
+        end
       else
         @parameters[name] = value
       end

data/lib/puppet/parser/ast.rb

@@ -18,8 +18,7 @@ class Puppet::Parser::AST
 
   # Evaluate the current object.  Just a stub method, since the subclass
   # should override this method.
-  def evaluate(scope)
-  end
+  def evaluate(scope); end
 
   # The version of the evaluate method that should be called, because it
   # correctly handles errors.  It is critical to use this method because

data/lib/puppet/parser/compiler/catalog_validator.rb

@@ -25,8 +25,7 @@ class Puppet::Parser::Compiler
     end
 
     # Validate some aspect of the catalog and raise a `CatalogValidationError` on failure
-    def validate
-    end
+    def validate; end
   end
 
   class CatalogValidationError < Puppet::Error

data/lib/puppet/parser/files.rb

@@ -76,8 +76,6 @@ module Puppet::Parser::Files
 
       if file && mod
         yield(mod, file)
-      else
-        nil
       end
     end
   end

data/lib/puppet/parser/resource.rb

@@ -38,8 +38,6 @@ class Puppet::Parser::Resource < Puppet::Resource
 
     if @parameters.has_key?(param)
       @parameters[param].value
-    else
-      nil
     end
   end
 
@@ -90,7 +88,6 @@ class Puppet::Parser::Resource < Puppet::Resource
   def exported=(value)
     if value
       @virtual = true
-    else
     end
     @exported = value
   end
@@ -226,7 +223,6 @@ class Puppet::Parser::Resource < Puppet::Resource
         if value.is_a?(Array)
           value = value.flatten.reject { |v| v.nil? || :undef == v }
         end
-      else
       end
       result[param.name] = value
     end)

data/lib/puppet/parser/scope.rb

@@ -336,8 +336,6 @@ class Puppet::Parser::Scope
       value.to_i(8)
     when /^-?\d+$/
       value.to_i
-    else
-      nil
     end
   end
 
@@ -566,8 +564,6 @@ class Puppet::Parser::Scope
   def inherited_scope
     if resource && resource.type == TYPENAME_CLASS && !resource.resource_type.parent.nil?
       qualified_scope(resource.resource_type.parent)
-    else
-      nil
     end
   end
 
@@ -680,7 +676,7 @@ class Puppet::Parser::Scope
         target.merge!(inherited.to_hash(recursive))
       end
     else
-      target = Hash.new
+      target = {}
     end
 
     # add all local scopes

data/lib/puppet/pops/adaptable.rb

@@ -142,8 +142,6 @@ module Adaptable
       attr_name = self_attr_name
       if o.instance_variable_defined?(attr_name)
         o.send(:remove_instance_variable, attr_name)
-      else
-        nil
       end
     end
 

data/lib/puppet/pops/loader/base_loader.rb

@@ -56,8 +56,6 @@ class BaseLoader < Loader
         @named_values[typed_name]
       elsif parent
         parent.loaded_entry(typed_name, check_dependencies)
-      else
-        nil
       end
     end
   end

data/lib/puppet/pops/loader/loader.rb

@@ -116,8 +116,6 @@ class Loader
     found = get_entry(typed_name)
     if found
       found.value
-    else
-      nil
     end
   end
 

data/lib/puppet/pops/loader/runtime3_type_loader.rb

@@ -62,8 +62,6 @@ class Runtime3TypeLoader < BaseLoader
       te
     when :resource_type_pp
       @resource_3x_loader.nil? ? nil : find_impl(typed_name)
-    else
-      nil
     end
   end
 

data/lib/puppet/pops/loaders.rb

@@ -401,8 +401,6 @@ class Loaders
       # Create pcore resource type loader, if applicable
       pcore_resource_type_loader = if load_from_pcore && env_path
                                      Loader::ModuleLoaders.pcore_resource_type_loader_from(parent_loader, self, env_path)
-                                   else
-                                     nil
                                    end
       @runtime3_type_loader = add_loader_by_name(Loader::Runtime3TypeLoader.new(parent_loader, self, environment, pcore_resource_type_loader))
 

data/lib/puppet/pops/lookup/hiera_config.rb

@@ -681,8 +681,6 @@ class HieraConfigV5 < HieraConfig
                       expand_uris([he[location_key]], lookup_invocation)
                     when KEY_MAPPED_PATHS
                       expand_mapped_paths(entry_datadir, he[location_key], lookup_invocation)
-                    else
-                      nil
                     end
       end
       next if @config_path.nil? && !locations.nil? && locations.empty? # Default config and no existing paths found

data/lib/puppet/pops/lookup/interpolation.rb

@@ -103,8 +103,6 @@ module Interpolation
               if default_key_exists
                 lookup_invocation.report_found_in_defaults(root_key,
                                                            lookup_invocation.default_values[root_key])
-              else
-                nil
               end
             else
               lookup_invocation.report_found(root_key, val)

data/lib/puppet/pops/lookup/key_recorder.rb

@@ -4,8 +4,7 @@
 # @api private
 #
 class Puppet::Pops::Lookup::KeyRecorder
-  def initialize
-  end
+  def initialize; end
 
   # rubocop:disable Naming/MemoizedInstanceVariableName
   def self.singleton
@@ -16,6 +15,5 @@ class Puppet::Pops::Lookup::KeyRecorder
   # Records a key
   # (This implementation does nothing)
   #
-  def record(key)
-  end
+  def record(key); end
 end

data/lib/puppet/pops/lookup/lookup_key.rb

@@ -47,8 +47,6 @@ class LookupKey
           EMPTY_HASH
         when Array
           EMPTY_ARRAY
-        else
-          nil
         end
       else
         undig(pruned)

data/lib/puppet/pops/merge_strategy.rb

@@ -30,7 +30,7 @@ module Puppet::Pops
           raise ArgumentError, _("The hash given as 'merge' must contain the name of a strategy in string form for the key 'strategy'")
         end
 
-        merge_options  = merge.size == 1 ? EMPTY_HASH : merge
+        merge_options = merge.size == 1 ? EMPTY_HASH : merge
       else
         merge_strategy = merge
         merge_options = EMPTY_HASH

data/lib/puppet/pops/migration/migration_checker.rb

@@ -4,8 +4,7 @@
 # @api private
 #
 class Puppet::Pops::Migration::MigrationChecker
-  def initialize
-  end
+  def initialize; end
 
   # rubocop:disable Naming/MemoizedInstanceVariableName
   def self.singleton

data/lib/puppet/pops/parser/lexer2.rb

@@ -55,6 +55,7 @@ class Lexer2
   TOKEN_LESSEQUAL    = [:LESSEQUAL,    '<=',  2].freeze
   TOKEN_LESSTHAN     = [:LESSTHAN,     '<',   1].freeze
 
+  # rubocop:disable Layout/ExtraSpacing
   TOKEN_FARROW       = [:FARROW,       '=>',  2].freeze
   TOKEN_PARROW       = [:PARROW,       '+>',  2].freeze
 
@@ -106,11 +107,9 @@ class Lexer2
   TOKEN_HEREDOC        = [:HEREDOC,     nil,  0].freeze
 
   # EPP_START is currently a marker token, may later get syntax
-  # rubocop:disable Layout/ExtraSpacing
   TOKEN_EPPSTART    = [:EPP_START,      nil,  0].freeze
   TOKEN_EPPEND      = [:EPP_END,       '%>',  2].freeze
   TOKEN_EPPEND_TRIM = [:EPP_END_TRIM, '-%>',  3].freeze
-  # rubocop:enable Layout/ExtraSpacing
 
   # This is used for unrecognized tokens, will always be a single character. This particular instance
   # is not used, but is kept here for documentation purposes.
@@ -141,6 +140,7 @@ class Lexer2
     'attr' => [:ATTR,     'attr',     4],
     'private' => [:PRIVATE, 'private', 7],
   }
+  # rubocop:enable Layout/ExtraSpacing
 
   KEYWORDS.each { |_k, v| v[1].freeze; v.freeze }
   KEYWORDS.freeze

data/lib/puppet/pops/parser/lexer_support.rb

@@ -132,8 +132,6 @@ module LexerSupport
         @locator
       when :offset
         @offset
-      else
-        nil
       end
     end
 

data/lib/puppet/pops/parser/locatable.rb

@@ -3,12 +3,10 @@
 # Interface for something that is "locatable" (holds offset and length).
 class Puppet::Pops::Parser::Locatable
   # The offset in the locator's content
-  def offset
-  end
+  def offset; end
 
   # The length in the locator from the given offset
-  def length
-  end
+  def length; end
 
   # This class is useful for testing
   class Fixed < Puppet::Pops::Parser::Locatable

data/lib/puppet/pops/parser/locator.rb

@@ -17,42 +17,34 @@ class Locator
   end
 
   # Returns the file name associated with the string content
-  def file
-  end
+  def file; end
 
   # Returns the string content
-  def string
-  end
+  def string; end
 
   def to_s
     "Locator for file #{file}"
   end
 
   # Returns the position on line (first position on a line is 1)
-  def pos_on_line(offset)
-  end
+  def pos_on_line(offset); end
 
   # Returns the line number (first line is 1) for the given offset
-  def line_for_offset(offset)
-  end
+  def line_for_offset(offset); end
 
   # Returns the offset on line (first offset on a line is 0).
   #
-  def offset_on_line(offset)
-  end
+  def offset_on_line(offset); end
 
   # Returns the character offset for a given reported offset
-  def char_offset(byte_offset)
-  end
+  def char_offset(byte_offset); end
 
   # Returns the length measured in number of characters from the given start and end byte offset
-  def char_length(offset, end_offset)
-  end
+  def char_length(offset, end_offset); end
 
   # Extracts the text from offset with given length (measured in what the locator uses for offset)
   # @returns String - the extracted text
-  def extract_text(offset, length)
-  end
+  def extract_text(offset, length); end
 
   def extract_tree_text(ast)
     first = ast.offset
@@ -71,8 +63,7 @@ class Locator
   # Returns the line index - an array of line offsets for the start position of each line, starting at 0 for
   # the first line.
   #
-  def line_index
-  end
+  def line_index; end
 
   # Common byte based impl that works for all rubies (stringscanner is byte based
   def self.compute_line_index(string)

data/lib/puppet/pops/puppet_stack.rb

@@ -29,7 +29,7 @@ module Puppet
     # as well as a nil line number are supported. Such stack frames
     # will be represented with the text `unknown` and `0´ respectively.
     module PuppetStack
-      @stack = Puppet::ThreadLocal.new { Array.new }
+      @stack = Puppet::ThreadLocal.new { [] }
 
       def self.stack(file, line, obj, message, args, &block)
         file = 'unknown' if file.nil? || file == ''

data/lib/puppet/pops/time/timespan.rb

@@ -42,8 +42,6 @@ module Time
         to_int <=> o
       when Float
         to_f <=> o
-      else
-        nil
       end
     end
 

data/lib/puppet/pops/types/class_loader.rb

@@ -69,9 +69,7 @@ class ClassLoader
     when PFloatType    ; Float
     when PUndefType    ; NilClass
     when PCallableType ; Proc
-    # rubocop:enable Layout/SpaceBeforeSemicolon
-    else
-      nil
+      # rubocop:enable Layout/SpaceBeforeSemicolon
     end
   end
   private_class_method :provide_from_type