puppet 8.2.0-universal-darwin → 8.4.0-universal-darwin

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'data_dig_function_provider'
 require_relative 'data_hash_function_provider'
 require_relative 'lookup_key_function_provider'
@@ -6,7 +7,6 @@ require_relative 'location_resolver'
 
 module Puppet::Pops
 module Lookup
-
 # @api private
 class ScopeLookupCollectingInvocation < Invocation
   def initialize(scope)
@@ -84,19 +84,19 @@ class HieraConfig
   def self.v4_function_config(config_root, function_name, owner)
     unless Puppet[:strict] == :off
       Puppet.warn_once('deprecations', 'legacy_provider_function',
-        _("Using of legacy data provider function '%{function_name}'. Please convert to a 'data_hash' function") % { function_name: function_name })
+                       _("Using of legacy data provider function '%{function_name}'. Please convert to a 'data_hash' function") % { function_name: function_name })
     end
     HieraConfigV5.new(config_root, nil,
-      {
-        KEY_VERSION => 5,
-        KEY_HIERARCHY => [
-          {
-            KEY_NAME => "Legacy function '#{function_name}'",
-            KEY_V4_DATA_HASH => function_name
-          }
-        ]
-      }.freeze,
-      owner
+                      {
+                        KEY_VERSION => 5,
+                        KEY_HIERARCHY => [
+                          {
+                            KEY_NAME => "Legacy function '#{function_name}'",
+                            KEY_V4_DATA_HASH => function_name
+                          }
+                        ]
+                      }.freeze,
+                      owner
     )
   end
 
@@ -163,7 +163,7 @@ 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,7 @@ 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?
@@ -227,8 +227,9 @@ class HieraConfig
     File.foreach(@config_path) do |line|
       line_number += 1
       next if line_number < start_line
+
       quote = nil
-      stripped = String.new
+      stripped = ''.dup
       line.each_codepoint do |cp|
         if cp == 0x22 || cp == 0x27 # double or single quote
           if quote == cp
@@ -307,7 +308,7 @@ class HieraConfig
       # Replace the class methods 'hiera_interpolate' and 'alias_interpolate' with a method that wires back and performs global
       # lookups using the lookup framework. This is necessary since the classic Hiera is made aware only of custom backends.
       class << Hiera::Interpolate
-        hiera_interpolate = Proc.new do |data, key, scope, extra_data, context|
+        hiera_interpolate = Proc.new do |_data, key, scope, _extra_data, context|
           override = context[:order_override]
           invocation = Puppet::Pops::Lookup::Invocation.current
           unless override.nil? && invocation.global_only?
@@ -353,6 +354,7 @@ class HieraConfigV3 < HieraConfig
 
   def self.config_type
     return @@CONFIG_TYPE if class_variable_defined?(:@@CONFIG_TYPE)
+
     tf = Types::TypeFactory
     nes_t = Types::PStringType::NON_EMPTY
 
@@ -405,21 +407,29 @@ class HieraConfigV3 < HieraConfig
         ext = ".#{ext}"
       end
       paths = resolve_paths(datadir, original_paths, lookup_invocation, @config_path.nil?, ext)
-      data_providers[backend] = case
-      when backend == 'json', backend == 'yaml'
-        create_data_provider(backend, parent_data_provider, KEY_V3_DATA_HASH, "#{backend}_data", { KEY_DATADIR => datadir }, paths)
-      when backend == 'hocon' && Puppet.features.hocon?
-        create_data_provider(backend, parent_data_provider, KEY_V3_DATA_HASH, 'hocon_data', { KEY_DATADIR => datadir }, paths)
-      when backend == 'eyaml' && Puppet.features.hiera_eyaml?
-        create_data_provider(backend, parent_data_provider, KEY_V3_LOOKUP_KEY, 'eyaml_lookup_key', backend_config.merge(KEY_DATADIR => datadir), paths)
-      else
-        create_hiera3_backend_provider(backend, backend, parent_data_provider, datadir, paths, @loaded_config)
-      end
+      data_providers[backend] =
+        if %w[json yaml].include? backend
+          create_data_provider(backend, parent_data_provider, KEY_V3_DATA_HASH,
+                               "#{backend}_data", { KEY_DATADIR => datadir },
+                               paths)
+        elsif backend == 'hocon' && Puppet.features.hocon?
+          create_data_provider(backend, parent_data_provider, KEY_V3_DATA_HASH,
+                               'hocon_data', { KEY_DATADIR => datadir }, paths)
+        elsif backend == 'eyaml' && Puppet.features.hiera_eyaml?
+          create_data_provider(backend, parent_data_provider,
+                               KEY_V3_LOOKUP_KEY, 'eyaml_lookup_key',
+                               backend_config.merge(KEY_DATADIR => datadir),
+                               paths)
+        else
+          create_hiera3_backend_provider(backend, backend,
+                                         parent_data_provider, datadir, paths,
+                                         @loaded_config)
+        end
     end
     data_providers.values
   end
 
-  DEFAULT_CONFIG_HASH =  {
+  DEFAULT_CONFIG_HASH = {
     KEY_BACKENDS => %w(yaml),
     KEY_HIERARCHY => %w(nodes/%{::trusted.certname} common),
     KEY_MERGE_BEHAVIOR => 'native'
@@ -428,7 +438,7 @@ class HieraConfigV3 < HieraConfig
   def validate_config(config, owner)
     unless Puppet[:strict] == :off
       Puppet.warn_once('deprecations', 'hiera.yaml',
-        _("%{config_path}: Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5") % { config_path: @config_path }, config_path.to_s)
+                       _("%{config_path}: Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5") % { config_path: @config_path }, config_path.to_s)
     end
     config[KEY_VERSION] ||= 3
     config[KEY_BACKENDS] ||= DEFAULT_CONFIG_HASH[KEY_BACKENDS]
@@ -477,20 +487,22 @@ end
 class HieraConfigV4 < HieraConfig
   def self.config_type
     return @@CONFIG_TYPE if class_variable_defined?(:@@CONFIG_TYPE)
+
     tf = Types::TypeFactory
     nes_t = Types::PStringType::NON_EMPTY
 
-    @@CONFIG_TYPE = tf.struct({
-      KEY_VERSION => tf.range(4, 4),
-      tf.optional(KEY_DATADIR) => nes_t,
-      tf.optional(KEY_HIERARCHY) => tf.array_of(tf.struct(
-        KEY_BACKEND => nes_t,
-        KEY_NAME => nes_t,
-        tf.optional(KEY_DATADIR) => nes_t,
-        tf.optional(KEY_PATH) => nes_t,
-        tf.optional(KEY_PATHS) => tf.array_of(nes_t)
-      ))
-    })
+    @@CONFIG_TYPE =
+      tf.struct({
+                  KEY_VERSION => tf.range(4, 4),
+                  tf.optional(KEY_DATADIR) => nes_t,
+                  tf.optional(KEY_HIERARCHY) => tf.array_of(tf.struct(
+                                                              KEY_BACKEND => nes_t,
+                                                              KEY_NAME => nes_t,
+                                                              tf.optional(KEY_DATADIR) => nes_t,
+                                                              tf.optional(KEY_PATH) => nes_t,
+                                                              tf.optional(KEY_PATHS) => tf.array_of(nes_t)
+                                                            ))
+                })
   end
 
   def create_configured_data_providers(lookup_invocation, parent_data_provider, _)
@@ -511,16 +523,28 @@ class HieraConfigV4 < HieraConfig
       original_paths = he[KEY_PATHS] || [he[KEY_PATH] || name]
       datadir = @config_root + (he[KEY_DATADIR] || default_datadir)
       provider_name = he[KEY_BACKEND]
-      data_providers[name] = case
-      when provider_name == 'json', provider_name == 'yaml'
-        create_data_provider(name, parent_data_provider, KEY_DATA_HASH, "#{provider_name}_data", {},
-          resolve_paths(datadir, original_paths, lookup_invocation, @config_path.nil?, ".#{provider_name}"))
-      when provider_name == 'hocon' &&  Puppet.features.hocon?
-        create_data_provider(name, parent_data_provider, KEY_DATA_HASH, 'hocon_data', {},
-          resolve_paths(datadir, original_paths, lookup_invocation, @config_path.nil?, '.conf'))
-      else
-        fail(Issues::HIERA_NO_PROVIDER_FOR_BACKEND, { :name => provider_name }, find_line_matching(/[^\w]#{provider_name}(?:[^\w]|$)/))
-      end
+      data_providers[name] =
+        if %w[json yaml].include?(provider_name)
+          create_data_provider(name, parent_data_provider, KEY_DATA_HASH,
+                               "#{provider_name}_data", {},
+                               resolve_paths(datadir,
+                                             original_paths,
+                                             lookup_invocation,
+                                             @config_path.nil?,
+                                             ".#{provider_name}"))
+        elsif provider_name == 'hocon' && Puppet.features.hocon?
+          create_data_provider(name, parent_data_provider, KEY_DATA_HASH,
+                               'hocon_data', {},
+                               resolve_paths(datadir,
+                                             original_paths,
+                                             lookup_invocation,
+                                             @config_path.nil?,
+                                             '.conf'))
+        else
+          fail(Issues::HIERA_NO_PROVIDER_FOR_BACKEND,
+               { :name => provider_name },
+               find_line_matching(/[^\w]#{provider_name}(?:[^\w]|$)/))
+        end
     end
     data_providers.values
   end
@@ -528,7 +552,7 @@ class HieraConfigV4 < HieraConfig
   def validate_config(config, owner)
     unless Puppet[:strict] == :off
       Puppet.warn_once('deprecations', 'hiera.yaml',
-        _("%{config_path}: Use of 'hiera.yaml' version 4 is deprecated. It should be converted to version 5") % { config_path: @config_path }, config_path.to_s)
+                       _("%{config_path}: Use of 'hiera.yaml' version 4 is deprecated. It should be converted to version 5") % { config_path: @config_path }, config_path.to_s)
     end
     config[KEY_DATADIR] ||= 'data'
     config[KEY_HIERARCHY] ||= [{ KEY_NAME => 'common', KEY_BACKEND => 'yaml' }]
@@ -544,6 +568,7 @@ end
 class HieraConfigV5 < HieraConfig
   def self.config_type
     return @@CONFIG_TYPE if class_variable_defined?(:@@CONFIG_TYPE_V5)
+
     tf = Types::TypeFactory
     nes_t = Types::PStringType::NON_EMPTY
 
@@ -553,39 +578,41 @@ class HieraConfigV5 < HieraConfig
     # The option name must start with a letter and end with a letter or digit. May contain underscore and dash.
     option_name_t = tf.pattern(/\A[A-Za-z](:?[0-9A-Za-z_-]*[0-9A-Za-z])?\z/)
 
-    hierarchy_t = tf.array_of(tf.struct(
-      {
-        KEY_NAME => nes_t,
-        tf.optional(KEY_OPTIONS) => tf.hash_kv(option_name_t, tf.data),
-        tf.optional(KEY_DATA_HASH) => nes_t,
-        tf.optional(KEY_LOOKUP_KEY) => nes_t,
-        tf.optional(KEY_V3_BACKEND) => nes_t,
-        tf.optional(KEY_V4_DATA_HASH) => nes_t,
-        tf.optional(KEY_DATA_DIG) => nes_t,
-        tf.optional(KEY_PATH) => nes_t,
-        tf.optional(KEY_PATHS) => tf.array_of(nes_t, tf.range(1, :default)),
-        tf.optional(KEY_GLOB) => nes_t,
-        tf.optional(KEY_GLOBS) => tf.array_of(nes_t, tf.range(1, :default)),
-        tf.optional(KEY_URI) => uri_t,
-        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({
-      KEY_VERSION => tf.range(5, 5),
-      tf.optional(KEY_DEFAULTS) => tf.struct(
-        {
-          tf.optional(KEY_DATA_HASH) => nes_t,
-          tf.optional(KEY_LOOKUP_KEY) => nes_t,
-          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
-    })
+    hierarchy_t =
+      tf.array_of(tf.struct(
+                    {
+                      KEY_NAME => nes_t,
+                      tf.optional(KEY_OPTIONS) => tf.hash_kv(option_name_t, tf.data),
+                      tf.optional(KEY_DATA_HASH) => nes_t,
+                      tf.optional(KEY_LOOKUP_KEY) => nes_t,
+                      tf.optional(KEY_V3_BACKEND) => nes_t,
+                      tf.optional(KEY_V4_DATA_HASH) => nes_t,
+                      tf.optional(KEY_DATA_DIG) => nes_t,
+                      tf.optional(KEY_PATH) => nes_t,
+                      tf.optional(KEY_PATHS) => tf.array_of(nes_t, tf.range(1, :default)),
+                      tf.optional(KEY_GLOB) => nes_t,
+                      tf.optional(KEY_GLOBS) => tf.array_of(nes_t, tf.range(1, :default)),
+                      tf.optional(KEY_URI) => uri_t,
+                      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({
+                  KEY_VERSION => tf.range(5, 5),
+                  tf.optional(KEY_DEFAULTS) => tf.struct(
+                    {
+                      tf.optional(KEY_DATA_HASH) => nes_t,
+                      tf.optional(KEY_LOOKUP_KEY) => nes_t,
+                      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
+                })
   end
 
   def create_configured_data_providers(lookup_invocation, parent_data_provider, use_default_hierarchy)
@@ -606,12 +633,12 @@ class HieraConfigV5 < HieraConfig
 
     compiler = Puppet.lookup(:pal_compiler) { nil }
     config_key = if compiler.is_a?(Puppet::Pal::ScriptCompiler) && !@config[KEY_PLAN_HIERARCHY].nil?
-          KEY_PLAN_HIERARCHY
-        elsif use_default_hierarchy
-          KEY_DEFAULT_HIERARCHY
-        else
-          KEY_HIERARCHY
-        end
+                   KEY_PLAN_HIERARCHY
+                 elsif use_default_hierarchy
+                   KEY_DEFAULT_HIERARCHY
+                 else
+                   KEY_HIERARCHY
+                 end
     @config[config_key].each do |he|
       name = he[KEY_NAME]
       if data_providers.include?(name)
@@ -656,21 +683,28 @@ class HieraConfigV5 < HieraConfig
                     end
       end
       next if @config_path.nil? && !locations.nil? && locations.empty? # Default config and no existing paths found
+
       options = he[KEY_OPTIONS] || defaults[KEY_OPTIONS]
       options = options.nil? ? EMPTY_HASH : interpolate(options, lookup_invocation, false)
       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] = create_hiera3_backend_provider(name, function_name, parent_data_provider, entry_datadir, locations, {
-          :hierarchy =>
-            locations.nil? ? [] : locations.map do |loc|
-              path = loc.original_location
-              path.end_with?(".#{function_name}") ? path[0..-(function_name.length + 2)] : path
-            end,
-          function_name.to_sym => v3options,
-          :backends => [ function_name ],
-          :logger => 'puppet'
-        })
+        data_providers[name] =
+          create_hiera3_backend_provider(name,
+                                         function_name,
+                                         parent_data_provider,
+                                         entry_datadir,
+                                         locations,
+                                         {
+                                           :hierarchy =>
+                                             locations.nil? ? [] : locations.map do |loc|
+                                               path = loc.original_location
+                                               path.end_with?(".#{function_name}") ? path[0..-(function_name.length + 2)] : path
+                                             end,
+                                           function_name.to_sym => v3options,
+                                           :backends => [ function_name ],
+                                           :logger => 'puppet'
+                                         })
       else
         data_providers[name] = create_data_provider(name, parent_data_provider, function_kind, function_name, options, locations)
       end
@@ -714,6 +748,7 @@ class HieraConfigV5 < HieraConfig
       unless owner.is_a?(ModuleDataProvider)
         fail(Issues::HIERA_DEFAULT_HIERARCHY_NOT_IN_MODULE, EMPTY_HASH, find_line_matching(/(?:^|\s+)#{KEY_DEFAULT_HIERARCHY}:/))
       end
+
       config[KEY_DEFAULT_HIERARCHY].each { |he| validate_hierarchy(he, defaults, owner) }
     end
     config
@@ -737,10 +772,11 @@ class HieraConfigV5 < HieraConfig
       unless owner.is_a?(GlobalDataProvider)
         fail(Issues::HIERA_V3_BACKEND_NOT_GLOBAL, EMPTY_HASH, find_line_matching(/\s+#{KEY_V3_BACKEND}:/))
       end
-      if v3_backend == 'json' || v3_backend == 'yaml' || v3_backend == 'hocon' &&  Puppet.features.hocon?
+
+      if v3_backend == 'json' || v3_backend == 'yaml' || v3_backend == 'hocon' && Puppet.features.hocon?
         # Disallow use of backends that have corresponding "data_hash" functions in version 5
         fail(Issues::HIERA_V3_BACKEND_REPLACED_BY_DATA_HASH, { :function_name => v3_backend },
-          find_line_matching(/\s+#{KEY_V3_BACKEND}:\s*['"]?#{v3_backend}(?:[^\w]|$)/))
+             find_line_matching(/\s+#{KEY_V3_BACKEND}:\s*['"]?#{v3_backend}(?:[^\w]|$)/))
       end
     end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'hiera/scope'
 require_relative 'sub_lookup'
 module Puppet::Pops
@@ -58,6 +59,7 @@ module Interpolation
 
           # Alias is only permitted if the entire string is equal to the interpolate expression
           fail(Issues::HIERA_INTERPOLATION_ALIAS_NOT_ENTIRE_STRING) if is_alias && subject != match
+
           value = interpolate_method(method_key).call(key, lookup_invocation, subject)
 
           # break gsub and return value immediately if this was an alias substitution. The value might be something other than a String
@@ -79,7 +81,7 @@ module Interpolation
           scope = scope.real
         end
         lookup_invocation.with_scope(scope) do |sub_invocation|
-          sub_invocation.lookup(key) {  Lookup.lookup(key, nil, '', true, nil, sub_invocation) }
+          sub_invocation.lookup(key) { Lookup.lookup(key, nil, '', true, nil, sub_invocation) }
         end
       end
       scope_lookup = lambda do |key, lookup_invocation, subject|
@@ -128,6 +130,7 @@ module Interpolation
     end
     interpolate_method = @@interpolate_methods[method_key]
     fail(Issues::HIERA_INTERPOLATION_UNKNOWN_INTERPOLATION_METHOD, :name => method_key) unless interpolate_method
+
     interpolate_method
   end
 
@@ -144,6 +147,7 @@ module Interpolation
     match = data.match(/^(\w+)\((?:["]([^"]+)["]|[']([^']+)['])\)$/)
     if match
       fail(Issues::HIERA_INTERPOLATION_METHOD_SYNTAX_NOT_ALLOWED) unless allow_methods
+
       key = match[1].to_sym
       data = match[2] || match[3] # double or single qouted
     else

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/thread_local'
 
 require_relative 'explainer'
@@ -109,9 +110,11 @@ class Invocation
     @explainer.emit_debug_info(preamble) if @explainer.is_a?(DebugExplainer)
   end
 
+  # rubocop:disable Naming/MemoizedInstanceVariableName
   def lookup_adapter
     @adapter ||= @adapter_class.adapt(scope.compiler)
   end
+  # rubocop:enable Naming/MemoizedInstanceVariableName
 
   # This method is overridden by the special Invocation used while resolving interpolations in a
   # Hiera configuration file (hiera.yaml) where it's used for collecting and remembering the current

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

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
+
 # This class defines the private API of the Lookup Key Recorder support.
 # @api private
 #
 class Puppet::Pops::Lookup::KeyRecorder
-
   def initialize()
   end
 
+  # rubocop:disable Naming/MemoizedInstanceVariableName
   def self.singleton
     @null_recorder ||= self.new
   end
+  # rubocop:enable Naming/MemoizedInstanceVariableName
 
   # Records a key
   # (This implementation does nothing)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pathname'
 require_relative 'interpolation'
 
@@ -90,7 +91,7 @@ module Lookup
         mapped_vars.map do |var|
           # Need to use parent lookup invocation to avoid adding 'var' to the set of variables to track for changes. The
           # variable that 'var' stems from is added above.
-          path = scope.with_local_scope(var_key => var) {  datadir + interpolate(template, lookup_invocation, false) }
+          path = scope.with_local_scope(var_key => var) { datadir + interpolate(template, lookup_invocation, false) }
           ResolvedLocation.new(template, path, path.exist?)
         end
       end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'data_adapter'
 require_relative 'lookup_key'
 
@@ -10,7 +11,6 @@ module Lookup
 #
 # @api private
 class LookupAdapter < DataAdapter
-
   LOOKUP_OPTIONS_PREFIX = LOOKUP_OPTIONS + '.'
   LOOKUP_OPTIONS_PREFIX.freeze
   LOOKUP_OPTIONS_PATTERN_START = '^'
@@ -106,8 +106,8 @@ class LookupAdapter < DataAdapter
         convert_to[0] = Puppet::Pops::Types::TypeParser.singleton.parse(convert_to[0])
       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}
+              _("Invalid data type in lookup_options for key '%{key}' could not parse '%{source}', error: '%{msg}") %
+                { key: key, source: convert_to[0], msg: e.message}
       end
     end
     begin
@@ -117,8 +117,8 @@ class LookupAdapter < DataAdapter
       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}
+            _("The convert_to lookup_option for key '%{key}' raised error: %{msg}") %
+              { 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
@@ -147,6 +147,7 @@ class LookupAdapter < DataAdapter
     end
   rescue Puppet::DataBinding::LookupError => detail
     raise detail unless detail.issue_code.nil?
+
     error = Puppet::Error.new(_("Lookup of key '%{key}' failed: %{detail}") % { key: lookup_invocation.top_key, detail: detail.message })
     error.set_backtrace(detail.backtrace)
     raise error
@@ -195,9 +196,9 @@ class LookupAdapter < DataAdapter
             opts = nil
             lookup_invocation.with(:scope, "Searching for \"#{LookupKey::LOOKUP_OPTIONS}\"") do
               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))
+                opts = compile_patterns(
+                  validate_lookup_options(
+                    provider.key_lookup_in_default(LookupKey::LOOKUP_OPTIONS, meta_invocation, MergeStrategy.strategy(HASH)), k))
               end
             end
             @module_default_lookup_options[k] = opts
@@ -298,7 +299,7 @@ class LookupAdapter < DataAdapter
     return options if module_name.nil?
 
     pfx = "#{module_name}::"
-    options.each_pair do |key, value|
+    options.each_pair do |key, _value|
       if key.start_with?(LOOKUP_OPTIONS_PATTERN_START)
         unless key[1..pfx.length] == pfx
           raise Puppet::DataBinding::LookupError.new(_("all %{opts} patterns must match a key starting with module name '%{module_name}'") % { opts: LOOKUP_OPTIONS, module_name: module_name })
@@ -313,6 +314,7 @@ class LookupAdapter < DataAdapter
 
   def compile_patterns(options)
     return nil if options.nil?
+
     key_options = {}
     pattern_options = {}
     options.each_pair do |key, value|
@@ -331,7 +333,7 @@ class LookupAdapter < DataAdapter
     else
       merge_strategy = Puppet::Pops::MergeStrategy.strategy(merge)
       key.dig(lookup_invocation,
-        merge_strategy.lookup(PROVIDER_STACK, lookup_invocation) { |m| send(m, key, lookup_invocation, merge_strategy) })
+              merge_strategy.lookup(PROVIDER_STACK, lookup_invocation) { |m| send(m, key, lookup_invocation, merge_strategy) })
     end
   end
 
@@ -353,12 +355,12 @@ class LookupAdapter < DataAdapter
             catch(:no_such_key) do
               module_opts = validate_lookup_options(lookup_in_module(LookupKey::LOOKUP_OPTIONS, meta_invocation, merge_strategy), module_name)
               opts = if opts.nil?
-                module_opts
-              elsif module_opts
-                merge_strategy.lookup([GLOBAL_ENV_MERGE, "Module #{lookup_invocation.module_name}"], meta_invocation) do |n|
-                  meta_invocation.with(:scope, n) { meta_invocation.report_found(LOOKUP_OPTIONS,  n == GLOBAL_ENV_MERGE ? opts : module_opts) }
-                end
-              end
+                       module_opts
+                     elsif module_opts
+                       merge_strategy.lookup([GLOBAL_ENV_MERGE, "Module #{lookup_invocation.module_name}"], meta_invocation) do |n|
+                         meta_invocation.with(:scope, n) { meta_invocation.report_found(LOOKUP_OPTIONS, n == GLOBAL_ENV_MERGE ? opts : module_opts) }
+                       end
+                     end
             end
           end
           compile_patterns(opts)
@@ -430,7 +432,7 @@ class LookupAdapter < DataAdapter
       elsif mp_config.version >= 5
         unless provider_name.nil? || Puppet[:strict] == :off
           Puppet.warn_once('deprecations', "metadata.json#data_provider-#{module_name}",
-            _("Defining \"data_provider\": \"%{name}\" in metadata.json is deprecated. It is ignored since a '%{config}' with version >= 5 is present") % { name: provider_name, config: HieraConfig::CONFIG_FILE_NAME }, mod.metadata_file)
+                           _("Defining \"data_provider\": \"%{name}\" in metadata.json is deprecated. It is ignored since a '%{config}' with version >= 5 is present") % { name: provider_name, config: HieraConfig::CONFIG_FILE_NAME }, mod.metadata_file)
         end
         provider_name = nil
       end
@@ -479,11 +481,11 @@ class LookupAdapter < DataAdapter
       elsif ep_config.version >= 5
         unless provider_name.nil? || Puppet[:strict] == :off
           Puppet.warn_once('deprecations', 'environment.conf#data_provider',
-            _("Defining environment_data_provider='%{provider_name}' in environment.conf is deprecated") % { provider_name: provider_name }, env_path + 'environment.conf')
+                           _("Defining environment_data_provider='%{provider_name}' in environment.conf is deprecated") % { provider_name: provider_name }, env_path + 'environment.conf')
 
           unless provider_name == 'hiera'
             Puppet.warn_once('deprecations', 'environment.conf#data_provider_overridden',
-              _("The environment_data_provider='%{provider_name}' setting is ignored since '%{config_path}' version >= 5") % { provider_name: provider_name, config_path: config_path }, env_path + 'environment.conf')
+                             _("The environment_data_provider='%{provider_name}' setting is ignored since '%{config_path}' version >= 5") % { provider_name: provider_name, config_path: config_path }, env_path + 'environment.conf')
           end
         end
         provider_name = nil

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'sub_lookup'
 
 module Puppet::Pops

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'function_provider'
 
 module Puppet::Pops

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
 require_relative 'configured_data_provider'
 
 module Puppet::Pops
 module Lookup
 # @api private
 class ModuleDataProvider < ConfiguredDataProvider
-
   attr_reader :module_name
 
   def initialize(module_name, config = nil)
@@ -49,6 +49,7 @@ class ModuleDataProvider < ConfiguredDataProvider
     module_prefix = "#{module_name}::"
     data_hash.each_key.reduce(data_hash) do |memo, k|
       next memo if k == LOOKUP_OPTIONS || k.start_with?(module_prefix)
+
       msg = "#{yield} must use keys qualified with the name of the module"
       memo = memo.clone if memo.equal?(data_hash)
       memo.delete(k)
@@ -83,6 +84,7 @@ class ModuleDataProvider < ConfiguredDataProvider
     env = lookup_invocation.scope.environment
     mod = env.module(module_name)
     raise Puppet::DataBinding::LookupError, _("Environment '%{env}', cannot find module '%{module_name}'") % { env: env.name, module_name: module_name } unless mod
+
     Pathname.new(mod.path)
   end
 end