puppet 8.4.0-universal-darwin → 8.5.0-universal-darwin

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

@@ -48,8 +48,9 @@ class Puppet::Pops::Loader::RubyLegacyFunctionInstantiator
       end
 
       unless func_info[:name] == "function_#{typed_name.name()}"
-        raise ArgumentError, _("The code loaded from %{source_ref} produced mis-matched name, expected 'function_%{type_name}', got '%{created_name}'") % { 
-          source_ref: source_ref, type_name: typed_name.name, created_name: func_info[:name] }
+        raise ArgumentError, _("The code loaded from %{source_ref} produced mis-matched name, expected 'function_%{type_name}', got '%{created_name}'") % {
+          source_ref: source_ref, type_name: typed_name.name, created_name: func_info[:name]
+        }
       end
     end
 
@@ -76,7 +77,7 @@ class Puppet::Pops::Loader::RubyLegacyFunctionInstantiator
     ripped = Ripper.sexp(code_string)
     return false if ripped.nil? # Let the next real parse crash and tell where and what is wrong
 
-    ripped.each {|x| walk(x, source_ref, result) }
+    ripped.each { |x| walk(x, source_ref, result) }
     true
   end
   private_class_method :assert_code
@@ -101,12 +102,12 @@ class Puppet::Pops::Loader::RubyLegacyFunctionInstantiator
         url: "https://puppet.com/docs/puppet/latest/functions_refactor_legacy.html"
       }
     end
-    x.each {|v| walk(v, source_ref, result) }
+    x.each { |v| walk(v, source_ref, result) }
   end
   private_class_method :walk
 
   def self.find_identity(rast)
-    rast.find{|x| x.is_a?(Array) && x[0] == :@ident }
+    rast.find { |x| x.is_a?(Array) && x[0] == :@ident }
   end
   private_class_method :find_identity
 
@@ -119,7 +120,7 @@ class Puppet::Pops::Loader::RubyLegacyFunctionInstantiator
   # Returns an Array; a tuple with method name and line number or "<unknown>" if either is missing, or format is not the expected
   #
   def self.extract_name_line(x)
-    (x.is_a?(Array) ? [ x[1], x[2].is_a?(Array) ? x[2][1] : nil] : [nil, nil]).map {|v| v.nil? ? UNKNOWN : v }
+    (x.is_a?(Array) ? [x[1], x[2].is_a?(Array) ? x[2][1] : nil] : [nil, nil]).map { |v| v.nil? ? UNKNOWN : v }
   end
   private_class_method :extract_name_line
 end

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

@@ -21,7 +21,7 @@ class Runtime3TypeLoader < BaseLoader
     parent.discover(type, error_collector, name_authority, &block)
   end
 
-  def to_s()
+  def to_s
     "(Runtime3TypeLoader '#{loader_name()}')"
   end
 

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

@@ -14,7 +14,7 @@ class Puppet::Pops::Loader::SimpleEnvironmentLoader < Puppet::Pops::Loader::Base
     nil
   end
 
-  def to_s()
+  def to_s
     "(SimpleEnvironmentLoader '#{loader_name}')"
   end
 end

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

@@ -73,7 +73,7 @@ class StaticLoader < Loader
     nil # at top of the hierarchy
   end
 
-  def to_s()
+  def to_s
     "(StaticLoader)"
   end
 
@@ -108,7 +108,7 @@ class StaticLoader < Loader
     end
   end
 
-  def create_resource_type_references()
+  def create_resource_type_references
     # These needs to be done quickly and we do not want to scan the file system for these
     # We are also not interested in their definition only that they exist.
     # These types are in all environments.

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

@@ -36,8 +36,8 @@ class TaskInstantiator
   end
 
   def self.convert_types(args)
-    args.each_with_object({}) do |(k, v), hsh|
-      hsh[k] = v['type'].nil? ? Types::TypeFactory.data : Types::TypeParser.singleton.parse(v['type'])
+    args.transform_values do |v|
+      v['type'].nil? ? Types::TypeFactory.data : Types::TypeParser.singleton.parse(v['type'])
     end if args
   end
   private_class_method :convert_types

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

@@ -53,7 +53,8 @@ class TypeDefinitionInstantiator
     loader.set_entry(
       typed_name,
       type,
-      type_definition.locator.to_uri(type_definition))
+      type_definition.locator.to_uri(type_definition)
+    )
     type
   end
 

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

@@ -21,7 +21,7 @@ class TypedName
     parts = name.to_s.split(DOUBLE_COLON)
     if parts[0].empty?
       parts.shift
-      @name = name[2..-1]
+      @name = name[2..]
     else
       @name = name
     end

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

@@ -3,7 +3,7 @@
 module Puppet::Pops::Loader::UriHelper
   # Raises an exception if specified gem can not be located
   #
-  def path_for_uri(uri, subdir='lib')
+  def path_for_uri(uri, subdir = 'lib')
     case uri.scheme
     when "gem"
       begin

data/lib/puppet/pops/loaders.rb

@@ -365,11 +365,11 @@ class Loaders
     nil
   end
 
-  def create_puppet_system_loader()
+  def create_puppet_system_loader
     Loader::ModuleLoaders.system_loader_from(static_loader, self)
   end
 
-  def create_puppet_cache_loader()
+  def create_puppet_cache_loader
     Loader::ModuleLoaders.cached_loader_from(puppet_system_loader, self)
   end
 
@@ -518,7 +518,7 @@ class Loaders
     end
 
     def all_module_loaders
-      @all_module_loaders ||= @index.values.map {|md| md.public_loader }
+      @all_module_loaders ||= @index.values.map { |md| md.public_loader }
     end
 
     def resolve(module_data)

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

@@ -134,31 +134,38 @@ class Context
   def self.register_ptype(loader, ir)
     tf = Types::TypeFactory
     key_type = tf.optional(tf.scalar)
-    @type = Pcore::create_object_type(loader, ir, self, 'Puppet::LookupContext', 'Any',
-                                      {
-                                        'environment_name' => {
-                                          Types::KEY_TYPE => Types::PStringType::NON_EMPTY,
-                                          Types::KEY_KIND => Types::PObjectType::ATTRIBUTE_KIND_DERIVED
-                                        },
-                                        'module_name' => {
-                                          Types::KEY_TYPE => tf.variant(Types::PStringType::NON_EMPTY, Types::PUndefType::DEFAULT)
-                                        }
-                                      },
-                                      {
-                                        'not_found' => tf.callable([0, 0], tf.undef),
-                                        'explain' => tf.callable([0, 0, tf.callable(0,0)], tf.undef),
-                                        'interpolate' => tf.callable(1, 1),
-                                        'cache' => tf.callable([key_type, tf.any], tf.any),
-                                        'cache_all' => tf.callable([tf.hash_kv(key_type, tf.any)], tf.undef),
-                                        'cache_has_key' => tf.callable([key_type], tf.boolean),
-                                        'cached_value' => tf.callable([key_type], tf.any),
-                                        'cached_entries' => tf.variant(
-                                          tf.callable([0, 0, tf.callable(1,1)], tf.undef),
-                                          tf.callable([0, 0, tf.callable(2,2)], tf.undef),
-                                          tf.callable([0, 0], tf.iterable(tf.tuple([key_type, tf.any])))),
-                                        'cached_file_data' => tf.callable(tf.string, tf.optional(tf.callable([1, 1])))
-                                      }
-    ).resolve(loader)
+    @type =
+      Pcore.create_object_type(
+        loader,
+        ir,
+        self,
+        'Puppet::LookupContext',
+        'Any',
+        {
+          'environment_name' => {
+            Types::KEY_TYPE => Types::PStringType::NON_EMPTY,
+            Types::KEY_KIND => Types::PObjectType::ATTRIBUTE_KIND_DERIVED
+          },
+          'module_name' => {
+            Types::KEY_TYPE => tf.variant(Types::PStringType::NON_EMPTY, Types::PUndefType::DEFAULT)
+          }
+        },
+        {
+          'not_found' => tf.callable([0, 0], tf.undef),
+          'explain' => tf.callable([0, 0, tf.callable(0, 0)], tf.undef),
+          'interpolate' => tf.callable(1, 1),
+          'cache' => tf.callable([key_type, tf.any], tf.any),
+          'cache_all' => tf.callable([tf.hash_kv(key_type, tf.any)], tf.undef),
+          'cache_has_key' => tf.callable([key_type], tf.boolean),
+          'cached_value' => tf.callable([key_type], tf.any),
+          'cached_entries' => tf.variant(
+            tf.callable([0, 0, tf.callable(1, 1)], tf.undef),
+            tf.callable([0, 0, tf.callable(2, 2)], tf.undef),
+            tf.callable([0, 0], tf.iterable(tf.tuple([key_type, tf.any])))
+          ),
+          'cached_file_data' => tf.callable(tf.string, tf.optional(tf.callable([1, 1])))
+        }
+      ).resolve(loader)
   end
 
   # Mainly for test purposes. Makes it possible to create a {Context} in Puppet code provided that a current {Invocation} exists.

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

@@ -73,7 +73,7 @@ class V3BackendFunctionProvider < DataDigFunctionProvider
     # A merge_behavior retrieved from hiera.yaml must not be converted here. Instead, passing the symbol :hash
     # tells the V3 backend to pick it up from the config.
     resolution_type = lookup_invocation.hiera_v3_merge_behavior? ? :hash : convert_merge(merge)
-    @backend.lookup(key.to_s, lookup_invocation.scope, lookup_invocation.hiera_v3_location_overrides, resolution_type, {:recurse_guard => nil})
+    @backend.lookup(key.to_s, lookup_invocation.scope, lookup_invocation.hiera_v3_location_overrides, resolution_type, { :recurse_guard => nil })
   end
 
   def full_name
@@ -132,7 +132,7 @@ class V3BackendFunctionProvider < DataDigFunctionProvider
       when 'deep', 'unconstrained_deep', 'reverse_deep'
         result = { :behavior => strategy == 'reverse_deep' ? :deep : :deeper }
         # Remaining entries must have symbolic keys
-        merge.each_pair { |k,v| result[k.to_sym] = v unless k == 'strategy' }
+        merge.each_pair { |k, v| result[k.to_sym] = v unless k == 'strategy' }
         result
       else
         convert_merge(strategy)

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

@@ -15,7 +15,7 @@ module Lookup
 
     def to_hash
       hash = {}
-      hash[:branches] = @branches.map {|b| b.to_hash} unless @branches.nil? || @branches.empty?
+      hash[:branches] = @branches.map { |b| b.to_hash } unless @branches.nil? || @branches.empty?
       hash
     end
 
@@ -170,7 +170,7 @@ module Lookup
     def dump_on(io, indent, first_indent)
       io << first_indent << 'Searching for "' << key << "\"\n"
       indent = increase_indent(indent)
-      branches.each {|b| b.dump_on(io, indent, indent)}
+      branches.each { |b| b.dump_on(io, indent, indent) }
     end
   end
 
@@ -246,7 +246,7 @@ module Lookup
     def dump_on(io, indent, first_indent)
       io << first_indent << 'Interpolation on "' << @expression << "\"\n"
       indent = increase_indent(indent)
-      branches.each {|b| b.dump_on(io, indent, indent)}
+      branches.each { |b| b.dump_on(io, indent, indent) }
     end
 
     def to_hash
@@ -280,7 +280,7 @@ module Lookup
         dump_value(io, indent, options)
         io << "\n"
       end
-      branches.each {|b| b.dump_on(io, indent, indent)}
+      branches.each { |b| b.dump_on(io, indent, indent) }
       if @event == :result
         io << indent << 'Merged result: '
         dump_value(io, indent, @value)
@@ -321,7 +321,7 @@ module Lookup
     def dump_on(io, indent, first_indent)
       io << first_indent << 'Data Binding "' << @binding_terminus.to_s << "\"\n"
       indent = increase_indent(indent)
-      branches.each {|b| b.dump_on(io, indent, indent)}
+      branches.each { |b| b.dump_on(io, indent, indent) }
       dump_outcome(io, indent)
     end
 
@@ -349,7 +349,7 @@ module Lookup
         path = @provider.config_path
         io << indent << 'Using configuration "' << path.to_s << "\"\n" unless path.nil?
       end
-      branches.each {|b| b.dump_on(io, indent, indent)}
+      branches.each { |b| b.dump_on(io, indent, indent) }
       dump_outcome(io, indent)
     end
 
@@ -381,7 +381,7 @@ module Lookup
       io << indent << type_name << ' "' << location.to_s << "\"\n"
       indent = increase_indent(indent)
       io << indent << 'Original ' << type_name.downcase << ': "' << @location.original_location << "\"\n"
-      branches.each {|b| b.dump_on(io, indent, indent)}
+      branches.each { |b| b.dump_on(io, indent, indent) }
       io << indent << type_name << " not found\n" if @event == :location_not_found
       dump_outcome(io, indent)
     end
@@ -413,7 +413,7 @@ module Lookup
     def dump_on(io, indent, first_indent)
       io << indent << 'Sub key: "' << @sub_key.join('.') << "\"\n"
       indent = increase_indent(indent)
-      branches.each {|b| b.dump_on(io, indent, indent)}
+      branches.each { |b| b.dump_on(io, indent, indent) }
       dump_outcome(io, indent)
     end
 
@@ -446,7 +446,7 @@ module Lookup
     def dump_on(io, indent, first_indent)
       io << indent << @name << "\n"
       indent = increase_indent(indent)
-      branches.each {|b| b.dump_on(io, indent, indent)}
+      branches.each { |b| b.dump_on(io, indent, indent) }
       dump_outcome(io, indent)
     end
 

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

@@ -13,7 +13,7 @@ class GlobalDataProvider < ConfiguredDataProvider
 
   def unchecked_key_lookup(key, lookup_invocation, merge)
     config = config(lookup_invocation)
-    if(config.version == 3)
+    if (config.version == 3)
       # Hiera version 3 needs access to special scope variables
       scope = lookup_invocation.scope
       unless scope.is_a?(Hiera::Scope)
@@ -21,7 +21,7 @@ class GlobalDataProvider < ConfiguredDataProvider
           # Confine to global scope unless an environment data provider has been defined (same as for hiera_xxx functions)
           adapter = lookup_invocation.lookup_adapter
           hiera_invocation.set_global_only unless adapter.global_only? || adapter.has_environment_data_provider?(lookup_invocation)
-          hiera_invocation.lookup(key, lookup_invocation.module_name) { unchecked_key_lookup(key , hiera_invocation, merge) }
+          hiera_invocation.lookup(key, lookup_invocation.module_name) { unchecked_key_lookup(key, hiera_invocation, merge) }
         end
       end
 

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

@@ -96,8 +96,7 @@ class HieraConfig
                           }
                         ]
                       }.freeze,
-                      owner
-    )
+                      owner)
   end
 
   def self.config_exist?(config_root)
@@ -106,10 +105,10 @@ class HieraConfig
   end
 
   def self.symkeys_to_string(struct)
-    case(struct)
+    case (struct)
     when Hash
       map = {}
-      struct.each_pair {|k,v| map[ k.is_a?(Symbol) ? k.to_s : k] = symkeys_to_string(v) }
+      struct.each_pair { |k, v| map[k.is_a?(Symbol) ? k.to_s : k] = symkeys_to_string(v) }
       map
     when Array
       struct.map { |v| symkeys_to_string(v) }
@@ -163,7 +162,8 @@ class HieraConfig
     else
       issue = Issues::HIERA_UNSUPPORTED_VERSION
       raise Puppet::DataBinding::LookupError.new(
-        issue.format(:version => version), config_path, nil, nil, nil, issue.issue_code)
+        issue.format(:version => version), config_path, nil, nil, nil, issue.issue_code
+      )
     end
   end
 
@@ -184,7 +184,8 @@ class HieraConfig
 
   def fail(issue, args = EMPTY_HASH, line = nil)
     raise Puppet::DataBinding::LookupError.new(
-      issue.format(args.merge(:label => self)), @config_path, line, nil, nil, issue.issue_code)
+      issue.format(args.merge(:label => self)), @config_path, line, nil, nil, issue.issue_code
+    )
   end
 
   def has_default_hierarchy?
@@ -231,13 +232,14 @@ class HieraConfig
       quote = nil
       stripped = ''.dup
       line.each_codepoint do |cp|
-        if cp == 0x22 || cp == 0x27 # double or single quote
+        case cp
+        when 0x22, 0x27 # double or single quote
           if quote == cp
             quote = nil
           elsif quote.nil?
             quote = cp
           end
-        elsif cp == 0x23 # unquoted hash mark
+        when 0x23 # unquoted hash mark
           break
         end
         stripped << cp
@@ -296,12 +298,10 @@ class HieraConfig
           hiera3_config[key] = val
         end
       end
+    elsif hiera3_config.include?(KEY_LOGGER)
+      Hiera.logger = hiera3_config[KEY_LOGGER].to_s
     else
-      if hiera3_config.include?(KEY_LOGGER)
-        Hiera.logger = hiera3_config[KEY_LOGGER].to_s
-      else
-        Hiera.logger = 'puppet'
-      end
+      Hiera.logger = 'puppet'
     end
 
     unless Hiera::Interpolate.const_defined?(:PATCHED_BY_HIERA_5)
@@ -360,7 +360,7 @@ class HieraConfigV3 < HieraConfig
 
     # This is a hash, not a type. Contained backends are added prior to validation
     @@CONFIG_TYPE = {
-      tf.optional(KEY_VERSION) => tf.range(3,3),
+      tf.optional(KEY_VERSION) => tf.range(3, 3),
       tf.optional(KEY_BACKENDS) => tf.variant(nes_t, tf.array_of(nes_t)),
       tf.optional(KEY_LOGGER) => nes_t,
       tf.optional(KEY_MERGE_BEHAVIOR) => tf.enum('deep', 'deeper', 'native'),
@@ -376,7 +376,8 @@ class HieraConfigV3 < HieraConfig
         Hiera::Scope.new(scope),
         lookup_invocation.override_values,
         lookup_invocation.default_values,
-        lookup_invocation.explainer)
+        lookup_invocation.explainer
+      )
     end
 
     default_datadir = File.join(Puppet.settings[:codedir], 'environments', '%{::environment}', 'hieradata')
@@ -446,7 +447,7 @@ class HieraConfigV3 < HieraConfig
     config[KEY_MERGE_BEHAVIOR] ||= DEFAULT_CONFIG_HASH[KEY_MERGE_BEHAVIOR]
     config[KEY_DEEP_MERGE_OPTIONS] ||= {}
 
-    backends = [ config[KEY_BACKENDS] ].flatten
+    backends = [config[KEY_BACKENDS]].flatten
 
     # Create the final struct used for validation (backends are included as keys to arbitrary configs in the form of a hash)
     tf = Types::TypeFactory
@@ -596,7 +597,8 @@ class HieraConfigV5 < HieraConfig
                       tf.optional(KEY_URIS) => tf.array_of(uri_t, tf.range(1, :default)),
                       tf.optional(KEY_MAPPED_PATHS) => tf.array_of(nes_t, tf.range(3, 3)),
                       tf.optional(KEY_DATADIR) => nes_t
-                    }))
+                    }
+                  ))
 
     @@CONFIG_TYPE =
       tf.struct({
@@ -608,7 +610,8 @@ class HieraConfigV5 < HieraConfig
                       tf.optional(KEY_DATA_DIG) => nes_t,
                       tf.optional(KEY_DATADIR) => nes_t,
                       tf.optional(KEY_OPTIONS) => tf.hash_kv(option_name_t, tf.data),
-                    }),
+                    }
+                  ),
                   tf.optional(KEY_HIERARCHY) => hierarchy_t,
                   tf.optional(KEY_PLAN_HIERARCHY) => hierarchy_t,
                   tf.optional(KEY_DEFAULT_HIERARCHY) => hierarchy_t
@@ -686,7 +689,7 @@ class HieraConfigV5 < HieraConfig
 
       options = he[KEY_OPTIONS] || defaults[KEY_OPTIONS]
       options = options.nil? ? EMPTY_HASH : interpolate(options, lookup_invocation, false)
-      if(function_kind == KEY_V3_BACKEND)
+      if (function_kind == KEY_V3_BACKEND)
         v3options = { :datadir => entry_datadir.to_s }
         options.each_pair { |k, v| v3options[k.to_sym] = v }
         data_providers[name] =
@@ -702,7 +705,7 @@ class HieraConfigV5 < HieraConfig
                                                path.end_with?(".#{function_name}") ? path[0..-(function_name.length + 2)] : path
                                              end,
                                            function_name.to_sym => v3options,
-                                           :backends => [ function_name ],
+                                           :backends => [function_name],
                                            :logger => 'puppet'
                                          })
       else

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

@@ -94,7 +94,7 @@ module Interpolation
           else
             scope = lookup_invocation.scope
             val = nil
-            if (default_key_exists = lookup_invocation.default_values.include?(root_key) )
+            if (default_key_exists = lookup_invocation.default_values.include?(root_key))
               catch(:undefined_variable) { val = scope[root_key] }
             else
               val = scope[root_key]
@@ -125,7 +125,7 @@ module Interpolation
         :hiera => global_lookup, # this is just an alias for 'lookup'
         :alias => global_lookup, # same as 'lookup' but expression must be entire string and result is not subject to string substitution
         :scope => scope_lookup,
-        :literal => lambda { |key, _, _| key }
+        :literal => ->(key, _, _) { key }
       }.freeze
     end
     interpolate_method = @@interpolate_methods[method_key]
@@ -158,7 +158,8 @@ module Interpolation
 
   def fail(issue, args = EMPTY_HASH)
     raise Puppet::DataBinding::LookupError.new(
-      issue.format(args), nil, nil, nil, nil, issue.issue_code)
+      issue.format(args), nil, nil, nil, nil, issue.issue_code
+    )
   end
 end
 end

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

@@ -4,7 +4,7 @@
 # @api private
 #
 class Puppet::Pops::Lookup::KeyRecorder
-  def initialize()
+  def initialize
   end
 
   # rubocop:disable Naming/MemoizedInstanceVariableName

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

@@ -107,18 +107,18 @@ class LookupAdapter < DataAdapter
       rescue StandardError => e
         raise Puppet::DataBinding::LookupError,
               _("Invalid data type in lookup_options for key '%{key}' could not parse '%{source}', error: '%{msg}") %
-                { key: key, source: convert_to[0], msg: e.message}
+              { key: key, source: convert_to[0], msg: e.message }
       end
     end
     begin
-      result = lookup_invocation.scope.call_function(NEW, [convert_to[0], result, *convert_to[1..-1]])
+      result = lookup_invocation.scope.call_function(NEW, [convert_to[0], result, *convert_to[1..]])
       # TRANSLATORS 'lookup_options', 'convert_to' and args_string variable should not be translated,
       args_string = Puppet::Pops::Types::StringConverter.singleton.convert(convert_to)
       lookup_invocation.report_text { _("Applying convert_to lookup_option with arguments %{args}") % { args: args_string } }
     rescue StandardError => e
       raise Puppet::DataBinding::LookupError,
             _("The convert_to lookup_option for key '%{key}' raised error: %{msg}") %
-              { key: key, msg: e.message}
+            { key: key, msg: e.message }
     end
     result
   end
@@ -139,7 +139,7 @@ class LookupAdapter < DataAdapter
       lookup_invocation.with(:global, terminus) do
         catch(:no_such_key) do
           return lookup_invocation.report_found(key, Puppet::DataBinding.indirection.find(key.root_key,
-                                                                                          {:environment => environment, :variables => lookup_invocation.scope, :merge => merge_strategy}))
+                                                                                          { :environment => environment, :variables => lookup_invocation.scope, :merge => merge_strategy }))
         end
         lookup_invocation.report_not_found(key)
         throw :no_such_key
@@ -198,7 +198,9 @@ class LookupAdapter < DataAdapter
               catch(:no_such_key) do
                 opts = compile_patterns(
                   validate_lookup_options(
-                    provider.key_lookup_in_default(LookupKey::LOOKUP_OPTIONS, meta_invocation, MergeStrategy.strategy(HASH)), k))
+                    provider.key_lookup_in_default(LookupKey::LOOKUP_OPTIONS, meta_invocation, MergeStrategy.strategy(HASH)), k
+                  )
+                )
               end
             end
             @module_default_lookup_options[k] = opts

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

@@ -16,7 +16,7 @@ class LookupKey
     qual_index = root_key.index(DOUBLE_COLON)
 
     @key = key
-    @module_name = qual_index.nil? ? nil : root_key[0..qual_index-1].freeze
+    @module_name = qual_index.nil? ? nil : root_key[0..qual_index - 1].freeze
     @root_key = root_key
     @segments = segments.empty? ? nil : segments.freeze
   end

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

@@ -77,7 +77,7 @@ module SubLookup
             unless value.respond_to?(:'[]') && !(value.is_a?(Array) || value.instance_of?(String))
               raise Puppet::DataBinding::LookupError,
                     _("Data Provider type mismatch: Got %{klass} when a hash-like object was expected to access value using '%{segment}' from key '%{key}'") %
-                      { klass: value.class.name, segment: segment, key: key }
+                    { klass: value.class.name, segment: segment, key: key }
             end
             unless value.include?(segment)
               lookup_invocation.report_not_found(segment)

data/lib/puppet/pops/lookup.rb

@@ -92,8 +92,7 @@ module Lookup
   def self.fail_lookup(names)
     raise Puppet::DataBinding::LookupError,
           n_("Function lookup() did not find a value for the name '%{name}'",
-             "Function lookup() did not find a value for any of the names [%{name_list}]", names.size
-          ) % { name: names[0], name_list: names.map { |n| "'#{n}'" }.join(', ') }
+             "Function lookup() did not find a value for any of the names [%{name_list}]", names.size) % { name: names[0], name_list: names.map { |n| "'#{n}'" }.join(', ') }
   end
   private_class_method :fail_lookup
 end

data/lib/puppet/pops/merge_strategy.rb

@@ -58,7 +58,7 @@ module Puppet::Pops
       unless MergeStrategy > strategy_class
         # TRANSLATORS 'MergeStrategies.add_strategy' is a method, 'stratgey_class' is a variable and 'MergeStrategy' is a class name and should not be translated
         raise ArgumentError, _("MergeStrategies.add_strategy 'strategy_class' must be a 'MergeStrategy' class. Got %{strategy_class}") %
-            { strategy_class: strategy_class }
+                             { strategy_class: strategy_class }
       end
       strategies[strategy_class.key] = strategy_class
       nil
@@ -95,7 +95,8 @@ module Puppet::Pops
     def merge(e1, e2)
       checked_merge(
         assert_type('The first element of the merge', value_t, e1),
-        assert_type('The second element of the merge', value_t, e2))
+        assert_type('The second element of the merge', value_t, e2)
+      )
     end
 
     # TODO: API 5.0 Remove this method
@@ -183,7 +184,7 @@ module Puppet::Pops
       # @return [Types::PStructType] the puppet type
       #
       def options_t
-        @options_t ||=Types::TypeParser.singleton.parse("Struct[{strategy=>Optional[Pattern[/#{key}/]]}]")
+        @options_t ||= Types::TypeParser.singleton.parse("Struct[{strategy=>Optional[Pattern[/#{key}/]]}]")
       end
     end
 
@@ -370,18 +371,19 @@ module Puppet::Pops
 
     def checked_merge(e1, e2)
       dm_options = { :preserve_unmergeables => false }
-      options.each_pair { |k,v| dm_options[k.to_sym] = v unless k == 'strategy' }
+      options.each_pair { |k, v| dm_options[k.to_sym] = v unless k == 'strategy' }
       # e2 (the destination) is deep cloned to avoid that the passed in object mutates
       DeepMerge.deep_merge!(e1, deep_clone(e2), dm_options)
     end
 
     def deep_clone(value)
-      if value.is_a?(Hash)
+      case value
+      when Hash
         result = value.clone
-        value.each{ |k, v| result[k] = deep_clone(v) }
+        value.each { |k, v| result[k] = deep_clone(v) }
         result
-      elsif value.is_a?(Array)
-        value.map{ |v| deep_clone(v) }
+      when Array
+        value.map { |v| deep_clone(v) }
       else
         value
       end

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

@@ -4,7 +4,7 @@
 # @api private
 #
 class Puppet::Pops::Migration::MigrationChecker
-  def initialize()
+  def initialize
   end
 
   # rubocop:disable Naming/MemoizedInstanceVariableName
@@ -15,8 +15,8 @@ class Puppet::Pops::Migration::MigrationChecker
 
   # Produces a hash of available migrations; a map from a symbolic name in string form to a brief description.
   # This version has no such supported migrations.
-  def available_migrations()
-    { }
+  def available_migrations
+    {}
   end
 
   # For 3.8/4.0