puppet 7.5.0-x64-mingw32 → 7.9.0-x64-mingw32

data/lib/puppet/pops/evaluator/deferred_resolver.rb

@@ -1,4 +1,4 @@
-require 'puppet/parser/script_compiler'
+require_relative '../../../puppet/parser/script_compiler'
 
 module Puppet::Pops
 module Evaluator

data/lib/puppet/pops/evaluator/evaluator_impl.rb

@@ -1,10 +1,10 @@
-require 'puppet/parser/scope'
-require 'puppet/pops/evaluator/compare_operator'
-require 'puppet/pops/evaluator/relationship_operator'
-require 'puppet/pops/evaluator/access_operator'
-require 'puppet/pops/evaluator/closure'
-require 'puppet/pops/evaluator/external_syntax_support'
-require 'puppet/pops/types/iterable'
+require_relative '../../../puppet/parser/scope'
+require_relative '../../../puppet/pops/evaluator/compare_operator'
+require_relative '../../../puppet/pops/evaluator/relationship_operator'
+require_relative '../../../puppet/pops/evaluator/access_operator'
+require_relative '../../../puppet/pops/evaluator/closure'
+require_relative '../../../puppet/pops/evaluator/external_syntax_support'
+require_relative '../../../puppet/pops/types/iterable'
 
 module Puppet::Pops
 module Evaluator

data/lib/puppet/pops/evaluator/external_syntax_support.rb

@@ -1,7 +1,7 @@
 # This module is an integral part of the evaluator. It deals with the concern of validating
 # external syntax in text produced by heredoc and templates.
 #
-require 'puppet/plugins/syntax_checkers'
+require_relative '../../../puppet/plugins/syntax_checkers'
 module Puppet::Pops::Evaluator::ExternalSyntaxSupport
   def assert_external_syntax(_, result, syntax, reference_expr)
     # ignore 'unspecified syntax'

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

@@ -13,8 +13,8 @@ class BaseLoader < Loader
   # The parent loader
   attr_reader :parent
 
-  def initialize(parent_loader, loader_name)
-    super(loader_name)
+  def initialize(parent_loader, loader_name, environment)
+    super(loader_name, environment)
     @parent = parent_loader # the higher priority loader to consult
     @named_values = {}      # hash name => NamedEntry
     @last_result = nil      # the value of the last name (optimization)
@@ -38,22 +38,26 @@ class BaseLoader < Loader
     # These modules are typically parented by the same
     # loader as the one initiating the search. It is inefficient to again try to search the same loader for
     # the same name.
-    if @last_result.nil? || typed_name != @last_result.typed_name
-      @last_result = internal_load(typed_name)
-    else
-      @last_result
+    synchronize do
+      if @last_result.nil? || typed_name != @last_result.typed_name
+        @last_result = internal_load(typed_name)
+      else
+        @last_result
+      end
     end
   end
 
   # @api public
   #
   def loaded_entry(typed_name, check_dependencies = false)
-    if @named_values.has_key?(typed_name)
-      @named_values[typed_name]
-    elsif parent
-      parent.loaded_entry(typed_name, check_dependencies)
-    else
-      nil
+    synchronize do
+      if @named_values.has_key?(typed_name)
+        @named_values[typed_name]
+      elsif parent
+        parent.loaded_entry(typed_name, check_dependencies)
+      else
+        nil
+      end
     end
   end
 
@@ -68,23 +72,25 @@ class BaseLoader < Loader
   # @api private
   #
   def set_entry(typed_name, value, origin = nil)
-    # It is never ok to redefine in the very same loader unless redefining a 'not found'
-    entry = @named_values[typed_name]
-    if entry
-      fail_redefine(entry) unless entry.value.nil?
-    end
-
-    # Check if new entry shadows existing entry and fail
-    # (unless special loader allows shadowing)
-    if typed_name.type == :type && !allow_shadowing?
-      entry = loaded_entry(typed_name)
+    synchronize do
+      # It is never ok to redefine in the very same loader unless redefining a 'not found'
+      entry = @named_values[typed_name]
       if entry
-        fail_redefine(entry) unless entry.value.nil? #|| entry.value == value
+        fail_redefine(entry) unless entry.value.nil?
+      end
+
+      # Check if new entry shadows existing entry and fail
+      # (unless special loader allows shadowing)
+      if typed_name.type == :type && !allow_shadowing?
+        entry = loaded_entry(typed_name)
+        if entry
+          fail_redefine(entry) unless entry.value.nil? #|| entry.value == value
+        end
       end
-    end
 
-    @last_result = Loader::NamedEntry.new(typed_name, value, origin)
-    @named_values[typed_name] = @last_result
+      @last_result = Loader::NamedEntry.new(typed_name, value, origin)
+      @named_values[typed_name] = @last_result
+    end
   end
 
   # @api private
@@ -96,8 +102,10 @@ class BaseLoader < Loader
   # @api private
   #
   def remove_entry(typed_name)
-    unless @named_values.delete(typed_name).nil?
-      @last_result = nil unless @last_result.nil? || typed_name != @last_result.typed_name
+    synchronize do
+      unless @named_values.delete(typed_name).nil?
+        @last_result = nil unless @last_result.nil? || typed_name != @last_result.typed_name
+      end
     end
   end
 
@@ -106,10 +114,12 @@ class BaseLoader < Loader
   # @api private
   #
   def promote_entry(named_entry)
-    typed_name = named_entry.typed_name
-    entry = @named_values[typed_name]
-    if entry then fail_redefine(entry); end
-    @named_values[typed_name] = named_entry
+    synchronize do
+      typed_name = named_entry.typed_name
+      entry = @named_values[typed_name]
+      if entry then fail_redefine(entry); end
+      @named_values[typed_name] = named_entry
+    end
   end
 
   protected

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

@@ -18,8 +18,8 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
   # @param name [String] the name of the dependency-loader (used for debugging and tracing only)
   # @param dependency_loaders [Array<Puppet::Pops::Loader>] array of loaders for modules this module depends on
   #
-  def initialize(parent_loader, name, dependency_loaders)
-    super parent_loader, name
+  def initialize(parent_loader, name, dependency_loaders, environment)
+    super(parent_loader, name, environment)
     @dependency_loaders = dependency_loaders
   end
 

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

@@ -26,14 +26,15 @@ ENVIRONMENT = 'environment'.freeze
 ENVIRONMENT_PRIVATE = 'environment private'.freeze
 
 class Loader
-  attr_reader :loader_name
+  attr_reader :environment, :loader_name
 
   # Describes the kinds of things that loaders can load
   LOADABLE_KINDS = [:func_4x, :func_4xpp, :func_3x, :datatype, :type_pp, :resource_type_pp, :plan, :task].freeze
 
   # @param [String] name the name of the loader. Must be unique among all loaders maintained by a {Loader} instance
-  def initialize(loader_name)
+  def initialize(loader_name, environment)
     @loader_name = loader_name.freeze
+    @environment = environment
   end
 
   # Search all places where this loader would find values of a given type and return a list the
@@ -69,9 +70,11 @@ class Loader
   # @api public
   #
   def load(type, name)
-    result = load_typed(TypedName.new(type, name.to_s))
-    if result
-      result.value
+    synchronize do
+      result = load_typed(TypedName.new(type, name.to_s))
+      if result
+        result.value
+      end
     end
   end
 
@@ -143,6 +146,13 @@ class Loader
     self
   end
 
+  # Lock around a block
+  # This exists so some subclasses that are set up statically and don't actually
+  # load can override it
+  def synchronize(&block)
+    @environment.lock.synchronize(&block)
+  end
+
   # Binds a value to a name. The name should not start with '::', but may contain multiple segments.
   #
   # @param type [:Symbol] the type of the entity being set

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

@@ -45,17 +45,17 @@ module ModuleLoaders
     #
     puppet_lib = File.realpath(File.join(File.dirname(__FILE__), '../../..'))
     LibRootedFileBased.new(parent_loader,
-                                                       loaders,
-                                                       nil,
-                                                       puppet_lib,   # may or may not have a 'lib' above 'puppet'
-                                                       'puppet_system',
-                                                        [:func_4x, :func_3x, :datatype]   # only load ruby functions and types from "puppet"
-                                                       )
+                           loaders,
+                           nil,
+                           puppet_lib,   # may or may not have a 'lib' above 'puppet'
+                           'puppet_system',
+                           [:func_4x, :func_3x, :datatype]   # only load ruby functions and types from "puppet"
+                          )
   end
 
   def self.environment_loader_from(parent_loader, loaders, env_path)
     if env_path.nil? || env_path.empty?
-      EmptyLoader.new(parent_loader, ENVIRONMENT)
+      EmptyLoader.new(parent_loader, ENVIRONMENT, loaders.environment)
     else
       FileBased.new(parent_loader,
         loaders,
@@ -125,7 +125,7 @@ module ModuleLoaders
     # @param loader_name [String] a name that is used for human identification (useful when module_name is nil)
     #
     def initialize(parent_loader, loaders, module_name, path, loader_name, loadables)
-      super parent_loader, loader_name
+      super(parent_loader, loader_name, loaders.environment)
 
       raise ArgumentError, 'path based loader cannot be instantiated without a path' if path.nil? || path.empty?
 

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

@@ -19,6 +19,10 @@ class PredefinedLoader < BaseLoader
   def allow_shadowing?
     true
   end
+
+  def synchronize(&block)
+    yield
+  end
 end
 
 end

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

@@ -10,7 +10,7 @@ class Runtime3TypeLoader < BaseLoader
   attr_reader :resource_3x_loader
 
   def initialize(parent_loader, loaders, environment, resource_3x_loader)
-    super(parent_loader, environment.name)
+    super(parent_loader, environment.name, environment)
     @environment = environment
     @resource_3x_loader = resource_3x_loader
   end

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

@@ -122,6 +122,10 @@ class StaticLoader < Loader
   def create_resource_type_reference(name)
     add_type(name, Types::TypeFactory.resource(name))
   end
+
+  def synchronize(&block)
+    yield
+  end
 end
 end
 end

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

@@ -1,6 +1,6 @@
 # The TypeDefinitionInstantiator instantiates a type alias or a type definition
 #
-require 'puppet/module/task'
+require_relative '../../../puppet/module/task'
 module Puppet::Pops
 module Loader
 class TaskInstantiator

data/lib/puppet/pops/loaders.rb

@@ -398,7 +398,7 @@ class Loaders
 
       if env_path.nil?
         # Not a real directory environment, cannot work as a module TODO: Drop when legacy env are dropped?
-        loader = add_loader_by_name(Loader::SimpleEnvironmentLoader.new(@runtime3_type_loader, Loader::ENVIRONMENT))
+        loader = add_loader_by_name(Loader::SimpleEnvironmentLoader.new(@runtime3_type_loader, Loader::ENVIRONMENT, environment))
       else
         # View the environment as a module to allow loading from it - this module is always called 'environment'
         loader = Loader::ModuleLoaders.environment_loader_from(@runtime3_type_loader, self, env_path)
@@ -413,7 +413,7 @@ class Loaders
     # Code in the environment gets to see all modules (since there is no metadata for the environment)
     # but since this is not given to the module loaders, they can not load global code (since they can not
     # have prior knowledge about this
-    loader = add_loader_by_name(Loader::DependencyLoader.new(loader, Loader::ENVIRONMENT_PRIVATE, @module_resolver.all_module_loaders()))
+    loader = add_loader_by_name(Loader::DependencyLoader.new(loader, Loader::ENVIRONMENT_PRIVATE, @module_resolver.all_module_loaders(), environment))
 
     # The module loader gets the private loader via a lazy operation to look up the module's private loader.
     # This does not work for an environment since it is not resolved the same way.
@@ -529,13 +529,13 @@ class Loaders
     private
 
     def create_loader_with_all_modules_visible(from_module_data)
-      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", all_module_loaders()))
+      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", all_module_loaders(), @loaders.environment))
     end
 
     def create_loader_with_dependencies_first(from_module_data)
       dependency_loaders = from_module_data.dependency_names.collect { |name| @index[name].public_loader }
       visible_loaders = dependency_loaders + (all_module_loaders() - dependency_loaders)
-      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", visible_loaders))
+      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", visible_loaders, @loaders.environment))
     end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'puppet/thread_local'
+require_relative '../../../puppet/thread_local'
 
 require_relative 'explainer'
 

data/lib/puppet/pops/model/ast_transformer.rb

@@ -1,4 +1,4 @@
-require 'puppet/parser/ast'
+require_relative '../../../puppet/parser/ast'
 
 # The receiver of `import(file)` calls; once per imported file, or nil if imports are ignored
 #

data/lib/puppet/pops/model/pn_transformer.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Model

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

@@ -6,8 +6,8 @@
 
 require 'racc/parser.rb'
 
-require 'puppet'
-require 'puppet/pops'
+require_relative '../../../puppet'
+require_relative '../../../puppet/pops'
 
 module Puppet
   class ParseError < Puppet::Error; end

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

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Parser

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

@@ -6,11 +6,11 @@
 # or Token.new([token], locator) with the same API x[0] = token_symbol, x[1] = self, x[:key] = (:value, :file, :line, :pos) etc
 
 require 'strscan'
-require 'puppet/pops/parser/lexer_support'
-require 'puppet/pops/parser/heredoc_support'
-require 'puppet/pops/parser/interpolation_support'
-require 'puppet/pops/parser/epp_support'
-require 'puppet/pops/parser/slurp_support'
+require_relative '../../../puppet/pops/parser/lexer_support'
+require_relative '../../../puppet/pops/parser/heredoc_support'
+require_relative '../../../puppet/pops/parser/interpolation_support'
+require_relative '../../../puppet/pops/parser/epp_support'
+require_relative '../../../puppet/pops/parser/slurp_support'
 
 module Puppet::Pops
 module Parser

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

@@ -2,7 +2,7 @@
 module Puppet::Pops
 module Parser
 
-require 'puppet/util/multi_match'
+require_relative '../../../puppet/util/multi_match'
 
 # This is an integral part of the Lexer. It is broken out into a separate module
 # for maintainability of the code, and making the various parts of the lexer focused.

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

@@ -1,7 +1,7 @@
-require 'puppet/parser/functions'
-require 'puppet/parser/files'
-require 'puppet/resource/type_collection'
-require 'puppet/resource/type'
+require_relative '../../../puppet/parser/functions'
+require_relative '../../../puppet/parser/files'
+require_relative '../../../puppet/resource/type_collection'
+require_relative '../../../puppet/resource/type'
 require 'monitor'
 
 module Puppet::Pops

data/lib/puppet/pops/puppet_stack.rb

@@ -1,4 +1,4 @@
-require 'puppet/thread_local'
+require_relative '../../puppet/thread_local'
 
 module Puppet
   module Pops

data/lib/puppet/pops/serialization/json.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/json'
+require_relative '../../../puppet/util/json'
 
 module Puppet::Pops
 module Serialization

data/lib/puppet/pops/serialization/json_path.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Serialization

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

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Time

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

@@ -95,16 +95,22 @@ class PSemVerType < PScalarType
       end
 
       def from_args(major, minor, patch, prerelease = nil, build = nil)
-        SemanticPuppet::Version.new(major, minor, patch, prerelease, build)
+        SemanticPuppet::Version.new(major, minor, patch, to_array(prerelease), to_array(build))
       end
 
       def from_hash(hash)
-        SemanticPuppet::Version.new(hash['major'], hash['minor'], hash['patch'], hash['prerelease'], hash['build'])
+        SemanticPuppet::Version.new(hash['major'], hash['minor'], hash['patch'], to_array(hash['prerelease']), to_array(hash['build']))
       end
 
       def on_error(str)
         _("The string '%{str}' cannot be converted to a SemVer") % { str: str }
       end
+
+      private
+
+      def to_array(component)
+        component ? [component] : nil
+      end
     end
   end