puppet 8.2.0-x64-mingw32 → 8.4.0-x64-mingw32

data/lib/puppet/pops/loaders.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 # This is the container for all Loader instances. Each Loader instance has a `loader_name` by which it can be uniquely
 # identified within this container.
@@ -37,6 +38,7 @@ class Loaders
   def initialize(environment, for_agent, load_from_pcore = true)
     # Protect against environment havoc
     raise ArgumentError.new(_("Attempt to redefine already initialized loaders for environment")) unless environment.loaders.nil?
+
     environment.loaders = self
     @environment = environment
     @loaders_by_name = {}
@@ -180,6 +182,7 @@ class Loaders
   def self.loaders
     loaders = Puppet.lookup(:loaders) { nil }
     raise Puppet::ParseError, _("Internal Error: Puppet Context ':loaders' missing") if loaders.nil?
+
     loaders
   end
 
@@ -216,6 +219,7 @@ class Loaders
       if loader.nil?
         raise Puppet::ParseError, _("Internal Error: did not find public loader for module: '%{module_name}'") % { module_name: module_name }
       end
+
       loader
     end
   end
@@ -262,6 +266,7 @@ class Loaders
     if @loaders_by_name.include?(name)
       raise Puppet::ParseError, _("Internal Error: Attempt to redefine loader named '%{name}'") % { name: name }
     end
+
     @loaders_by_name[name] = loader
   end
 
@@ -281,22 +286,22 @@ class Loaders
     parser = Parser::EvaluatingParser.singleton
     parsed_code = Puppet[:code]
     program = if parsed_code != ""
-      parser.parse_string(parsed_code, 'unknown-source-location')
-    else
-      file = @environment.manifest
-
-      # if the manifest file is a reference to a directory, parse and combine
-      # all .pp files in that directory
-      if file == Puppet::Node::Environment::NO_MANIFEST
-        nil
-      elsif File.directory?(file)
-        raise Puppet::Error, "manifest of environment '#{@environment.name}' appoints directory '#{file}'. It must be a file"
-      elsif File.exist?(file)
-        parser.parse_file(file)
-      else
-        raise Puppet::Error, "manifest of environment '#{@environment.name}' appoints '#{file}'. It does not exist"
-      end
-    end
+                parser.parse_string(parsed_code, 'unknown-source-location')
+              else
+                file = @environment.manifest
+
+                # if the manifest file is a reference to a directory, parse and
+                # combine all .pp files in that directory
+                if file == Puppet::Node::Environment::NO_MANIFEST
+                  nil
+                elsif File.directory?(file)
+                  raise Puppet::Error, "manifest of environment '#{@environment.name}' appoints directory '#{file}'. It must be a file"
+                elsif File.exist?(file)
+                  parser.parse_file(file)
+                else
+                  raise Puppet::Error, "manifest of environment '#{@environment.name}' appoints '#{file}'. It does not exist"
+                end
+              end
     instantiate_definitions(program, public_environment_loader) unless program.nil?
     program
   rescue Puppet::ParseErrorWithIssue => detail
@@ -450,7 +455,6 @@ class Loaders
   #       what is available with a reasonable API.
   #
   class LoaderModuleData
-
     attr_accessor :public_loader
     attr_accessor :private_loader
     attr_accessor :resolutions
@@ -499,7 +503,6 @@ class Loaders
   # Resolves module loaders - resolution of model dependencies is done by Puppet::Module
   #
   class ModuleResolver
-
     def initialize(loaders)
       @loaders = loaders
       @index = {}

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'hiera_config'
 require_relative 'data_provider'
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'interpolation'
 
 module Puppet::Pops
@@ -134,29 +135,29 @@ class Context
     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])))
-      }
+                                      {
+                                        '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
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Lookup
 # A class that adapts a Hash

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'function_provider'
 
 module Puppet::Pops
@@ -107,8 +108,7 @@ class V3BackendFunctionProvider < DataDigFunctionProvider
   # @return [Symbol,Hash,nil] The Hiera 'resolution_type'
   def convert_merge(merge)
     case merge
-    when nil
-    when 'first', 'default'
+    when nil, 'first', 'default'
       # Nil is OK. Defaults to Hiera :priority
       nil
     when Puppet::Pops::MergeStrategy

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'function_provider'
 require_relative 'interpolation'
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Lookup
 # @api private

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

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

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Lookup
-
-# The ExplainNode contains information of a specific node in a tree traversed during
-# lookup. The tree can be traversed using the `parent` and `branches` attributes of
-# each node.
-#
-# Each leaf node contains information about what happened when the leaf of the branch
-# was traversed.
+  # The ExplainNode contains information of a specific node in a tree traversed during
+  # lookup. The tree can be traversed using the `parent` and `branches` attributes of
+  # each node.
+  #
+  # Each leaf node contains information about what happened when the leaf of the branch
+  # was traversed.
   class ExplainNode
     def branches
       @branches ||= []
@@ -20,7 +20,7 @@ module Lookup
     end
 
     def explain
-      io = String.new
+      io = ''.dup
       dump_on(io, '', '')
       io
     end
@@ -290,6 +290,7 @@ module Lookup
 
     def to_hash
       return branches[0].to_hash if branches.size == 1
+
       hash = super
       hash[:merge] = @merge.class.key
       options = options_wo_strategy
@@ -469,32 +470,32 @@ module Lookup
 
     def push(qualifier_type, qualifier)
       node = case (qualifier_type)
-        when :global
-         ExplainGlobal.new(@current, qualifier)
-        when :location
-          ExplainLocation.new(@current, qualifier)
-        when :interpolate
-          ExplainInterpolate.new(@current, qualifier)
-        when :data_provider
-          ExplainDataProvider.new(@current, qualifier)
-        when :merge
-          ExplainMerge.new(@current, qualifier)
-        when :module
-          ExplainModule.new(@current, qualifier)
-        when :scope
-          ExplainScope.new(@current, qualifier)
-        when :sub_lookup
-          ExplainSubLookup.new(@current, qualifier)
-        when :segment
-          ExplainKeySegment.new(@current, qualifier)
-        when :meta, :data
-          ExplainTop.new(@current, qualifier_type, qualifier)
-        when :invalid_key
-          ExplainInvalidKey.new(@current, qualifier)
-        else
-          #TRANSLATORS 'Explain' is referring to the 'Explainer' class and should not be translated
-          raise ArgumentError, _("Unknown Explain type %{qualifier_type}") % { qualifier_type: qualifier_type }
-        end
+             when :global
+               ExplainGlobal.new(@current, qualifier)
+             when :location
+               ExplainLocation.new(@current, qualifier)
+             when :interpolate
+               ExplainInterpolate.new(@current, qualifier)
+             when :data_provider
+               ExplainDataProvider.new(@current, qualifier)
+             when :merge
+               ExplainMerge.new(@current, qualifier)
+             when :module
+               ExplainModule.new(@current, qualifier)
+             when :scope
+               ExplainScope.new(@current, qualifier)
+             when :sub_lookup
+               ExplainSubLookup.new(@current, qualifier)
+             when :segment
+               ExplainKeySegment.new(@current, qualifier)
+             when :meta, :data
+               ExplainTop.new(@current, qualifier_type, qualifier)
+             when :invalid_key
+               ExplainInvalidKey.new(@current, qualifier)
+             else
+               # TRANSLATORS 'Explain' is referring to the 'Explainer' class and should not be translated
+               raise ArgumentError, _("Unknown Explain type %{qualifier_type}") % { qualifier_type: qualifier_type }
+             end
       @current.branches << node
       @current = node
     end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'data_adapter'
 require_relative 'context'
 require_relative 'data_provider'
@@ -84,15 +85,15 @@ class FunctionProvider
     loaders = lookup_invocation.scope.compiler.loaders
     typed_name = Loader::TypedName.new(:function, @function_name)
     loader = if typed_name.qualified?
-      qualifier = typed_name.name_parts[0]
-      qualifier == 'environment' ? loaders.private_environment_loader : loaders.private_loader_for_module(qualifier)
-    else
-      loaders.private_environment_loader
-    end
+               qualifier = typed_name.name_parts[0]
+               qualifier == 'environment' ? loaders.private_environment_loader : loaders.private_loader_for_module(qualifier)
+             else
+               loaders.private_environment_loader
+             end
     te = loader.load_typed(typed_name)
     if te.nil? || te.value.nil?
       @parent_data_provider.config(lookup_invocation).fail(Issues::HIERA_DATA_PROVIDER_FUNCTION_NOT_FOUND,
-        :function_type => self.class::TAG, :function_name => @function_name)
+                                                           :function_type => self.class::TAG, :function_name => @function_name)
     end
     func = te.value
     @value_is_validated = func.class.dispatcher.dispatchers.all? do |dispatcher|

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'hiera/scope'
 require_relative 'configured_data_provider'
 
@@ -17,7 +18,6 @@ class GlobalDataProvider < ConfiguredDataProvider
       scope = lookup_invocation.scope
       unless scope.is_a?(Hiera::Scope)
         return lookup_invocation.with_scope(Hiera::Scope.new(scope)) do |hiera_invocation|
-
           # 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)